From: Nicholas Ormrod Date: Mon, 22 Sep 2014 18:27:18 +0000 (-0700) Subject: Fix lint errors X-Git-Tag: v0.22.0~342 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f4a587cd1494371359adaf7f296c0d3a8ee3a2b;p=folly.git Fix lint errors Summary: Lines exceeding 80 characters have been restructured. Test Plan: fbconfig -r folly && fbmake runtests Reviewed By: robbert@fb.com Subscribers: trunkagent, sdwilsh, fugalh, njormrod FB internal diff: D1568086 --- diff --git a/folly/ConcurrentSkipList.h b/folly/ConcurrentSkipList.h index 987aa094..620446f9 100644 --- a/folly/ConcurrentSkipList.h +++ b/folly/ConcurrentSkipList.h @@ -769,7 +769,8 @@ class ConcurrentSkipList::Skipper { findInsertionPoint(preds_[lyr], lyr, data, preds_, succs_); if (foundLayer < 0) return false; - DCHECK(succs_[0] != nullptr) << "lyr=" << lyr << "; max_layer=" << max_layer; + DCHECK(succs_[0] != nullptr) << "lyr=" << lyr + << "; max_layer=" << max_layer; return !succs_[0]->markedForRemoval(); } diff --git a/folly/SpookyHashV1.h b/folly/SpookyHashV1.h index 6d32c709..9efa1113 100644 --- a/folly/SpookyHashV1.h +++ b/folly/SpookyHashV1.h @@ -143,18 +143,18 @@ public: uint64_t &s4, uint64_t &s5, uint64_t &s6, uint64_t &s7, uint64_t &s8, uint64_t &s9, uint64_t &s10,uint64_t &s11) { - s0 += data[0]; s2 ^= s10; s11 ^= s0; s0 = Rot64(s0,11); s11 += s1; - s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = Rot64(s1,32); s0 += s2; - s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = Rot64(s2,43); s1 += s3; - s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = Rot64(s3,31); s2 += s4; - s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = Rot64(s4,17); s3 += s5; - s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = Rot64(s5,28); s4 += s6; - s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = Rot64(s6,39); s5 += s7; - s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = Rot64(s7,57); s6 += s8; - s8 += data[8]; s10 ^= s6; s7 ^= s8; s8 = Rot64(s8,55); s7 += s9; - s9 += data[9]; s11 ^= s7; s8 ^= s9; s9 = Rot64(s9,54); s8 += s10; - s10 += data[10]; s0 ^= s8; s9 ^= s10; s10 = Rot64(s10,22); s9 += s11; - s11 += data[11]; s1 ^= s9; s10 ^= s11; s11 = Rot64(s11,46); s10 += s0; + s0 += data[0]; s2 ^= s10; s11 ^= s0; s0 = Rot64(s0,11); s11 += s1; + s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = Rot64(s1,32); s0 += s2; + s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = Rot64(s2,43); s1 += s3; + s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = Rot64(s3,31); s2 += s4; + s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = Rot64(s4,17); s3 += s5; + s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = Rot64(s5,28); s4 += s6; + s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = Rot64(s6,39); s5 += s7; + s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = Rot64(s7,57); s6 += s8; + s8 += data[8]; s10 ^= s6; s7 ^= s8; s8 = Rot64(s8,55); s7 += s9; + s9 += data[9]; s11 ^= s7; s8 ^= s9; s9 = Rot64(s9,54); s8 += s10; + s10 += data[10]; s0 ^= s8; s9 ^= s10; s10 = Rot64(s10,22); s9 += s11; + s11 += data[11]; s1 ^= s9; s10 ^= s11; s11 = Rot64(s11,46); s10 += s0; } // @@ -217,7 +217,8 @@ public: // with diffs defined by either xor or subtraction // with a base of all zeros plus a counter, or plus another bit, or random // - static inline void ShortMix(uint64_t &h0, uint64_t &h1, uint64_t &h2, uint64_t &h3) + static inline void ShortMix(uint64_t &h0, uint64_t &h1, + uint64_t &h2, uint64_t &h3) { h2 = Rot64(h2,50); h2 += h3; h0 ^= h2; h3 = Rot64(h3,52); h3 += h0; h1 ^= h3; @@ -245,7 +246,8 @@ public: // For every pair of input bits, // with probability 50 +- .75% (the worst case is approximately that) // - static inline void ShortEnd(uint64_t &h0, uint64_t &h1, uint64_t &h2, uint64_t &h3) + static inline void ShortEnd(uint64_t &h0, uint64_t &h1, + uint64_t &h2, uint64_t &h3) { h3 ^= h2; h2 = Rot64(h2,15); h3 += h2; h0 ^= h3; h3 = Rot64(h3,52); h0 += h3; @@ -269,7 +271,7 @@ private: // held to the same quality bar. // static void Short( - const void *message, // message (array of bytes, not necessarily aligned) + const void *message, // message (byte array, not necessarily aligned) size_t length, // length of message (in bytes) uint64_t *hash1, // in/out: in the seed, out the hash value uint64_t *hash2); // in/out: in the seed, out the hash value diff --git a/folly/SpookyHashV2.cpp b/folly/SpookyHashV2.cpp index c7ecaf6a..e6113a39 100644 --- a/folly/SpookyHashV2.cpp +++ b/folly/SpookyHashV2.cpp @@ -23,7 +23,8 @@ // April 10 2012: buffer overflow on platforms without unaligned reads // July 12 2012: was passing out variables in final to in/out in short // July 30 2012: I reintroduced the buffer overflow -// August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash +// August 5 2012: SpookyV2: d = should be d += in short hash, and remove +// extra mix from long hash #include diff --git a/folly/SpookyHashV2.h b/folly/SpookyHashV2.h index 709489a2..3bb2dfb3 100644 --- a/folly/SpookyHashV2.h +++ b/folly/SpookyHashV2.h @@ -144,18 +144,18 @@ public: uint64_t &s4, uint64_t &s5, uint64_t &s6, uint64_t &s7, uint64_t &s8, uint64_t &s9, uint64_t &s10,uint64_t &s11) { - s0 += data[0]; s2 ^= s10; s11 ^= s0; s0 = Rot64(s0,11); s11 += s1; - s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = Rot64(s1,32); s0 += s2; - s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = Rot64(s2,43); s1 += s3; - s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = Rot64(s3,31); s2 += s4; - s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = Rot64(s4,17); s3 += s5; - s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = Rot64(s5,28); s4 += s6; - s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = Rot64(s6,39); s5 += s7; - s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = Rot64(s7,57); s6 += s8; - s8 += data[8]; s10 ^= s6; s7 ^= s8; s8 = Rot64(s8,55); s7 += s9; - s9 += data[9]; s11 ^= s7; s8 ^= s9; s9 = Rot64(s9,54); s8 += s10; - s10 += data[10]; s0 ^= s8; s9 ^= s10; s10 = Rot64(s10,22); s9 += s11; - s11 += data[11]; s1 ^= s9; s10 ^= s11; s11 = Rot64(s11,46); s10 += s0; + s0 += data[0]; s2 ^= s10; s11 ^= s0; s0 = Rot64(s0,11); s11 += s1; + s1 += data[1]; s3 ^= s11; s0 ^= s1; s1 = Rot64(s1,32); s0 += s2; + s2 += data[2]; s4 ^= s0; s1 ^= s2; s2 = Rot64(s2,43); s1 += s3; + s3 += data[3]; s5 ^= s1; s2 ^= s3; s3 = Rot64(s3,31); s2 += s4; + s4 += data[4]; s6 ^= s2; s3 ^= s4; s4 = Rot64(s4,17); s3 += s5; + s5 += data[5]; s7 ^= s3; s4 ^= s5; s5 = Rot64(s5,28); s4 += s6; + s6 += data[6]; s8 ^= s4; s5 ^= s6; s6 = Rot64(s6,39); s5 += s7; + s7 += data[7]; s9 ^= s5; s6 ^= s7; s7 = Rot64(s7,57); s6 += s8; + s8 += data[8]; s10 ^= s6; s7 ^= s8; s8 = Rot64(s8,55); s7 += s9; + s9 += data[9]; s11 ^= s7; s8 ^= s9; s9 = Rot64(s9,54); s8 += s10; + s10 += data[10]; s0 ^= s8; s9 ^= s10; s10 = Rot64(s10,22); s9 += s11; + s11 += data[11]; s1 ^= s9; s10 ^= s11; s11 = Rot64(s11,46); s10 += s0; } // @@ -222,7 +222,8 @@ public: // with diffs defined by either xor or subtraction // with a base of all zeros plus a counter, or plus another bit, or random // - static inline void ShortMix(uint64_t &h0, uint64_t &h1, uint64_t &h2, uint64_t &h3) + static inline void ShortMix(uint64_t &h0, uint64_t &h1, + uint64_t &h2, uint64_t &h3) { h2 = Rot64(h2,50); h2 += h3; h0 ^= h2; h3 = Rot64(h3,52); h3 += h0; h1 ^= h3; @@ -250,7 +251,8 @@ public: // For every pair of input bits, // with probability 50 +- .75% (the worst case is approximately that) // - static inline void ShortEnd(uint64_t &h0, uint64_t &h1, uint64_t &h2, uint64_t &h3) + static inline void ShortEnd(uint64_t &h0, uint64_t &h1, + uint64_t &h2, uint64_t &h3) { h3 ^= h2; h2 = Rot64(h2,15); h3 += h2; h0 ^= h3; h3 = Rot64(h3,52); h0 += h3; @@ -274,7 +276,7 @@ private: // held to the same quality bar. // static void Short( - const void *message, // message (array of bytes, not necessarily aligned) + const void *message, // message (byte array, not necessarily aligned) size_t length, // length of message (in bytes) uint64_t *hash1, // in/out: in the seed, out the hash value uint64_t *hash2); // in/out: in the seed, out the hash value diff --git a/folly/detail/Malloc.h b/folly/detail/Malloc.h index 99c8dabe..1b4ea5ac 100644 --- a/folly/detail/Malloc.h +++ b/folly/detail/Malloc.h @@ -30,7 +30,8 @@ size_t xallocx(void*, size_t, size_t, int) __attribute__((__weak__)); size_t sallocx(const void*, int) __attribute__((__weak__)); void dallocx(void*, int) __attribute__((__weak__)); size_t nallocx(size_t, int) __attribute__((__weak__)); -int mallctl(const char*, void*, size_t*, void*, size_t) __attribute__((__weak__)); +int mallctl(const char*, void*, size_t*, void*, size_t) + __attribute__((__weak__)); #else extern void* (*mallocx)(size_t, int); extern void* (*rallocx)(void*, size_t, int); diff --git a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp b/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp index 4a133fb9..ba21ed6a 100644 --- a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp +++ b/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp @@ -56,8 +56,8 @@ void CPUThreadPoolExecutor::threadRun(std::shared_ptr thread) { LOG(ERROR) << "CPUThreadPoolExecutor: func threw unhandled " << typeid(e).name() << " exception: " << e.what(); } catch (...) { - LOG(ERROR) << "CPUThreadPoolExecutor: func threw unhandled non-exception " - "object"; + LOG(ERROR) << "CPUThreadPoolExecutor: func threw unhandled " + "non-exception object"; } thread->idle = true; } diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp index 6a3ecf46..804836f6 100644 --- a/folly/test/SpookyHashV1Test.cpp +++ b/folly/test/SpookyHashV1Test.cpp @@ -74,7 +74,8 @@ private: }; // fastest conceivable hash function (for comparison) -static void Add(const void *data, size_t length, uint64_t *hash1, uint64_t *hash2) +static void Add(const void *data, size_t length, + uint64_t *hash1, uint64_t *hash2) { uint64_t *p64 = (uint64_t *)data; uint64_t *end = p64 + length/8; @@ -426,8 +427,10 @@ void TestDeltas(int seed) { buf1[j/8] ^= (1 << (j%8)); } - SpookyHashV1::Hash128(buf1, h, &measure[0][0], &measure[0][1]); - SpookyHashV1::Hash128(buf2, h, &measure[1][0], &measure[1][1]); + SpookyHashV1::Hash128(buf1, h, + &measure[0][0], &measure[0][1]); + SpookyHashV1::Hash128(buf2, h, + &measure[1][0], &measure[1][1]); for (int l=0; l<2; ++l) { measure[2][l] = measure[0][l] ^ measure[1][l]; measure[3][l] = ~(measure[0][l] ^ measure[1][l]); diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp index 74369cd4..eaa27ace 100644 --- a/folly/test/SpookyHashV2Test.cpp +++ b/folly/test/SpookyHashV2Test.cpp @@ -74,7 +74,8 @@ private: }; // fastest conceivable hash function (for comparison) -static void Add(const void *data, size_t length, uint64_t *hash1, uint64_t *hash2) +static void Add(const void *data, size_t length, + uint64_t *hash1, uint64_t *hash2) { uint64_t *p64 = (uint64_t *)data; uint64_t *end = p64 + length/8; @@ -93,77 +94,141 @@ void TestResults() { printf("\ntesting results ...\n"); static const uint64_t expected[BUFSIZE] = { - 0x6bf50919,0x70de1d26,0xa2b37298,0x35bc5fbf,0x8223b279,0x5bcb315e,0x53fe88a1,0xf9f1a233, - 0xee193982,0x54f86f29,0xc8772d36,0x9ed60886,0x5f23d1da,0x1ed9f474,0xf2ef0c89,0x83ec01f9, - 0xf274736c,0x7e9ac0df,0xc7aed250,0xb1015811,0xe23470f5,0x48ac20c4,0xe2ab3cd5,0x608f8363, - 0xd0639e68,0xc4e8e7ab,0x863c7c5b,0x4ea63579,0x99ae8622,0x170c658b,0x149ba493,0x027bca7c, - 0xe5cfc8b6,0xce01d9d7,0x11103330,0x5d1f5ed4,0xca720ecb,0xef408aec,0x733b90ec,0x855737a6, - 0x9856c65f,0x647411f7,0x50777c74,0xf0f1a8b7,0x9d7e55a5,0xc68dd371,0xfc1af2cc,0x75728d0a, - 0x390e5fdc,0xf389b84c,0xfb0ccf23,0xc95bad0e,0x5b1cb85a,0x6bdae14f,0x6deb4626,0x93047034, - 0x6f3266c6,0xf529c3bd,0x396322e7,0x3777d042,0x1cd6a5a2,0x197b402e,0xc28d0d2b,0x09c1afb4, - - 0x069c8bb7,0x6f9d4e1e,0xd2621b5c,0xea68108d,0x8660cb8f,0xd61e6de6,0x7fba15c7,0xaacfaa97, - 0xdb381902,0x4ea22649,0x5d414a1e,0xc3fc5984,0xa0fc9e10,0x347dc51c,0x37545fb6,0x8c84b26b, - 0xf57efa5d,0x56afaf16,0xb6e1eb94,0x9218536a,0xe3cc4967,0xd3275ef4,0xea63536e,0x6086e499, - 0xaccadce7,0xb0290d82,0x4ebfd0d6,0x46ccc185,0x2eeb10d3,0x474e3c8c,0x23c84aee,0x3abae1cb, - 0x1499b81a,0xa2993951,0xeed176ad,0xdfcfe84c,0xde4a961f,0x4af13fe6,0xe0069c42,0xc14de8f5, - 0x6e02ce8f,0x90d19f7f,0xbca4a484,0xd4efdd63,0x780fd504,0xe80310e3,0x03abbc12,0x90023849, - 0xd6f6fb84,0xd6b354c5,0x5b8575f0,0x758f14e4,0x450de862,0x90704afb,0x47209a33,0xf226b726, - 0xf858dab8,0x7c0d6de9,0xb05ce777,0xee5ff2d4,0x7acb6d5c,0x2d663f85,0x41c72a91,0x82356bf2, - - 0x94e948ec,0xd358d448,0xeca7814d,0x78cd7950,0xd6097277,0x97782a5d,0xf43fc6f4,0x105f0a38, - 0x9e170082,0x4bfe566b,0x4371d25f,0xef25a364,0x698eb672,0x74f850e4,0x4678ff99,0x4a290dc6, - 0x3918f07c,0x32c7d9cd,0x9f28e0af,0x0d3c5a86,0x7bfc8a45,0xddf0c7e1,0xdeacb86b,0x970b3c5c, - 0x5e29e199,0xea28346d,0x6b59e71b,0xf8a8a46a,0x862f6ce4,0x3ccb740b,0x08761e9e,0xbfa01e5f, - 0xf17cfa14,0x2dbf99fb,0x7a0be420,0x06137517,0xe020b266,0xd25bfc61,0xff10ed00,0x42e6be8b, - 0x029ef587,0x683b26e0,0xb08afc70,0x7c1fd59e,0xbaae9a70,0x98c8c801,0xb6e35a26,0x57083971, - 0x90a6a680,0x1b44169e,0x1dce237c,0x518e0a59,0xccb11358,0x7b8175fb,0xb8fe701a,0x10d259bb, - 0xe806ce10,0x9212be79,0x4604ae7b,0x7fa22a84,0xe715b13a,0x0394c3b2,0x11efbbae,0xe13d9e19, - - 0x77e012bd,0x2d05114c,0xaecf2ddd,0xb2a2b4aa,0xb9429546,0x55dce815,0xc89138f8,0x46dcae20, - 0x1f6f7162,0x0c557ebc,0x5b996932,0xafbbe7e2,0xd2bd5f62,0xff475b9f,0x9cec7108,0xeaddcffb, - 0x5d751aef,0xf68f7bdf,0xf3f4e246,0x00983fcd,0x00bc82bb,0xbf5fd3e7,0xe80c7e2c,0x187d8b1f, - 0xefafb9a7,0x8f27a148,0x5c9606a9,0xf2d2be3e,0xe992d13a,0xe4bcd152,0xce40b436,0x63d6a1fc, - 0xdc1455c4,0x64641e39,0xd83010c9,0x2d535ae0,0x5b748f3e,0xf9a9146b,0x80f10294,0x2859acd4, - 0x5fc846da,0x56d190e9,0x82167225,0x98e4daba,0xbf7865f3,0x00da7ae4,0x9b7cd126,0x644172f8, - 0xde40c78f,0xe8803efc,0xdd331a2b,0x48485c3c,0x4ed01ddc,0x9c0b2d9e,0xb1c6e9d7,0xd797d43c, - 0x274101ff,0x3bf7e127,0x91ebbc56,0x7ffeb321,0x4d42096f,0xd6e9456a,0x0bade318,0x2f40ee0b, - - 0x38cebf03,0x0cbc2e72,0xbf03e704,0x7b3e7a9a,0x8e985acd,0x90917617,0x413895f8,0xf11dde04, - 0xc66f8244,0xe5648174,0x6c420271,0x2469d463,0x2540b033,0xdc788e7b,0xe4140ded,0x0990630a, - 0xa54abed4,0x6e124829,0xd940155a,0x1c8836f6,0x38fda06c,0x5207ab69,0xf8be9342,0x774882a8, - 0x56fc0d7e,0x53a99d6e,0x8241f634,0x9490954d,0x447130aa,0x8cc4a81f,0x0868ec83,0xc22c642d, - 0x47880140,0xfbff3bec,0x0f531f41,0xf845a667,0x08c15fb7,0x1996cd81,0x86579103,0xe21dd863, - 0x513d7f97,0x3984a1f1,0xdfcdc5f4,0x97766a5e,0x37e2b1da,0x41441f3f,0xabd9ddba,0x23b755a9, - 0xda937945,0x103e650e,0x3eef7c8f,0x2760ff8d,0x2493a4cd,0x1d671225,0x3bf4bd4c,0xed6e1728, - 0xc70e9e30,0x4e05e529,0x928d5aa6,0x164d0220,0xb5184306,0x4bd7efb3,0x63830f11,0xf3a1526c, - - 0xf1545450,0xd41d5df5,0x25a5060d,0x77b368da,0x4fe33c7e,0xeae09021,0xfdb053c4,0x2930f18d, - 0xd37109ff,0x8511a781,0xc7e7cdd7,0x6aeabc45,0xebbeaeaa,0x9a0c4f11,0xda252cbb,0x5b248f41, - 0x5223b5eb,0xe32ab782,0x8e6a1c97,0x11d3f454,0x3e05bd16,0x0059001d,0xce13ac97,0xf83b2b4c, - 0x71db5c9a,0xdc8655a6,0x9e98597b,0x3fcae0a2,0x75e63ccd,0x076c72df,0x4754c6ad,0x26b5627b, - 0xd818c697,0x998d5f3d,0xe94fc7b2,0x1f49ad1a,0xca7ff4ea,0x9fe72c05,0xfbd0cbbf,0xb0388ceb, - 0xb76031e3,0xd0f53973,0xfb17907c,0xa4c4c10f,0x9f2d8af9,0xca0e56b0,0xb0d9b689,0xfcbf37a3, - 0xfede8f7d,0xf836511c,0x744003fc,0x89eba576,0xcfdcf6a6,0xc2007f52,0xaaaf683f,0x62d2f9ca, - 0xc996f77f,0x77a7b5b3,0x8ba7d0a4,0xef6a0819,0xa0d903c0,0x01b27431,0x58fffd4c,0x4827f45c, - - 0x44eb5634,0xae70edfc,0x591c740b,0x478bf338,0x2f3b513b,0x67bf518e,0x6fef4a0c,0x1e0b6917, - 0x5ac0edc5,0x2e328498,0x077de7d5,0x5726020b,0x2aeda888,0x45b637ca,0xcf60858d,0x3dc91ae2, - 0x3e6d5294,0xe6900d39,0x0f634c71,0x827a5fa4,0xc713994b,0x1c363494,0x3d43b615,0xe5fe7d15, - 0xf6ada4f2,0x472099d5,0x04360d39,0x7f2a71d0,0x88a4f5ff,0x2c28fac5,0x4cd64801,0xfd78dd33, - 0xc9bdd233,0x21e266cc,0x9bbf419d,0xcbf7d81d,0x80f15f96,0x04242657,0x53fb0f66,0xded11e46, - 0xf2fdba97,0x8d45c9f1,0x4eeae802,0x17003659,0xb9db81a7,0xe734b1b2,0x9503c54e,0xb7c77c3e, - 0x271dd0ab,0xd8b906b5,0x0d540ec6,0xf03b86e0,0x0fdb7d18,0x95e261af,0xad9ec04e,0x381f4a64, - 0xfec798d7,0x09ea20be,0x0ef4ca57,0x1e6195bb,0xfd0da78b,0xcea1653b,0x157d9777,0xf04af50f, - - 0xad7baa23,0xd181714a,0x9bbdab78,0x6c7d1577,0x645eb1e7,0xa0648264,0x35839ca6,0x2287ef45, - 0x32a64ca3,0x26111f6f,0x64814946,0xb0cddaf1,0x4351c59e,0x1b30471c,0xb970788a,0x30e9f597, - 0xd7e58df1,0xc6d2b953,0xf5f37cf4,0x3d7c419e,0xf91ecb2d,0x9c87fd5d,0xb22384ce,0x8c7ac51c, - 0x62c96801,0x57e54091,0x964536fe,0x13d3b189,0x4afd1580,0xeba62239,0xb82ea667,0xae18d43a, - 0xbef04402,0x1942534f,0xc54bf260,0x3c8267f5,0xa1020ddd,0x112fcc8a,0xde596266,0xe91d0856, - 0xf300c914,0xed84478e,0x5b65009e,0x4764da16,0xaf8e07a2,0x4088dc2c,0x9a0cad41,0x2c3f179b, - 0xa67b83f7,0xf27eab09,0xdbe10e28,0xf04c911f,0xd1169f87,0x8e1e4976,0x17f57744,0xe4f5a33f, - 0x27c2e04b,0x0b7523bd,0x07305776,0xc6be7503,0x918fa7c9,0xaf2e2cd9,0x82046f8e,0xcc1c8250 + 0x6bf50919,0x70de1d26,0xa2b37298,0x35bc5fbf, + 0x8223b279,0x5bcb315e,0x53fe88a1,0xf9f1a233, + 0xee193982,0x54f86f29,0xc8772d36,0x9ed60886, + 0x5f23d1da,0x1ed9f474,0xf2ef0c89,0x83ec01f9, + 0xf274736c,0x7e9ac0df,0xc7aed250,0xb1015811, + 0xe23470f5,0x48ac20c4,0xe2ab3cd5,0x608f8363, + 0xd0639e68,0xc4e8e7ab,0x863c7c5b,0x4ea63579, + 0x99ae8622,0x170c658b,0x149ba493,0x027bca7c, + 0xe5cfc8b6,0xce01d9d7,0x11103330,0x5d1f5ed4, + 0xca720ecb,0xef408aec,0x733b90ec,0x855737a6, + 0x9856c65f,0x647411f7,0x50777c74,0xf0f1a8b7, + 0x9d7e55a5,0xc68dd371,0xfc1af2cc,0x75728d0a, + 0x390e5fdc,0xf389b84c,0xfb0ccf23,0xc95bad0e, + 0x5b1cb85a,0x6bdae14f,0x6deb4626,0x93047034, + 0x6f3266c6,0xf529c3bd,0x396322e7,0x3777d042, + 0x1cd6a5a2,0x197b402e,0xc28d0d2b,0x09c1afb4, + + 0x069c8bb7,0x6f9d4e1e,0xd2621b5c,0xea68108d, + 0x8660cb8f,0xd61e6de6,0x7fba15c7,0xaacfaa97, + 0xdb381902,0x4ea22649,0x5d414a1e,0xc3fc5984, + 0xa0fc9e10,0x347dc51c,0x37545fb6,0x8c84b26b, + 0xf57efa5d,0x56afaf16,0xb6e1eb94,0x9218536a, + 0xe3cc4967,0xd3275ef4,0xea63536e,0x6086e499, + 0xaccadce7,0xb0290d82,0x4ebfd0d6,0x46ccc185, + 0x2eeb10d3,0x474e3c8c,0x23c84aee,0x3abae1cb, + 0x1499b81a,0xa2993951,0xeed176ad,0xdfcfe84c, + 0xde4a961f,0x4af13fe6,0xe0069c42,0xc14de8f5, + 0x6e02ce8f,0x90d19f7f,0xbca4a484,0xd4efdd63, + 0x780fd504,0xe80310e3,0x03abbc12,0x90023849, + 0xd6f6fb84,0xd6b354c5,0x5b8575f0,0x758f14e4, + 0x450de862,0x90704afb,0x47209a33,0xf226b726, + 0xf858dab8,0x7c0d6de9,0xb05ce777,0xee5ff2d4, + 0x7acb6d5c,0x2d663f85,0x41c72a91,0x82356bf2, + + 0x94e948ec,0xd358d448,0xeca7814d,0x78cd7950, + 0xd6097277,0x97782a5d,0xf43fc6f4,0x105f0a38, + 0x9e170082,0x4bfe566b,0x4371d25f,0xef25a364, + 0x698eb672,0x74f850e4,0x4678ff99,0x4a290dc6, + 0x3918f07c,0x32c7d9cd,0x9f28e0af,0x0d3c5a86, + 0x7bfc8a45,0xddf0c7e1,0xdeacb86b,0x970b3c5c, + 0x5e29e199,0xea28346d,0x6b59e71b,0xf8a8a46a, + 0x862f6ce4,0x3ccb740b,0x08761e9e,0xbfa01e5f, + 0xf17cfa14,0x2dbf99fb,0x7a0be420,0x06137517, + 0xe020b266,0xd25bfc61,0xff10ed00,0x42e6be8b, + 0x029ef587,0x683b26e0,0xb08afc70,0x7c1fd59e, + 0xbaae9a70,0x98c8c801,0xb6e35a26,0x57083971, + 0x90a6a680,0x1b44169e,0x1dce237c,0x518e0a59, + 0xccb11358,0x7b8175fb,0xb8fe701a,0x10d259bb, + 0xe806ce10,0x9212be79,0x4604ae7b,0x7fa22a84, + 0xe715b13a,0x0394c3b2,0x11efbbae,0xe13d9e19, + + 0x77e012bd,0x2d05114c,0xaecf2ddd,0xb2a2b4aa, + 0xb9429546,0x55dce815,0xc89138f8,0x46dcae20, + 0x1f6f7162,0x0c557ebc,0x5b996932,0xafbbe7e2, + 0xd2bd5f62,0xff475b9f,0x9cec7108,0xeaddcffb, + 0x5d751aef,0xf68f7bdf,0xf3f4e246,0x00983fcd, + 0x00bc82bb,0xbf5fd3e7,0xe80c7e2c,0x187d8b1f, + 0xefafb9a7,0x8f27a148,0x5c9606a9,0xf2d2be3e, + 0xe992d13a,0xe4bcd152,0xce40b436,0x63d6a1fc, + 0xdc1455c4,0x64641e39,0xd83010c9,0x2d535ae0, + 0x5b748f3e,0xf9a9146b,0x80f10294,0x2859acd4, + 0x5fc846da,0x56d190e9,0x82167225,0x98e4daba, + 0xbf7865f3,0x00da7ae4,0x9b7cd126,0x644172f8, + 0xde40c78f,0xe8803efc,0xdd331a2b,0x48485c3c, + 0x4ed01ddc,0x9c0b2d9e,0xb1c6e9d7,0xd797d43c, + 0x274101ff,0x3bf7e127,0x91ebbc56,0x7ffeb321, + 0x4d42096f,0xd6e9456a,0x0bade318,0x2f40ee0b, + + 0x38cebf03,0x0cbc2e72,0xbf03e704,0x7b3e7a9a, + 0x8e985acd,0x90917617,0x413895f8,0xf11dde04, + 0xc66f8244,0xe5648174,0x6c420271,0x2469d463, + 0x2540b033,0xdc788e7b,0xe4140ded,0x0990630a, + 0xa54abed4,0x6e124829,0xd940155a,0x1c8836f6, + 0x38fda06c,0x5207ab69,0xf8be9342,0x774882a8, + 0x56fc0d7e,0x53a99d6e,0x8241f634,0x9490954d, + 0x447130aa,0x8cc4a81f,0x0868ec83,0xc22c642d, + 0x47880140,0xfbff3bec,0x0f531f41,0xf845a667, + 0x08c15fb7,0x1996cd81,0x86579103,0xe21dd863, + 0x513d7f97,0x3984a1f1,0xdfcdc5f4,0x97766a5e, + 0x37e2b1da,0x41441f3f,0xabd9ddba,0x23b755a9, + 0xda937945,0x103e650e,0x3eef7c8f,0x2760ff8d, + 0x2493a4cd,0x1d671225,0x3bf4bd4c,0xed6e1728, + 0xc70e9e30,0x4e05e529,0x928d5aa6,0x164d0220, + 0xb5184306,0x4bd7efb3,0x63830f11,0xf3a1526c, + + 0xf1545450,0xd41d5df5,0x25a5060d,0x77b368da, + 0x4fe33c7e,0xeae09021,0xfdb053c4,0x2930f18d, + 0xd37109ff,0x8511a781,0xc7e7cdd7,0x6aeabc45, + 0xebbeaeaa,0x9a0c4f11,0xda252cbb,0x5b248f41, + 0x5223b5eb,0xe32ab782,0x8e6a1c97,0x11d3f454, + 0x3e05bd16,0x0059001d,0xce13ac97,0xf83b2b4c, + 0x71db5c9a,0xdc8655a6,0x9e98597b,0x3fcae0a2, + 0x75e63ccd,0x076c72df,0x4754c6ad,0x26b5627b, + 0xd818c697,0x998d5f3d,0xe94fc7b2,0x1f49ad1a, + 0xca7ff4ea,0x9fe72c05,0xfbd0cbbf,0xb0388ceb, + 0xb76031e3,0xd0f53973,0xfb17907c,0xa4c4c10f, + 0x9f2d8af9,0xca0e56b0,0xb0d9b689,0xfcbf37a3, + 0xfede8f7d,0xf836511c,0x744003fc,0x89eba576, + 0xcfdcf6a6,0xc2007f52,0xaaaf683f,0x62d2f9ca, + 0xc996f77f,0x77a7b5b3,0x8ba7d0a4,0xef6a0819, + 0xa0d903c0,0x01b27431,0x58fffd4c,0x4827f45c, + + 0x44eb5634,0xae70edfc,0x591c740b,0x478bf338, + 0x2f3b513b,0x67bf518e,0x6fef4a0c,0x1e0b6917, + 0x5ac0edc5,0x2e328498,0x077de7d5,0x5726020b, + 0x2aeda888,0x45b637ca,0xcf60858d,0x3dc91ae2, + 0x3e6d5294,0xe6900d39,0x0f634c71,0x827a5fa4, + 0xc713994b,0x1c363494,0x3d43b615,0xe5fe7d15, + 0xf6ada4f2,0x472099d5,0x04360d39,0x7f2a71d0, + 0x88a4f5ff,0x2c28fac5,0x4cd64801,0xfd78dd33, + 0xc9bdd233,0x21e266cc,0x9bbf419d,0xcbf7d81d, + 0x80f15f96,0x04242657,0x53fb0f66,0xded11e46, + 0xf2fdba97,0x8d45c9f1,0x4eeae802,0x17003659, + 0xb9db81a7,0xe734b1b2,0x9503c54e,0xb7c77c3e, + 0x271dd0ab,0xd8b906b5,0x0d540ec6,0xf03b86e0, + 0x0fdb7d18,0x95e261af,0xad9ec04e,0x381f4a64, + 0xfec798d7,0x09ea20be,0x0ef4ca57,0x1e6195bb, + 0xfd0da78b,0xcea1653b,0x157d9777,0xf04af50f, + + 0xad7baa23,0xd181714a,0x9bbdab78,0x6c7d1577, + 0x645eb1e7,0xa0648264,0x35839ca6,0x2287ef45, + 0x32a64ca3,0x26111f6f,0x64814946,0xb0cddaf1, + 0x4351c59e,0x1b30471c,0xb970788a,0x30e9f597, + 0xd7e58df1,0xc6d2b953,0xf5f37cf4,0x3d7c419e, + 0xf91ecb2d,0x9c87fd5d,0xb22384ce,0x8c7ac51c, + 0x62c96801,0x57e54091,0x964536fe,0x13d3b189, + 0x4afd1580,0xeba62239,0xb82ea667,0xae18d43a, + 0xbef04402,0x1942534f,0xc54bf260,0x3c8267f5, + 0xa1020ddd,0x112fcc8a,0xde596266,0xe91d0856, + 0xf300c914,0xed84478e,0x5b65009e,0x4764da16, + 0xaf8e07a2,0x4088dc2c,0x9a0cad41,0x2c3f179b, + 0xa67b83f7,0xf27eab09,0xdbe10e28,0xf04c911f, + 0xd1169f87,0x8e1e4976,0x17f57744,0xe4f5a33f, + 0x27c2e04b,0x0b7523bd,0x07305776,0xc6be7503, + 0x918fa7c9,0xaf2e2cd9,0x82046f8e,0xcc1c8250 }; uint8_t buf[BUFSIZE]; @@ -352,8 +417,10 @@ void TestDeltas(int seed) { buf1[j/8] ^= (1 << (j%8)); } - SpookyHashV2::Hash128(buf1, h, &measure[0][0], &measure[0][1]); - SpookyHashV2::Hash128(buf2, h, &measure[1][0], &measure[1][1]); + SpookyHashV2::Hash128(buf1, h, + &measure[0][0], &measure[0][1]); + SpookyHashV2::Hash128(buf2, h, + &measure[1][0], &measure[1][1]); for (int l=0; l<2; ++l) { measure[2][l] = measure[0][l] ^ measure[1][l]; measure[3][l] = ~(measure[0][l] ^ measure[1][l]); diff --git a/folly/wangle/Future-inl.h b/folly/wangle/Future-inl.h index f8751f5e..9a0fe997 100644 --- a/folly/wangle/Future-inl.h +++ b/folly/wangle/Future-inl.h @@ -257,7 +257,8 @@ Future makeFuture(std::exception_ptr const& e) { } template -typename std::enable_if::value, Future>::type +typename std::enable_if::value, + Future>::type makeFuture(E const& e) { Promise p; auto f = p.getFuture(); diff --git a/folly/wangle/Future.h b/folly/wangle/Future.h index e8ac8121..e9ee2fb2 100644 --- a/folly/wangle/Future.h +++ b/folly/wangle/Future.h @@ -261,7 +261,8 @@ Future makeFuture(std::exception_ptr const& e); /** Make a Future from an exception type E that can be passed to std::make_exception_ptr(). */ template -typename std::enable_if::value, Future>::type +typename std::enable_if::value, + Future>::type makeFuture(E const& e); /** Make a Future out of a Try */ diff --git a/folly/wangle/test/Thens.h b/folly/wangle/test/Thens.h index dc66cc17..995ff848 100644 --- a/folly/wangle/test/Thens.h +++ b/folly/wangle/test/Thens.h @@ -56,7 +56,8 @@ aFunction(Params...) { template std::function -aStdFunction(typename std::enable_if::value, bool>::type = false) { +aStdFunction( + typename std::enable_if::value, bool>::type = false) { return [](Params...) -> Ret { return Ret(); }; }