1. 10 Apr, 2015 4 commits
    • Dave Watson's avatar
      shared ptr vector sockets · bd096087
      Dave Watson authored
      Summary: promote the sockets vector to a shared_ptr, since both ServerWorkerPool and ServerBootstrap use it.  Otherwise there are destruction order issues between ServerBootstrap and any IOThreadPoolExecutor you use
      
      Test Plan: Saw use after free in D1942242, gone after this.
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: chalfant, doug, fugalh, folly-diffs@, jsedgwick, yfeldblum
      
      FB internal diff: D1947553
      
      Signature: t1:1947553:1427484417:5b78f5c9c70d244d3f52a6f71b6d1fab7b29d106
      bd096087
    • Andrii Grynenko's avatar
      Use Fiber locals for TAO Fiber-locals · 9c19d342
      Andrii Grynenko authored
      Summary:
      This simplifies TAO fibers locals, using FiberManager based fiber-local storage.
      This depends on D1958135.
      
      Test Plan: integration tests
      
      Reviewed By: bwatling@fb.com
      
      Subscribers: alikhtarov
      
      FB internal diff: D1962214
      
      Signature: t1:1962214:1427997755:b546b9039382a7600f234b0a2a60cc96da34e662
      9c19d342
    • Andrii Grynenko's avatar
      Fiber-local context · 626aa2dd
      Andrii Grynenko authored
      Summary: This adds fiber-local context, which behaves more like static objects+fork rather than thread-locals.
      
      Test Plan: unit test
      
      Reviewed By: pavlo@fb.com, bwatling@fb.com
      
      Subscribers: rushix, alikhtarov, bwatling
      
      FB internal diff: D1958135
      
      Signature: t1:1958135:1427999426:8e4b89f4af53a1a119b2e5a765fb549dd8442c50
      626aa2dd
    • Joel Goguen's avatar
      Add static method to skip SSL init · 483f7edc
      Joel Goguen authored
      Summary:
      Some things like gSOAP, initialize SSL only to have SSLContext stomp over their
      work. Add a method to allow flagging SSLContext as "initialized" to use the
      existing global state.
      
      Test Plan:
      Tested running mcrouter and paymentnegined to verify existing
      functionality appears normal.
      
      Reviewed By: subodh@fb.com
      
      Subscribers: ssl-diffs@, folly-diffs@, yfeldblum, chalfant, dihde
      
      FB internal diff: D1959936
      
      Tasks: 6655251
      
      Signature: t1:1959936:1427994292:8b2be1742ef17a5ec2c7b3ad37787d2cf4d142a6
      483f7edc
  2. 02 Apr, 2015 28 commits
    • afrind's avatar
      Bump version to 34:0 · 7c9f2635
      afrind authored
      7c9f2635
    • Alan Frindell's avatar
      Update Makefile.am for AsyncSignalHandler · ace14bb4
      Alan Frindell authored
      Summary: facepalm
      
      Test Plan: Built proxygen OSS that depends on this symbol
      
      Reviewed By: davejwatson@fb.com
      
      Subscribers: doug, folly-diffs@, yfeldblum, chalfant
      
      FB internal diff: D1963679
      
      Signature: t1:1963679:1428006035:2c4ceffc046b995431cde2fbcef757fa7ea1ea0b
      ace14bb4
    • Rushi Desai's avatar
      Move mcrouter/lib/fibers to folly/experimental/fibers · 5de6b458
      Rushi Desai authored
      Summary:
      The mcrouter fibers library is quite general purpose and reusable by other projects. Hence I'm moving it into folly.
      
      Test Plan:
      fbconfig -r folly/experimental/fibers && fbmake runtests
      fbconfig -r mcrouter && fbmake runtests
      fbconfig -r tao && fbmake
      fbconfig -r ti && fbmake
      
      Reviewed By: andrii@fb.com
      
      Subscribers: vikas, zhuohuang, jmkaldor, jhunt, pavlo, int, aap, trunkagent, fredemmott, alikhtarov, folly-diffs@, jsedgwick, yfeldblum, chalfant, chip
      
      FB internal diff: D1958061
      
      Signature: t1:1958061:1428005194:b57bfecfe9678e81c48526f57e6197270e2b5a27
      5de6b458
    • afrind's avatar
      Bump version to 33:0 · 0217505d
      afrind authored
      0217505d
    • Dave Watson's avatar
      UDP bind via port or address · 965aa3ea
      Dave Watson authored
      Summary: Bind via port or address, similar to tcp
      
      Test Plan: I wrote a unittest that tested v4 vs v6 binding - can't check it in because we have v6 only clusters though.  Not sure how eles to write a unittest without picking specific ports
      
      Reviewed By: hans@fb.com
      
      Subscribers: doug, fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant
      
      FB internal diff: D1948938
      
      Signature: t1:1948938:1427841721:621031320981bf366a8252a0ea1d4491b694ea24
      965aa3ea
    • Alan Frindell's avatar
      Move TAsyncSignalHandler into folly · d2711b8a
      Alan Frindell authored
      Summary:
      TODO item, trying to remove unecessary dependencies on thrift
      
      Test Plan: Unit tests
      
      Reviewed By: davejwatson@fb.com
      
      Subscribers: doug, fbcode-common-diffs@, davejwatson, andrewcox, alandau, bmatheny, anca, darshan, mshneer, folly-diffs@, bil, yfeldblum, haijunz, chalfant
      
      FB internal diff: D1960215
      
      Signature: t1:1960215:1427920934:8abd7e94c50676b05bf7ff79800df0db1bd04266
      d2711b8a
    • Alan Frindell's avatar
      Add socket mocks · b6005aa3
      Alan Frindell authored
      Summary: These parallel the MockTAsync* from thrift/lib/cpp/test.  Once all the users of the thrift versions are gone they can be deleted
      
      Test Plan: Unit tests
      
      Reviewed By: yfeldblum@fb.com, alandau@fb.com
      
      Subscribers: doug, net-systems@, folly-diffs@, yfeldblum, chalfant
      
      FB internal diff: D1959979
      
      Signature: t1:1959979:1427917909:19af219f88dd6847a064da986dd30765e29bdc99
      b6005aa3
    • Alan Frindell's avatar
      Move AsyncSocket tests from thrift to folly · fe6985dd
      Alan Frindell authored
      Summary: These tests belong with the code that they test.  The old tests had a couple dependencies on TSocket/TSSLSocket, so I wrote a BlockingSocket wrapper for AsyncSocket/AsyncSSLSocket
      
      Test Plan: Ran the tests
      
      Reviewed By: alandau@fb.com
      
      Subscribers: doug, net-systems@, alandau, bmatheny, mshneer, folly-diffs@, yfeldblum, chalfant
      
      FB internal diff: D1959955
      
      Signature: t1:1959955:1427917833:73d334846cf248f8bb215f3eb5b596df7f7cee4f
      fe6985dd
    • Rushi Desai's avatar
      Move AtomicLinkedList to folly · 773ee3cb
      Rushi Desai authored
      Summary:
      Adding new atomic data structure from the mcrouter project.
      
      Test Plan: fbconfig -r mcrouter && fbmake runtests
      
      Reviewed By: andrii@fb.com
      
      Subscribers: alikhtarov, folly-diffs@, yfeldblum, chalfant, achao, jpearce
      
      FB internal diff: D1960219
      
      Signature: t1:1960219:1427921204:78e5313ea916b8a249d32e31cc7ba1aa9e890d95
      773ee3cb
    • Hannes Roth's avatar
      (Wangle) Swap order of Try<T> and T matching · 3ae1ec3c
      Hannes Roth authored
      Summary:
      See the test case and D1958860.
      
      I don't really know why I chose one over the other. This fixes a bug. So
      it's better?
      
      Test Plan: Run all the tests?
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: folly-diffs@, jsedgwick, yfeldblum, chalfant, over
      
      FB internal diff: D1960740
      
      Signature: t1:1960740:1427927644:25093b049a1519d7c869ee7043f3caced4cc971e
      3ae1ec3c
    • Naizhi Li's avatar
      Add support for writev for AsyncUDPSocket · 62e15017
      Naizhi Li authored
      Summary:
      I have 2 local buffers and instead of allocating iobufs
      on the heap, I can simply use iovec on the stack to send.
      
      Test Plan: Unit tests and turn server.
      
      Reviewed By: davejwatson@fb.com
      
      Subscribers: folly-diffs@, ehrhardt, yfeldblum, chalfant, paramr
      
      FB internal diff: D1956201
      
      Signature: t1:1956201:1427918649:09f00399fd9e8ed3fe62be43b19adbf0a5a3f3b0
      62e15017
    • Tom Jackson's avatar
      Minor fixes from documentation · 8cb80904
      Tom Jackson authored
      Test Plan: unittests
      
      Reviewed By: jbrewer@fb.com, ashishsharma@fb.com
      
      Subscribers: maxime, folly-diffs@, yfeldblum, chalfant
      
      FB internal diff: D1956101
      
      Signature: t1:1956101:1427828321:2d828e6f2c06c6dcd6e7baa3ed5e72ee59d9b77f
      8cb80904
    • Mark McDuff's avatar
      improve split() docs · 06607304
      Mark McDuff authored
      Summary:
      From reading the docs, I assumed that casting exceptions would be caught.  Let's clarify this.
      
      Test Plan: readingiskey
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: folly-diffs@, yfeldblum, chalfant
      
      FB internal diff: D1960186
      
      Signature: t1:1960186:1427920471:b7aa2af38a90a986418b98294fc0f69e678f0d1e
      06607304
    • Hannes Roth's avatar
      (Wangle) Allocate lambda space inside Core instead of inside std::function · 71463390
      Hannes Roth authored
      Summary:
      Taking this trick that is used in the fibers library. We can keep 64
      bytes of space inside `Core` to allocate the callback lambda into,
      instead of having `std::function` do another `malloc`. This seems to
      greatly improve the synthethic benchmark, and hopefully production
      workloads, too, by reducing the number of mallocs.
      
      64 bytes were picked because it fits all the lambdas in the futures
      tests. We might want to adjust this based on production data...?
      
      https://fb.intern.facebook.com/groups/715931878455430/permalink/837898842925399/
      
      Test Plan: Run all the tests for all platforms, compilers, and Windtunnel.
      
      Reviewed By: hans@fb.com
      
      Subscribers: chalfant, meisner, folly-diffs@, jsedgwick, yfeldblum
      
      FB internal diff: D1931620
      
      Signature: t1:1931620:1427841595:6ec667b58980be232dfb116bc316148bb67de4fc
      71463390
    • Dave Watson's avatar
      stop in same thread · b2901a61
      Dave Watson authored
      Summary: In a couple places in ServerBootstrap there is code that needs to run in the EB, but if we are already in the EB, it's fine to run it inline.  Maybe this should be a method on EB directly?  There is runInEventBaseThreadAndWait(), but it explicitly disallows this usage.
      
      Test Plan: used in D1942242, deadlocks without this, since stop() was called in the same eb
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: chalfant, doug, fugalh, folly-diffs@, jsedgwick, yfeldblum
      
      FB internal diff: D1947581
      
      Signature: t1:1947581:1427831021:d1d08ff9a4a00501d6be60670709fcb17af04134
      b2901a61
    • Joel Goguen's avatar
      Move OpenSSL uninitialization to a separate function · 3fc41801
      Joel Goguen authored
      Summary:
      The current behaviour of SSLContext is subject to a bug where an instance going
      out of scope at the wrong time can decrement the global refcount to 0, causing
      the destructor to destroy the SSL context. Instead, this requires callers to
      explicitly uninitialize the SSLContext instance and assume the risk of wrongly
      destroying the global SSL context.
      
      Test Plan:
      Tested with mcrouter
      
      Reviewed By: subodh@fb.com
      
      Subscribers: afrind, ssl-diffs@, folly-diffs@, yfeldblum, chalfant, dihde, melitam
      
      FB internal diff: D1949649
      
      Tasks: 6358211
      
      Signature: t1:1949649:1427854689:aea2dc801f63256ff64188b0f7a15121dcecee69
      3fc41801
    • Yuri Putivsky's avatar
      Get access to EventBaseManager object · 75ad72b0
      Yuri Putivsky authored
      Summary: as title
      
      Test Plan: run unit tests
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: ming, fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant
      
      FB internal diff: D1955074
      75ad72b0
    • Daniel Pittman's avatar
      MPMCQueue - FPE to invalid_argument for 0 capacity · 13dda79b
      Daniel Pittman authored
      Summary:
      If an MPMCQueue was initialized with an explicit zero capacity, it would
      try to compute stride for zero and trigger SIGFPE which pretty fatally
      killed the process -- but in a way that required gdb to figure out the
      root cause.
      
      This replaces that with a std::invalid_argument exception, which
      includes a description of the problem and should make fixing this user
      error much faster.
      
      Test Plan:
      GTEST unit test added to verify behaviour; if this didn't work it would
      SIGFPE and abort the test script, which is probably a good indicator
      that something went wrong. :)
      
      fbconfig -r folly && fbmake runtests
      
      Reviewed By: ngbronson@fb.com
      
      Subscribers: chalfant, folly-diffs@, yfeldblum, rkomorn
      
      FB internal diff: D1930978
      
      Signature: t1:1930978:1427740315:cc06a8b9f3c314b956ae41f813b2f904d3e979c9
      13dda79b
    • Dave Watson's avatar
      Default accept function in Acceptor · 43989f9d
      Dave Watson authored
      Summary: Since Acceptor can be used for TCP or UDP, make an empty default TCP accept function so subclasses don't have to.
      
      Test Plan:
      built D1942242, no build errors
      
      contbuild
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: doug, fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant
      
      FB internal diff: D1948940
      
      Signature: t1:1948940:1427498977:26b7bb23e3367ff6695dad86ebf0e60637815a7b
      43989f9d
    • Yedidya Feldblum's avatar
      EventBase::runImediatelyOrRunInEventBaseThreadAndWait. · cb2fe8d0
      Yedidya Feldblum authored
      Summary:
      [Folly] EventBase::runImediatelyOrRunInEventBaseThreadAndWait.
      
      When you have code that you need to run in the event loop and wait for it to finish, and you yourself might be in the event loop but might be in another thread instead.
      
      Test Plan:
      Unit tests:
      * `folly/io/async/test/EventBaseTest.cpp`.
      
      Reviewed By: davejwatson@fb.com
      
      Subscribers: folly-diffs@, yfeldblum, chalfant, agallagher, njormrod, ldbrandy, brettp, dougw
      
      FB internal diff: D1953110
      
      Signature: t1:1953110:1427751076:ad2c9f4d5b65ef952cba94b06be887672ee44583
      cb2fe8d0
    • Yuri Putivsky's avatar
      Fixing predicate inlining · 0ad80e7c
      Yuri Putivsky authored
      Summary:
      as title.
      
      Test Plan: run unit tests
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: ming, fugalh, folly-diffs@, jsedgwick, yfeldblum, ridge@
      
      FB internal diff: D1946589
      0ad80e7c
    • Yuri Putivsky's avatar
      Extend IO pool with external optional event_base_manager · cecc9aaa
      Yuri Putivsky authored
      Summary: as title
      
      Test Plan: run unit tests
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: ming, fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant
      
      FB internal diff: D1950610
      cecc9aaa
    • Dave Watson's avatar
      asyncudpserversocket reuse port · 3e3afca6
      Dave Watson authored
      Summary:
      AsyncUDPSocket supports reuse port, also make it available in AsyncUDPServerSocket.
      Has to happen before bind
      
      Test Plan:
      ?? it builds?
      
      Mutliple binds already work with reuseaddr, but load balancing doesn't work as well.  See http://lwn.net/Articles/542629/ for details
      
      Reviewed By: naizhi@fb.com
      
      Subscribers: doug, fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant
      
      FB internal diff: D1948932
      
      Signature: t1:1948932:1427473013:8c114458a0746bb2b6957db33c1834179d860c00
      3e3afca6
    • Hans Fugal's avatar
      Future::filter(A => bool) · 77c9cc67
      Hans Fugal authored
      Test Plan: new unit tests
      
      Reviewed By: davejwatson@fb.com
      
      Subscribers: chalfant, bmatheny, trunkagent, exa, folly-diffs@, yfeldblum, jsedgwick
      
      FB internal diff: D1828251
      
      Tasks: 6166893
      
      Signature: t1:1828251:1427475565:512463d5728482a40c1da2548a5bed91e7f92d60
      77c9cc67
    • Alexey Spiridonov's avatar
      Add CaptureFD for log testing (and some glog patterns) · 397a944b
      Alexey Spiridonov authored
      Summary:
      Without a gadget like this, it's really hard to test logging output. With it, it's really easy. I found about 50 callsites to the various functions across several projects, so folly seems appropriate.
      
      PS The patterns are functions for two reasons:
      - Static variables are a pain.
      - This leaves the option of adding an optional argument, so you can grep for a particular kind of error string.
      
      Test Plan: unit test
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: folly-diffs@, yfeldblum
      
      FB internal diff: D1933439
      
      Signature: t1:1933439:1427345479:5b3d1c6566a026fdbccb16b382211688e327ea1a
      397a944b
    • Alexey Spiridonov's avatar
      Add EXPECT_{NO_,}_PCRE_MATCH macros · 133fc50c
      Alexey Spiridonov authored
      Summary: There are about 40 callsites to these across a couple of projects, and they seem generally useful.
      
      Test Plan: ```fbconfig folly/experimental/test && fbmake runtests```
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: folly-diffs@, yfeldblum
      
      FB internal diff: D1933415
      
      Signature: t1:1933415:1427345307:6587eea3dac74c5d841950ace3c3501d6e3dbe4a
      133fc50c
    • Adam Simpkins's avatar
      TemporaryFile and TemporaryDirectory · bf0d2143
      Adam Simpkins authored
      Summary:
      TemporaryFile, TemporaryDirectory, and ChangeToTempDir should all be moveable
      objects, but not copiable.  Define default move constructors and move
      assignment operators for these classes.  This will prevent copy constructor and
      copy assignment operators from being implicitly defined.
      
      Test Plan:
      Used this in a new test to write a helper function which created and returned
      a new TemporaryFile object using the move constructor.
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: doug, net-systems@, exa, folly-diffs@, yfeldblum
      
      FB internal diff: D1945134
      
      Signature: t1:1945134:1427342944:3428327e797ce4b3d362f9a2d2276de6d8b96137
      bf0d2143
    • Hannes Roth's avatar
      (Wangle) Reduce · 3e447ce4
      Hannes Roth authored
      Summary:
      1] The lambda should ble able to return a `Try<T>`. Maybe? Can a `then`
      return a `Try<T>` actually? Can fix this with `resultOf`. (Doubling the number of functions to 4.)
      
      2] `initial` and `func` have to be copyable.
      
      Test Plan: Added tests.
      
      Reviewed By: hans@fb.com
      
      Subscribers: trunkagent, folly-diffs@, jsedgwick, yfeldblum
      
      FB internal diff: D1870996
      
      Tasks: 6025252
      
      Signature: t1:1870996:1427318511:2ae5894b79022da88990835b26d35c4520fdbd29
      3e447ce4
  3. 25 Mar, 2015 8 commits
    • Noam Lerner's avatar
      Bump version to 32:0 · 2184167a
      Noam Lerner authored
      2184167a
    • Ben Maurer's avatar
      Add a pretty macro for deprecation · 014ffabd
      Ben Maurer authored
      Summary: Make it easy for people to mark code as deprecated
      
      Test Plan: Chose a random file and added the FOLLY_DEPRECATED macro to it
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: ps, folly-diffs@, yfeldblum
      
      FB internal diff: D1943248
      
      Signature: t1:1943248:1427316689:b3305d134f374697e93d36bafbf0961eec1ef68a
      014ffabd
    • Sarang Masti's avatar
      Relax CHECK condition in stringAppendfImpl · 0dee3980
      Sarang Masti authored
      Summary:
      vsnprintf can return fewer bytes and bytes_used if
      we print a string containing '\0' using a width
      specifier.
      
      Test Plan: -- ran all tests
      
      Reviewed By: andrei.alexandrescu@fb.com
      
      Subscribers: folly-diffs@, yfeldblum
      
      FB internal diff: D1915035
      
      Signature: t1:1915035:1426799341:4aaea928c4bdde1998bf66cf9e2732a53572c6e3
      0dee3980
    • Dave Watson's avatar
      httpserver on serverbootstrap (2) · 71b91824
      Dave Watson authored
      Summary:
      Original diff D1800100, reverted in D1895181.  Issue seems to have been caused by a copy constructor issue.
      
      Fixes: Remove copy constructor, move contructor only.  Separate stop() and join(), since join() can happen only after all stop()s have completed when reusing the same IOThreadPoolExecutors.
      
      Test Plan: build and unit tests of relevant product
      
      Reviewed By: praveenr@fb.com
      
      Subscribers: trunkagent, doug, fugalh, alandau, bmatheny, mshneer, folly-diffs@, jsedgwick, yfeldblum
      
      FB internal diff: D1901718
      
      Tasks: 6431975
      
      Signature: t1:1901718:1426885577:46b63bfe117df207be3d273b953c100249c1a7da
      
      Blame Revision: D1895181
      71b91824
    • Alexey Spiridonov's avatar
      Add ChangeToTempDir to TestUtil · 87a4b661
      Alexey Spiridonov authored
      Summary: It's convenient to be able to write tempfiles in the current directory. This provides a one-liner way of doing that in tests.
      
      Test Plan: unit test
      
      Reviewed By: yfeldblum@fb.com
      
      Subscribers: simpkins, folly-diffs@, yfeldblum
      
      FB internal diff: D1931918
      
      Signature: t1:1931918:1426913634:f988fb3c5061f5909e309dcaf42742d9b2ed18c6
      87a4b661
    • Andrii Grynenko's avatar
      Make folly::Singleton DFATAL as late as possible · 278d263c
      Andrii Grynenko authored
      Summary: We want to print all destructor stack-traces if Singleton destruction happens eventually (even after destroyInstances() was done).
      
      Test Plan:
      unit test
      
      Reviewed By: chip@fb.com
      
      Subscribers: folly-diffs@, yfeldblum
      
      FB internal diff: D1929881
      
      Signature: t1:1929881:1426878091:5993d544c0f84bdbf8bcdd420ef01fb7bf88ac3f
      278d263c
    • Dave Watson's avatar
      Udp Acceptor · 4abb4669
      Dave Watson authored
      Summary:
      major changes:
      
      1) ServerSocketFactory and AsyncSocketBase to abstract the differences between UDP and TCP async socket.  Could possibly push some of this to the sockets themselves eventually
      2) pipeline() is a pipeline between accept/receive of a UDP message, and before sending it to workers.  Default impl for TCP is to fan out to worker threads.  This is the same as Netty.  Since we don't know if the data is a TCP socket or a UDP message, it's a void*, which sucks (netty uses Object msg, so it isn't any different).
      
      Test Plan: Added lots of new tests.  Doesn't test any data passing yet though, just connects/simple receipt of UDP message.
      
      Reviewed By: hans@fb.com
      
      Subscribers: alandau, bmatheny, mshneer, jsedgwick, yfeldblum, trunkagent, doug, fugalh, folly-diffs@
      
      FB internal diff: D1736670
      
      Tasks: 5788116
      
      Signature: t1:1736670:1424372992:e109450604ed905004bd40dfbb508b5808332c15
      4abb4669
    • Dave Watson's avatar
      fix service memory leak · 3e3b5e35
      Dave Watson authored
      Summary:
      This code is only used in a test so far.
      
      Basically it looks like Pipeline has some dependency issues - any addBack() pipelines have to be deleted *after* the main pipeline is destroyed.  Ideally if the pipeline is already closed, the destruction order wouldn't matter.  There is currently no removeBack() call either.   This is a quick fix for the test to just delete stuff in the right order, we can discuss a better solution when @jsedgwick returns
      
      Test Plan: fbconfig --sanitize=address --with-project-version=clang:3.5 --clang folly/wangle/service && fbmake runtests
      
      Reviewed By: hans@fb.com
      
      Subscribers: trunkagent, doug, fugalh, folly-diffs@, yfeldblum, jsedgwick
      
      FB internal diff: D1903200
      
      Tasks: 6415578
      
      Signature: t1:1903200:1426528298:e109dcc0ec586a505a26cd95a6f20434d22cbd37
      3e3b5e35