commit 5e7222e4bc0401ef8c6d8049b12a62d4854ac85c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:20:51 2018 +0200
Cleanup
commit 2e1bc7a7cd6c72e7c3d2ff74cb30f7a56515006c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:19:53 2018 +0200
Cleanup
commit edd7fa87fb2c839c17457ff004d258a049df832f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:18:57 2018 +0200
Cleanup
commit ee34e1433806655a7123f0617802aa4771507dff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:18:10 2018 +0200
Cleanup
commit 20779e4021b8ab95a87289d2741ad2f0fbc7fb39
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Thu Mar 1 21:16:52 2018 +0200
Cleanup
commit 084e1aa563807f5625ad3aaff376b598e139f2a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:42:49 2018 +0200
Fix typo
commit c61a7c2319d3b9b96d1b5ad52ecf9d4f2fd92658
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:37:43 2018 +0200
Cleanup
commit e435c0229b0cbe3f4a77f43b01ca87ed0552d405
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 18:17:58 2018 +0200
Fix typos
commit e05bff3fea8915e95a473fe3266b2b1f727deca0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:59:32 2018 +0200
Fix typo
commit 8c55c7840232cef7fa4389a12f6f220e86f5f581
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:46:33 2018 +0200
Fix typos
commit a1edfcc5cc29d815ba7e8c4baaf14c23ef93af64
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:39:41 2018 +0200
Fix typos
commit 2ce2c4d180e936ccc5c10745a6430fda5de38a9b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:14:10 2018 +0200
Fix typo
commit 5bdc6cd5bc9cff93aa48fbdeda36d4d9774bfa18
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 17:12:14 2018 +0200
Fix typo
commit d08749f549575efc6f44a7f80850bc439c12ad5c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:54:06 2018 +0200
Revert one change
commit a734bb1191c692f09f58bcc8e85160ce7c839905
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:52:45 2018 +0200
Fix typo
commit 95fbc8d94bbefc0db989c83d0f053111bfed45e7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:51:33 2018 +0200
Fix typos
commit d17d540a83d035cf9a200f9a8b19f0fab6084728
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:49:36 2018 +0200
Fix typo
commit c4bf4402210bcb926ccfb3928afeb3a8a7490b42
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:48:09 2018 +0200
Fix typo
commit 25e7990848a1d723702e2d041c04bc68a6c1275f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:47:01 2018 +0200
Fix typo
commit d72ffb5b0253e0d7b992ffe13c40695421378dc3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:45:20 2018 +0200
Fix typo
commit 705e6f271192a575cc99d794545b0efe75d964c4
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:41:19 2018 +0200
Revert one change
commit 4fd26cd29e21c42b027e37da2616761ebc399d16
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:39:41 2018 +0200
Revert commit
commit 8a5cc627b1048368fe8807973d1f542bab2e045f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:28:56 2018 +0200
Fix typo
commit 0a24baa7258c0ae0f244d82af8d0831b148ab012
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 16:15:45 2018 +0200
Fix typo
commit 38f93ecd90171fb881243f0de55b3452daccff20
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:56:49 2018 +0200
Fix typos
commit 15446fd62400c36c2a51f7e6f13725cc8adfd924
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:48:00 2018 +0200
Fix typos
commit 76533b41986bbc5826070a1e644215a74757c1db
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 15:04:38 2018 +0200
Fix typo
commit aea330c2b0bf76975ec69142a732288cc8b192bd
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:46:29 2018 +0200
Fix typo
commit 8b1b1d0be1dc44f36c22c54d1a3d56d84d456b92
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:40:23 2018 +0200
Fix typo
commit 46ea76785a26cf20a664ed211c8f3fb9a283e127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:14:17 2018 +0200
Fix typo
commit e0d7c5748545dd0975507ad603623072fcc6bdea
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 14:08:24 2018 +0200
Fix typo
commit 604d5a244323b17ba596b12d245407e1cf63a375
Merge: 6c081ca 1c65b2b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:03:23 2018 +0200
Merge pull request #36 from rex4539/patch-36
Fix typo
commit 6c081caf28b7cef9e62ed523284dff90e4add16d
Merge: 899e5d2 88fa2d9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:02:49 2018 +0200
Merge pull request #35 from rex4539/patch-35
Fix typo
commit 899e5d2c343ac7ea5069b8548e5df86c8e963e21
Merge: 6380c7f 40e73e2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:02:16 2018 +0200
Merge pull request #34 from rex4539/patch-34
Fix typo
commit 6380c7f740246474c69d8145bde61688551efe83
Merge: f592274 4567667
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:01:47 2018 +0200
Merge pull request #33 from rex4539/patch-33
Fix typos
commit f592274a713162da0083bd6d22fb47cb1afcdba9
Merge: d86ef7e 4aeaa3a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:01:14 2018 +0200
Merge pull request #32 from rex4539/patch-32
Fix typo
commit d86ef7e5e4f7e9c2014358ec5b647d1815eb304d
Merge: fe0b432 5cdd1b2
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:00:41 2018 +0200
Merge pull request #31 from rex4539/patch-31
Fix typo
commit fe0b432ee125ae0b876af2c26139dfc979005a3b
Merge: 6fd6d0d 70130d0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 09:00:12 2018 +0200
Merge pull request #30 from rex4539/patch-30
Fix typos
commit 6fd6d0dcf3714118a623c0d8d84aabb4578410a8
Merge: 389660f 3377426
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:59:42 2018 +0200
Merge pull request #29 from rex4539/patch-29
Fix typo
commit 389660f856cb60ff475a8757aad3873b99213cc0
Merge: a0b85ce 40643eb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:59:15 2018 +0200
Merge pull request #28 from rex4539/patch-28
Fix typo
commit a0b85ce3b4d2e6596da0727e05c1fe15c289b1e7
Merge: 6f9a1c7 23ead80
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:58:42 2018 +0200
Merge pull request #27 from rex4539/patch-27
Fix typo
commit 6f9a1c71a680bb3ed1c249dd42bf0a54663d0af3
Merge: b880547 3612eab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:58:06 2018 +0200
Merge pull request #26 from rex4539/patch-26
Patch 26
commit b880547415afeae36bd19867388e60a3040a15ca
Merge: a3b7da2 5c3177f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:57:24 2018 +0200
Merge pull request #25 from rex4539/patch-25
Fix typo
commit a3b7da2c6d6691f38751292e1aea63498a325788
Merge: edd8586 60026ef
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:56:52 2018 +0200
Merge pull request #24 from rex4539/patch-24
Fix typo
commit edd8586fdf8c112f4c513804610c237d7e2e80ef
Merge: 0c28eb7 f979c00
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:56:12 2018 +0200
Merge pull request #23 from rex4539/patch-23
Fix typo
commit 0c28eb7717821b1d68016f40911d07f2a7231b4f
Merge: 775beb6 c900722
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:55:42 2018 +0200
Merge pull request #22 from rex4539/patch-22
Fix typo
commit 775beb625beb1fc5f72388c076b295de4b8ff039
Merge: a0cf889 1027543
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:55:16 2018 +0200
Merge pull request #21 from rex4539/patch-21
Fix typo
commit a0cf88971e756c37c406bab3066c11d6fc7f6d74
Merge: 4504b48 f3fa89b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:54:44 2018 +0200
Merge pull request #20 from rex4539/patch-20
Fix typo
commit 4504b4824b3438e931ca8d24a56b1887657e87cd
Merge: dd0bcbf 2699eca
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:54:20 2018 +0200
Merge pull request #19 from rex4539/patch-19
Fix typo
commit dd0bcbfc89293e9760156d5534f3a558451e1f29
Merge: abfb65a f02ef2e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:53:46 2018 +0200
Merge pull request #18 from rex4539/patch-18
Fix typos
commit abfb65afaed49c34b9875df79f6fe6eb2b7bf769
Merge: 68b46b7 6485c90
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:53:08 2018 +0200
Merge pull request #17 from rex4539/patch-17
Fix typo
commit 68b46b75d2e5b7ae97e83fc5541c46b4907a7899
Merge: a131e84 fcc0828
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:52:39 2018 +0200
Merge pull request #16 from rex4539/patch-16
Fix typo
commit a131e844652e58aff78fa8952e7547a9ba82b8a1
Merge: 8487c0e 8a688ff
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:54 2018 +0200
Merge pull request #15 from rex4539/patch-15
Fix typo
commit 8487c0e39092b74e977c7a60f4a07a27606756a8
Merge: bcc4cb4 bb60b83
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:28 2018 +0200
Merge pull request #14 from rex4539/patch-14
Fix typos
commit bcc4cb46130e789faa9adae9b159ca818f67ec52
Merge: 23e66e9 53539bb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:51:00 2018 +0200
Merge pull request #13 from rex4539/patch-13
Fix typos
commit 23e66e956bff2d6935c7a4dd570d457294018a77
Merge: 56956cf 0808445
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:50:27 2018 +0200
Merge pull request #12 from rex4539/patch-12
Fix typo
commit 56956cf23ba1208aa39cb3ab1ef60375c6630263
Merge: 77007d4 7a4f064
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:49:59 2018 +0200
Merge pull request #11 from rex4539/patch-11
Fix typo
commit 77007d49fa1d8cb80aef02bea1dd15e522a47c90
Merge: e78ad0c 48c33fb
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:49:16 2018 +0200
Merge pull request #10 from rex4539/patch-10
Fix typo
commit e78ad0cf0d91955a848f5e953a042eabdcdac198
Merge: 38a3e08 809f01c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:48:33 2018 +0200
Merge pull request #9 from rex4539/patch-9
Fix typo
commit 38a3e08699fe4c4ec715b1783dba18bff6b829fb
Merge: eee3c28 fec279c
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:48:05 2018 +0200
Merge pull request #8 from rex4539/patch-8
Fix typo
commit eee3c286eb84f994310142a9e7fdbd36a671e593
Merge: 702635b cf81b4e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:47:33 2018 +0200
Merge pull request #7 from rex4539/patch-7
Fix typo
commit 702635bb34abb2f83ded27ae95deefd5b6e7df93
Merge: d7497ea 3bbcc3d
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:47:01 2018 +0200
Merge pull request #6 from rex4539/patch-6
Fix typo
commit d7497ea070e03380cf1d4f533b7dc4b881f724f8
Merge: bfcc1e8 f639727
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:45:33 2018 +0200
Merge pull request #5 from rex4539/patch-5
Fix typos
commit bfcc1e8ae2094ca4e9837f623999705f538aff04
Merge: f4440ec 55262fe
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:45:05 2018 +0200
Merge pull request #4 from rex4539/patch-4
Remove space for word "backup"
commit f4440ecd4a7367e6bc4a5f75bea112290017ed2b
Merge: f8b487f 61d5279
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:44:31 2018 +0200
Merge pull request #3 from rex4539/patch-3
Fix typos in zmq.md
commit f8b487f5699990fabc7fc383d02bc728db3cb9aa
Merge: 60104a7 f2ce50f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:42:51 2018 +0200
Merge pull request #2 from rex4539/patch-2
Fix typo in security-warnings.md
commit 60104a7034f55284afb814e81a1430a8b2b0d8d1
Merge: be262f0 af7dfe0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 08:41:48 2018 +0200
Merge pull request #1 from rex4539/patch-1
Fix typos
commit 1c65b2bd0c49f7f392d0e3a2db14ce1366a87171
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:35:26 2018 +0200
Fix typo
commit 88fa2d966a3b462ed34a9a4659fc390711cc0276
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:21:00 2018 +0200
Fix typo
commit 40e73e258671f21d2b2205509e9cae1f50294752
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 07:14:21 2018 +0200
Fix typo
commit 4567667fcc8b4197dfd51da34fe82b0f2fb78127
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 06:44:40 2018 +0200
Fix typos
commit 4aeaa3a3d6335302c53c0f5f4ef81de05e266479
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:55:25 2018 +0200
Fix typo
commit 5cdd1b29b4c90492aa15fed7940984e1d675052f
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:36:46 2018 +0200
Fix typo
commit 70130d05f1646c8b9fb1f33c4efbe2a5fcf7138b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:28:21 2018 +0200
Fix typos
commit 33774261b1c63e5640aa1dd251edb67892ed7a5b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 05:00:56 2018 +0200
Fix typo
commit 40643ebfcd85ee257a4576e85d2fb6c73dad17b5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:51:57 2018 +0200
Fix typo
commit 23ead80e05116ebfeaac0a00d5bd4a158fbeb54e
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:29:53 2018 +0200
Fix typo
commit 3612eaba2dcf273e94cac9ad889723776ce55108
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:19:36 2018 +0200
Fix typos
commit 5c3177f5d191d1f4e4d9f78ae4b75381010f7768
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:13:03 2018 +0200
Fix typo
commit 60026efe27a39300e428879ad8dba94f19934870
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:08:09 2018 +0200
Fix typo
commit f979c0074efd66804f229c8b3cc6e812d7f26406
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 04:01:44 2018 +0200
Fix typo
commit c9007220a8a727c1cfe3b25b453c178eacd431f3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:52:33 2018 +0200
Fix typo
commit 1027543bd30701c4b09aa66226281a10563db910
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:36:19 2018 +0200
Fix typo
commit f3fa89bcd30e0cb45ff4391e78d02452c9227be0
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:34:37 2018 +0200
Fix typo
commit 2699eca938f1e413a29d4408a271aaafd27969cc
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:30:29 2018 +0200
Fix typo
commit f02ef2e495fe43142d305f5c4f40dcfa3d2cb423
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:22:36 2018 +0200
Fix typos
commit 6485c908433bb91fd70d7e18cf3611c9a96115a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:10:06 2018 +0200
Fix typo
commit fcc082850564b14b86b1932dfc5a099816c72ef1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:06:26 2018 +0200
Fix typo
commit 8a688ff7405d67bd4c77b0aa0ebdd4b4a8a9a6a7
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 03:02:50 2018 +0200
Fix typo
commit bb60b83853ed0a82ca47dd58d55f1849ddcf23ab
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 02:59:25 2018 +0200
Fix typos
commit 53539bb720c7676b9d37e25dde3423db3aa7bfa1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 02:50:55 2018 +0200
Fix typos
commit 080844581d6488ab797ac188acae9c4b2e1d0c59
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 01:05:54 2018 +0200
Fix typo
commit 7a4f0649ac5e71f39f0bef7f2e1fcb6fafad0291
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:16:31 2018 +0200
Fix typo
commit 48c33fb3f9ab1ad287987d147ee4bbe186f7ade1
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:07:42 2018 +0200
Fix typo
commit 809f01ca4f785a7b5bc9cc2c388e0ae814ecaa95
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Tue Feb 27 00:02:34 2018 +0200
Fix typo
commit fec279cac89aa917be929447c81177811728361a
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:55:27 2018 +0200
Fix typo
commit cf81b4e12399570545372d4c9daceca8e70142d5
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:48:43 2018 +0200
Fix typo
commit 3bbcc3d9986caf8df99bec5d8a18d0f0c8990e06
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:28:52 2018 +0200
Fix typo
commit f639727525dbd23f5f2d0f89e7be13d868e984c3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 23:13:12 2018 +0200
Fix typos
commit 55262fe9c5e1e127c6b817a0c2ab3f9db3ac35b9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:46:52 2018 +0200
Remove space for word "backup"
commit 61d52797d4d26a90dcc15e2bcd6f19a5f36faac3
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:23:31 2018 +0200
Fix typos in zmq.md
commit f2ce50f10e67b4265e559a432681bc44828ae59b
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 22:12:58 2018 +0200
Fix typo in security-warnings.md
commit af7dfe046c12109e44ddc18dff07ede8755cf4f9
Author: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Mon Feb 26 21:59:24 2018 +0200
Fix typos
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
645 lines
19 KiB
C++
645 lines
19 KiB
C++
// Equihash solver
|
|
// Copyright (c) 2016 John Tromp, The Zcash developers
|
|
|
|
// Fix N, K, such that n = N/(k+1) is integer
|
|
// Fix M = 2^{n+1} hashes each of length N bits,
|
|
// H_0, ... , H_{M-1}, generated from (n+1)-bit indices.
|
|
// Problem: find binary tree on 2^K distinct indices,
|
|
// for which the exclusive-or of leaf hashes is all 0s.
|
|
// Additionally, it should satisfy the Wagner conditions:
|
|
// for each height i subtree, the exclusive-or
|
|
// of its 2^i corresponding hashes starts with i*n 0 bits,
|
|
// and for i>0 the leftmost leaf of its left subtree
|
|
// is less than the leftmost leaf of its right subtree
|
|
|
|
// The algorithm below solves this by maintaining the trees
|
|
// in a graph of K layers, each split into buckets
|
|
// with buckets indexed by the first n-RESTBITS bits following
|
|
// the i*n 0s, each bucket having 4 * 2^RESTBITS slots,
|
|
// twice the number of subtrees expected to land there.
|
|
|
|
#include "pow/tromp/equi.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <pthread.h>
|
|
#include <assert.h>
|
|
|
|
typedef uint16_t u16;
|
|
typedef uint64_t u64;
|
|
|
|
#ifdef EQUIHASH_TROMP_ATOMIC
|
|
#include <atomic>
|
|
typedef std::atomic<u32> au32;
|
|
#else
|
|
typedef u32 au32;
|
|
#endif
|
|
|
|
#ifndef RESTBITS
|
|
#define RESTBITS 8
|
|
#endif
|
|
|
|
// 2_log of number of buckets
|
|
#define BUCKBITS (DIGITBITS-RESTBITS)
|
|
|
|
#ifndef SAVEMEM
|
|
#if RESTBITS == 4
|
|
// can't save memory in such small buckets
|
|
#define SAVEMEM 1
|
|
#elif RESTBITS >= 8
|
|
// take advantage of law of large numbers (sum of 2^8 random numbers)
|
|
// this reduces (200,9) memory to under 144MB, with negligible discarding
|
|
#define SAVEMEM 9/14
|
|
#endif
|
|
#endif
|
|
|
|
// number of buckets
|
|
static const u32 NBUCKETS = 1<<BUCKBITS;
|
|
// 2_log of number of slots per bucket
|
|
static const u32 SLOTBITS = RESTBITS+1+1;
|
|
static const u32 SLOTRANGE = 1<<SLOTBITS;
|
|
static const u32 SLOTMSB = 1<<(SLOTBITS-1);
|
|
// number of slots per bucket
|
|
static const u32 NSLOTS = SLOTRANGE * SAVEMEM;
|
|
// number of per-xhash slots
|
|
static const u32 XFULL = 16;
|
|
// SLOTBITS mask
|
|
static const u32 SLOTMASK = SLOTRANGE-1;
|
|
// number of possible values of xhash (rest of n) bits
|
|
static const u32 NRESTS = 1<<RESTBITS;
|
|
// number of blocks of hashes extracted from single 512 bit blake2b output
|
|
static const u32 NBLOCKS = (NHASHES+HASHESPERBLAKE-1)/HASHESPERBLAKE;
|
|
// nothing larger found in 100000 runs
|
|
static const u32 MAXSOLS = 8;
|
|
|
|
// tree node identifying its children as two different slots in
|
|
// a bucket on previous layer with the same rest bits (x-tra hash)
|
|
struct tree {
|
|
u32 bid_s0_s1; // manual bitfields
|
|
|
|
tree(const u32 idx) {
|
|
bid_s0_s1 = idx;
|
|
}
|
|
tree(const u32 bid, const u32 s0, const u32 s1) {
|
|
#ifdef SLOTDIFF
|
|
u32 ds10 = (s1 - s0) & SLOTMASK;
|
|
if (ds10 & SLOTMSB) {
|
|
bid_s0_s1 = (((bid << SLOTBITS) | s1) << (SLOTBITS-1)) | (SLOTMASK & ~ds10);
|
|
} else {
|
|
bid_s0_s1 = (((bid << SLOTBITS) | s0) << (SLOTBITS-1)) | (ds10 - 1);
|
|
}
|
|
#else
|
|
bid_s0_s1 = (((bid << SLOTBITS) | s0) << SLOTBITS) | s1;
|
|
#endif
|
|
}
|
|
u32 getindex() const {
|
|
return bid_s0_s1;
|
|
}
|
|
u32 bucketid() const {
|
|
#ifdef SLOTDIFF
|
|
return bid_s0_s1 >> (2 * SLOTBITS - 1);
|
|
#else
|
|
return bid_s0_s1 >> (2 * SLOTBITS);
|
|
#endif
|
|
}
|
|
u32 slotid0() const {
|
|
#ifdef SLOTDIFF
|
|
return (bid_s0_s1 >> (SLOTBITS-1)) & SLOTMASK;
|
|
#else
|
|
return (bid_s0_s1 >> SLOTBITS) & SLOTMASK;
|
|
#endif
|
|
}
|
|
u32 slotid1() const {
|
|
#ifdef SLOTDIFF
|
|
return (slotid0() + 1 + (bid_s0_s1 & (SLOTMASK>>1))) & SLOTMASK;
|
|
#else
|
|
return bid_s0_s1 & SLOTMASK;
|
|
#endif
|
|
}
|
|
};
|
|
|
|
union hashunit {
|
|
u32 word;
|
|
uchar bytes[sizeof(u32)];
|
|
};
|
|
|
|
#define WORDS(bits) ((bits + 31) / 32)
|
|
#define HASHWORDS0 WORDS(WN - DIGITBITS + RESTBITS)
|
|
#define HASHWORDS1 WORDS(WN - 2*DIGITBITS + RESTBITS)
|
|
|
|
struct slot0 {
|
|
tree attr;
|
|
hashunit hash[HASHWORDS0];
|
|
};
|
|
|
|
struct slot1 {
|
|
tree attr;
|
|
hashunit hash[HASHWORDS1];
|
|
};
|
|
|
|
// a bucket is NSLOTS treenodes
|
|
typedef slot0 bucket0[NSLOTS];
|
|
typedef slot1 bucket1[NSLOTS];
|
|
// the N-bit hash consists of K+1 n-bit "digits"
|
|
// each of which corresponds to a layer of NBUCKETS buckets
|
|
typedef bucket0 digit0[NBUCKETS];
|
|
typedef bucket1 digit1[NBUCKETS];
|
|
|
|
// size (in bytes) of hash in round 0 <= r < WK
|
|
u32 hashsize(const u32 r) {
|
|
const u32 hashbits = WN - (r+1) * DIGITBITS + RESTBITS;
|
|
return (hashbits + 7) / 8;
|
|
}
|
|
|
|
u32 hashwords(u32 bytes) {
|
|
return (bytes + 3) / 4;
|
|
}
|
|
|
|
// manages hash and tree data
|
|
struct htalloc {
|
|
u32 *heap0;
|
|
u32 *heap1;
|
|
bucket0 *trees0[(WK+1)/2];
|
|
bucket1 *trees1[WK/2];
|
|
u32 alloced;
|
|
htalloc() {
|
|
alloced = 0;
|
|
}
|
|
void alloctrees() {
|
|
// optimize xenoncat's fixed memory layout, avoiding any waste
|
|
// digit trees hashes trees hashes
|
|
// 0 0 A A A A A A . . . . . .
|
|
// 1 0 A A A A A A 1 B B B B B
|
|
// 2 0 2 C C C C C 1 B B B B B
|
|
// 3 0 2 C C C C C 1 3 D D D D
|
|
// 4 0 2 4 E E E E 1 3 D D D D
|
|
// 5 0 2 4 E E E E 1 3 5 F F F
|
|
// 6 0 2 4 6 . G G 1 3 5 F F F
|
|
// 7 0 2 4 6 . G G 1 3 5 7 H H
|
|
// 8 0 2 4 6 8 . I 1 3 5 7 H H
|
|
assert(DIGITBITS >= 16); // ensures hashes shorten by 1 unit every 2 digits
|
|
heap0 = (u32 *)alloc(1, sizeof(digit0));
|
|
heap1 = (u32 *)alloc(1, sizeof(digit1));
|
|
for (int r=0; r<WK; r++)
|
|
if ((r&1) == 0)
|
|
trees0[r/2] = (bucket0 *)(heap0 + r/2);
|
|
else
|
|
trees1[r/2] = (bucket1 *)(heap1 + r/2);
|
|
}
|
|
void dealloctrees() {
|
|
free(heap0);
|
|
free(heap1);
|
|
}
|
|
void *alloc(const u32 n, const u32 sz) {
|
|
void *mem = calloc(n, sz);
|
|
assert(mem);
|
|
alloced += n * sz;
|
|
return mem;
|
|
}
|
|
};
|
|
|
|
typedef au32 bsizes[NBUCKETS];
|
|
|
|
u32 min(const u32 a, const u32 b) {
|
|
return a < b ? a : b;
|
|
}
|
|
|
|
struct equi {
|
|
crypto_generichash_blake2b_state blake_ctx;
|
|
htalloc hta;
|
|
bsizes *nslots; // PUT IN BUCKET STRUCT
|
|
proof *sols;
|
|
au32 nsols;
|
|
u32 nthreads;
|
|
u32 xfull;
|
|
u32 hfull;
|
|
u32 bfull;
|
|
pthread_barrier_t barry;
|
|
equi(const u32 n_threads) {
|
|
assert(sizeof(hashunit) == 4);
|
|
nthreads = n_threads;
|
|
const int err = pthread_barrier_init(&barry, NULL, nthreads);
|
|
assert(!err);
|
|
hta.alloctrees();
|
|
nslots = (bsizes *)hta.alloc(2 * NBUCKETS, sizeof(au32));
|
|
sols = (proof *)hta.alloc(MAXSOLS, sizeof(proof));
|
|
}
|
|
~equi() {
|
|
hta.dealloctrees();
|
|
free(nslots);
|
|
free(sols);
|
|
}
|
|
void setstate(const crypto_generichash_blake2b_state *ctx) {
|
|
blake_ctx = *ctx;
|
|
memset(nslots, 0, NBUCKETS * sizeof(au32)); // only nslots[0] needs zeroing
|
|
nsols = 0;
|
|
}
|
|
u32 getslot(const u32 r, const u32 bucketi) {
|
|
#ifdef EQUIHASH_TROMP_ATOMIC
|
|
return std::atomic_fetch_add_explicit(&nslots[r&1][bucketi], 1U, std::memory_order_relaxed);
|
|
#else
|
|
return nslots[r&1][bucketi]++;
|
|
#endif
|
|
}
|
|
u32 getnslots(const u32 r, const u32 bid) { // SHOULD BE METHOD IN BUCKET STRUCT
|
|
au32 &nslot = nslots[r&1][bid];
|
|
const u32 n = min(nslot, NSLOTS);
|
|
nslot = 0;
|
|
return n;
|
|
}
|
|
void orderindices(u32 *indices, u32 size) {
|
|
if (indices[0] > indices[size]) {
|
|
for (u32 i=0; i < size; i++) {
|
|
const u32 tmp = indices[i];
|
|
indices[i] = indices[size+i];
|
|
indices[size+i] = tmp;
|
|
}
|
|
}
|
|
}
|
|
void listindices0(u32 r, const tree t, u32 *indices) {
|
|
if (r == 0) {
|
|
*indices = t.getindex();
|
|
return;
|
|
}
|
|
const bucket1 &buck = hta.trees1[--r/2][t.bucketid()];
|
|
const u32 size = 1 << r;
|
|
u32 *indices1 = indices + size;
|
|
listindices1(r, buck[t.slotid0()].attr, indices);
|
|
listindices1(r, buck[t.slotid1()].attr, indices1);
|
|
orderindices(indices, size);
|
|
}
|
|
void listindices1(u32 r, const tree t, u32 *indices) {
|
|
const bucket0 &buck = hta.trees0[--r/2][t.bucketid()];
|
|
const u32 size = 1 << r;
|
|
u32 *indices1 = indices + size;
|
|
listindices0(r, buck[t.slotid0()].attr, indices);
|
|
listindices0(r, buck[t.slotid1()].attr, indices1);
|
|
orderindices(indices, size);
|
|
}
|
|
void candidate(const tree t) {
|
|
proof prf;
|
|
listindices1(WK, t, prf); // assume WK odd
|
|
qsort(prf, PROOFSIZE, sizeof(u32), &compu32);
|
|
for (u32 i=1; i<PROOFSIZE; i++)
|
|
if (prf[i] <= prf[i-1])
|
|
return;
|
|
#ifdef EQUIHASH_TROMP_ATOMIC
|
|
u32 soli = std::atomic_fetch_add_explicit(&nsols, 1U, std::memory_order_relaxed);
|
|
#else
|
|
u32 soli = nsols++;
|
|
#endif
|
|
if (soli < MAXSOLS)
|
|
listindices1(WK, t, sols[soli]); // assume WK odd
|
|
}
|
|
void showbsizes(u32 r) {
|
|
#if defined(HIST) || defined(SPARK) || defined(LOGSPARK)
|
|
u32 binsizes[65];
|
|
memset(binsizes, 0, 65 * sizeof(u32));
|
|
for (u32 bucketid = 0; bucketid < NBUCKETS; bucketid++) {
|
|
u32 bsize = min(nslots[r&1][bucketid], NSLOTS) >> (SLOTBITS-6);
|
|
binsizes[bsize]++;
|
|
}
|
|
for (u32 i=0; i < 65; i++) {
|
|
#ifdef HIST
|
|
// printf(" %d:%d", i, binsizes[i]);
|
|
#else
|
|
#ifdef SPARK
|
|
u32 sparks = binsizes[i] / SPARKSCALE;
|
|
#else
|
|
u32 sparks = 0;
|
|
for (u32 bs = binsizes[i]; bs; bs >>= 1) sparks++;
|
|
sparks = sparks * 7 / SPARKSCALE;
|
|
#endif
|
|
// printf("\342\226%c", '\201' + sparks);
|
|
#endif
|
|
}
|
|
// printf("\n");
|
|
#endif
|
|
}
|
|
|
|
struct htlayout {
|
|
htalloc hta;
|
|
u32 prevhashunits;
|
|
u32 nexthashunits;
|
|
u32 dunits;
|
|
u32 prevbo;
|
|
u32 nextbo;
|
|
|
|
htlayout(equi *eq, u32 r): hta(eq->hta), prevhashunits(0), dunits(0) {
|
|
u32 nexthashbytes = hashsize(r);
|
|
nexthashunits = hashwords(nexthashbytes);
|
|
prevbo = 0;
|
|
nextbo = nexthashunits * sizeof(hashunit) - nexthashbytes; // 0-3
|
|
if (r) {
|
|
u32 prevhashbytes = hashsize(r-1);
|
|
prevhashunits = hashwords(prevhashbytes);
|
|
prevbo = prevhashunits * sizeof(hashunit) - prevhashbytes; // 0-3
|
|
dunits = prevhashunits - nexthashunits;
|
|
}
|
|
}
|
|
u32 getxhash0(const slot0* pslot) const {
|
|
#if WN == 200 && RESTBITS == 4
|
|
return pslot->hash->bytes[prevbo] >> 4;
|
|
#elif WN == 200 && RESTBITS == 8
|
|
return (pslot->hash->bytes[prevbo] & 0xf) << 4 | pslot->hash->bytes[prevbo+1] >> 4;
|
|
#elif WN == 200 && RESTBITS == 9
|
|
return (pslot->hash->bytes[prevbo] & 0x1f) << 4 | pslot->hash->bytes[prevbo+1] >> 4;
|
|
#elif WN == 144 && RESTBITS == 4
|
|
return pslot->hash->bytes[prevbo] & 0xf;
|
|
#else
|
|
#error non implemented
|
|
#endif
|
|
}
|
|
u32 getxhash1(const slot1* pslot) const {
|
|
#if WN == 200 && RESTBITS == 4
|
|
return pslot->hash->bytes[prevbo] & 0xf;
|
|
#elif WN == 200 && RESTBITS == 8
|
|
return pslot->hash->bytes[prevbo];
|
|
#elif WN == 200 && RESTBITS == 9
|
|
return (pslot->hash->bytes[prevbo]&1) << 8 | pslot->hash->bytes[prevbo+1];
|
|
#elif WN == 144 && RESTBITS == 4
|
|
return pslot->hash->bytes[prevbo] & 0xf;
|
|
#else
|
|
#error non implemented
|
|
#endif
|
|
}
|
|
bool equal(const hashunit *hash0, const hashunit *hash1) const {
|
|
return hash0[prevhashunits-1].word == hash1[prevhashunits-1].word;
|
|
}
|
|
};
|
|
|
|
struct collisiondata {
|
|
#ifdef XBITMAP
|
|
#if NSLOTS > 64
|
|
#error cant use XBITMAP with more than 64 slots
|
|
#endif
|
|
u64 xhashmap[NRESTS];
|
|
u64 xmap;
|
|
#else
|
|
#if RESTBITS <= 6
|
|
typedef uchar xslot;
|
|
#else
|
|
typedef u16 xslot;
|
|
#endif
|
|
xslot nxhashslots[NRESTS];
|
|
xslot xhashslots[NRESTS][XFULL];
|
|
xslot *xx;
|
|
u32 n0;
|
|
u32 n1;
|
|
#endif
|
|
u32 s0;
|
|
|
|
void clear() {
|
|
#ifdef XBITMAP
|
|
memset(xhashmap, 0, NRESTS * sizeof(u64));
|
|
#else
|
|
memset(nxhashslots, 0, NRESTS * sizeof(xslot));
|
|
#endif
|
|
}
|
|
bool addslot(u32 s1, u32 xh) {
|
|
#ifdef XBITMAP
|
|
xmap = xhashmap[xh];
|
|
xhashmap[xh] |= (u64)1 << s1;
|
|
s0 = -1;
|
|
return true;
|
|
#else
|
|
n1 = (u32)nxhashslots[xh]++;
|
|
if (n1 >= XFULL)
|
|
return false;
|
|
xx = xhashslots[xh];
|
|
xx[n1] = s1;
|
|
n0 = 0;
|
|
return true;
|
|
#endif
|
|
}
|
|
bool nextcollision() const {
|
|
#ifdef XBITMAP
|
|
return xmap != 0;
|
|
#else
|
|
return n0 < n1;
|
|
#endif
|
|
}
|
|
u32 slot() {
|
|
#ifdef XBITMAP
|
|
const u32 ffs = __builtin_ffsll(xmap);
|
|
s0 += ffs; xmap >>= ffs;
|
|
return s0;
|
|
#else
|
|
return (u32)xx[n0++];
|
|
#endif
|
|
}
|
|
};
|
|
|
|
void digit0(const u32 id) {
|
|
uchar hash[HASHOUT];
|
|
crypto_generichash_blake2b_state state;
|
|
htlayout htl(this, 0);
|
|
const u32 hashbytes = hashsize(0);
|
|
for (u32 block = id; block < NBLOCKS; block += nthreads) {
|
|
state = blake_ctx;
|
|
u32 leb = htole32(block);
|
|
crypto_generichash_blake2b_update(&state, (uchar *)&leb, sizeof(u32));
|
|
crypto_generichash_blake2b_final(&state, hash, HASHOUT);
|
|
for (u32 i = 0; i<HASHESPERBLAKE; i++) {
|
|
const uchar *ph = hash + i * WN/8;
|
|
#if BUCKBITS == 16 && RESTBITS == 4
|
|
const u32 bucketid = ((u32)ph[0] << 8) | ph[1];
|
|
#elif BUCKBITS == 12 && RESTBITS == 8
|
|
const u32 bucketid = ((u32)ph[0] << 4) | ph[1] >> 4;
|
|
#elif BUCKBITS == 11 && RESTBITS == 9
|
|
const u32 bucketid = ((u32)ph[0] << 3) | ph[1] >> 5;
|
|
#elif BUCKBITS == 20 && RESTBITS == 4
|
|
const u32 bucketid = ((((u32)ph[0] << 8) | ph[1]) << 4) | ph[2] >> 4;
|
|
#elif BUCKBITS == 12 && RESTBITS == 4
|
|
const u32 bucketid = ((u32)ph[0] << 4) | ph[1] >> 4;
|
|
const u32 xhash = ph[1] & 0xf;
|
|
#else
|
|
#error not implemented
|
|
#endif
|
|
const u32 slot = getslot(0, bucketid);
|
|
if (slot >= NSLOTS) {
|
|
bfull++;
|
|
continue;
|
|
}
|
|
slot0 &s = hta.trees0[0][bucketid][slot];
|
|
s.attr = tree(block * HASHESPERBLAKE + i);
|
|
memcpy(s.hash->bytes+htl.nextbo, ph+WN/8-hashbytes, hashbytes);
|
|
}
|
|
}
|
|
}
|
|
|
|
void digitodd(const u32 r, const u32 id) {
|
|
htlayout htl(this, r);
|
|
collisiondata cd;
|
|
for (u32 bucketid=id; bucketid < NBUCKETS; bucketid += nthreads) {
|
|
cd.clear();
|
|
slot0 *buck = htl.hta.trees0[(r-1)/2][bucketid]; // optimize by updating previous buck?!
|
|
u32 bsize = getnslots(r-1, bucketid); // optimize by putting bucketsize with block?!
|
|
for (u32 s1 = 0; s1 < bsize; s1++) {
|
|
const slot0 *pslot1 = buck + s1; // optimize by updating previous pslot1?!
|
|
if (!cd.addslot(s1, htl.getxhash0(pslot1))) {
|
|
xfull++;
|
|
continue;
|
|
}
|
|
for (; cd.nextcollision(); ) {
|
|
const u32 s0 = cd.slot();
|
|
const slot0 *pslot0 = buck + s0;
|
|
if (htl.equal(pslot0->hash, pslot1->hash)) {
|
|
hfull++;
|
|
continue;
|
|
}
|
|
u32 xorbucketid;
|
|
const uchar *bytes0 = pslot0->hash->bytes, *bytes1 = pslot1->hash->bytes;
|
|
#if WN == 200 && BUCKBITS == 12 && RESTBITS == 8
|
|
xorbucketid = (((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) & 0xf) << 8)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]);
|
|
#elif WN == 200 && BUCKBITS == 11 && RESTBITS == 9
|
|
xorbucketid = (((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) & 0xf) << 7)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]) >> 1;
|
|
#elif WN == 144 && BUCKBITS == 20 && RESTBITS == 4
|
|
xorbucketid = ((((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) << 8)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2])) << 4)
|
|
| (bytes0[htl.prevbo+3] ^ bytes1[htl.prevbo+3]) >> 4;
|
|
#elif WN == 96 && BUCKBITS == 12 && RESTBITS == 4
|
|
xorbucketid = ((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) << 4)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]) >> 4;
|
|
#else
|
|
#error not implemented
|
|
#endif
|
|
const u32 xorslot = getslot(r, xorbucketid);
|
|
if (xorslot >= NSLOTS) {
|
|
bfull++;
|
|
continue;
|
|
}
|
|
slot1 &xs = htl.hta.trees1[r/2][xorbucketid][xorslot];
|
|
xs.attr = tree(bucketid, s0, s1);
|
|
for (u32 i=htl.dunits; i < htl.prevhashunits; i++)
|
|
xs.hash[i-htl.dunits].word = pslot0->hash[i].word ^ pslot1->hash[i].word;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void digiteven(const u32 r, const u32 id) {
|
|
htlayout htl(this, r);
|
|
collisiondata cd;
|
|
for (u32 bucketid=id; bucketid < NBUCKETS; bucketid += nthreads) {
|
|
cd.clear();
|
|
slot1 *buck = htl.hta.trees1[(r-1)/2][bucketid]; // OPTIMIZE BY UPDATING PREVIOUS
|
|
u32 bsize = getnslots(r-1, bucketid);
|
|
for (u32 s1 = 0; s1 < bsize; s1++) {
|
|
const slot1 *pslot1 = buck + s1; // OPTIMIZE BY UPDATING PREVIOUS
|
|
if (!cd.addslot(s1, htl.getxhash1(pslot1))) {
|
|
xfull++;
|
|
continue;
|
|
}
|
|
for (; cd.nextcollision(); ) {
|
|
const u32 s0 = cd.slot();
|
|
const slot1 *pslot0 = buck + s0;
|
|
if (htl.equal(pslot0->hash, pslot1->hash)) {
|
|
hfull++;
|
|
continue;
|
|
}
|
|
u32 xorbucketid;
|
|
const uchar *bytes0 = pslot0->hash->bytes, *bytes1 = pslot1->hash->bytes;
|
|
#if WN == 200 && BUCKBITS == 12 && RESTBITS == 8
|
|
xorbucketid = ((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) << 4)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]) >> 4;
|
|
#elif WN == 200 && BUCKBITS == 11 && RESTBITS == 9
|
|
xorbucketid = ((u32)(bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]) << 3)
|
|
| (bytes0[htl.prevbo+3] ^ bytes1[htl.prevbo+3]) >> 5;
|
|
#elif WN == 144 && BUCKBITS == 20 && RESTBITS == 4
|
|
xorbucketid = ((((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) << 8)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2])) << 4)
|
|
| (bytes0[htl.prevbo+3] ^ bytes1[htl.prevbo+3]) >> 4;
|
|
#elif WN == 96 && BUCKBITS == 12 && RESTBITS == 4
|
|
xorbucketid = ((u32)(bytes0[htl.prevbo+1] ^ bytes1[htl.prevbo+1]) << 4)
|
|
| (bytes0[htl.prevbo+2] ^ bytes1[htl.prevbo+2]) >> 4;
|
|
#else
|
|
#error not implemented
|
|
#endif
|
|
const u32 xorslot = getslot(r, xorbucketid);
|
|
if (xorslot >= NSLOTS) {
|
|
bfull++;
|
|
continue;
|
|
}
|
|
slot0 &xs = htl.hta.trees0[r/2][xorbucketid][xorslot];
|
|
xs.attr = tree(bucketid, s0, s1);
|
|
for (u32 i=htl.dunits; i < htl.prevhashunits; i++)
|
|
xs.hash[i-htl.dunits].word = pslot0->hash[i].word ^ pslot1->hash[i].word;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void digitK(const u32 id) {
|
|
collisiondata cd;
|
|
htlayout htl(this, WK);
|
|
u32 nc = 0;
|
|
for (u32 bucketid = id; bucketid < NBUCKETS; bucketid += nthreads) {
|
|
cd.clear();
|
|
slot0 *buck = htl.hta.trees0[(WK-1)/2][bucketid];
|
|
u32 bsize = getnslots(WK-1, bucketid);
|
|
for (u32 s1 = 0; s1 < bsize; s1++) {
|
|
const slot0 *pslot1 = buck + s1;
|
|
if (!cd.addslot(s1, htl.getxhash0(pslot1))) // assume WK odd
|
|
continue;
|
|
for (; cd.nextcollision(); ) {
|
|
const u32 s0 = cd.slot();
|
|
if (htl.equal(buck[s0].hash, pslot1->hash))
|
|
nc++, candidate(tree(bucketid, s0, s1));
|
|
}
|
|
}
|
|
}
|
|
//printf(" %d candidates ", nc);
|
|
}
|
|
};
|
|
|
|
typedef struct {
|
|
u32 id;
|
|
pthread_t thread;
|
|
equi *eq;
|
|
} thread_ctx;
|
|
|
|
void barrier(pthread_barrier_t *barry) {
|
|
const int rc = pthread_barrier_wait(barry);
|
|
if (rc != 0 && rc != PTHREAD_BARRIER_SERIAL_THREAD) {
|
|
// printf("Could not wait on barrier\n");
|
|
pthread_exit(NULL);
|
|
}
|
|
}
|
|
|
|
void *worker(void *vp) {
|
|
thread_ctx *tp = (thread_ctx *)vp;
|
|
equi *eq = tp->eq;
|
|
|
|
if (tp->id == 0)
|
|
// printf("Digit 0\n");
|
|
barrier(&eq->barry);
|
|
eq->digit0(tp->id);
|
|
barrier(&eq->barry);
|
|
if (tp->id == 0) {
|
|
eq->xfull = eq->bfull = eq->hfull = 0;
|
|
eq->showbsizes(0);
|
|
}
|
|
barrier(&eq->barry);
|
|
for (u32 r = 1; r < WK; r++) {
|
|
if (tp->id == 0)
|
|
// printf("Digit %d", r);
|
|
barrier(&eq->barry);
|
|
r&1 ? eq->digitodd(r, tp->id) : eq->digiteven(r, tp->id);
|
|
barrier(&eq->barry);
|
|
if (tp->id == 0) {
|
|
// printf(" x%d b%d h%d\n", eq->xfull, eq->bfull, eq->hfull);
|
|
eq->xfull = eq->bfull = eq->hfull = 0;
|
|
eq->showbsizes(r);
|
|
}
|
|
barrier(&eq->barry);
|
|
}
|
|
if (tp->id == 0)
|
|
// printf("Digit %d\n", WK);
|
|
eq->digitK(tp->id);
|
|
barrier(&eq->barry);
|
|
pthread_exit(NULL);
|
|
return 0;
|
|
}
|