SL-793: Use Boost.Fiber instead of the "dcoroutine" library.

Longtime fans will remember that the "dcoroutine" library is a Google Summer
of Code project by Giovanni P. Deretta. He originally called it
"Boost.Coroutine," and we originally added it to our 3p-boost autobuild
package as such. But when the official Boost.Coroutine library came along
(with a very different API), and we still needed the API of the GSoC project,
we renamed the unofficial one "dcoroutine" to allow coexistence.

The "dcoroutine" library had an internal low-level API more or less analogous
to Boost.Context. We later introduced an implementation of that internal API
based on Boost.Context, a step towards eliminating the GSoC code in favor of
official, supported Boost code.

However, recent versions of Boost.Context no longer support the API on which
we built the shim for "dcoroutine." We started down the path of reimplementing
that shim using the current Boost.Context API -- then realized that it's time
to bite the bullet and replace the "dcoroutine" API with the Boost.Fiber API,
which we've been itching to do for literally years now.

Naturally, most of the heavy lifting is in llcoros.{h,cpp} and
lleventcoro.{h,cpp} -- which is good: the LLCoros layer abstracts away most of
the differences between "dcoroutine" and Boost.Fiber.

The one feature Boost.Fiber does not provide is the ability to forcibly
terminate some other fiber. Accordingly, disable LLCoros::kill() and
LLCoprocedureManager::shutdown(). The only known shutdown() call was in
LLCoprocedurePool's destructor.

We also took the opportunity to remove postAndSuspend2() and its associated
machinery: FutureListener2, LLErrorEvent, errorException(), errorLog(),
LLCoroEventPumps. All that dual-LLEventPump stuff was introduced at a time
when the Responder pattern was king, and we assumed we'd want to listen on one
LLEventPump with the success handler and on another with the error handler. We
have never actually used that in practice. Remove associated tests, of course.

There is one other semantic difference that necessitates patching a number of
tests: with "dcoroutine," fulfilling a future IMMEDIATELY resumes the waiting
coroutine. With Boost.Fiber, fulfilling a future merely marks the fiber as
ready to resume next time the scheduler gets around to it. To observe the test
side effects, we've inserted a number of llcoro::suspend() calls -- also in
the main loop.

For a long time we retained a single unit test exercising the raw "dcoroutine"
API. Remove that.

Eliminate llcoro_get_id.{h,cpp}, which provided llcoro::get_id(), which was a
hack to emulate fiber-local variables. Since Boost.Fiber has an actual API for
that, remove the hack.

In fact, use (new alias) LLCoros::local_ptr for LLSingleton's dependency
tracking in place of llcoro::get_id().

In CMake land, replace BOOST_COROUTINE_LIBRARY with BOOST_FIBER_LIBRARY. We
don't actually use the Boost.Coroutine for anything (though there exist
plausible use cases).

1 files changed, 33 insertions, 565 deletions

diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp
index fa02d2bb1a..2e4b6ba823 100644
--- a/indra/llcommon/tests/lleventcoro_test.cpp
+++ b/indra/llcommon/tests/lleventcoro_test.cpp
@@ -26,50 +26,12 @@
  * $/LicenseInfo$
  */
 
-/*****************************************************************************/
-//  test<1>() is cloned from a Boost.Coroutine example program whose copyright
-//  info is reproduced here:
-/*---------------------------------------------------------------------------*/
-//  Copyright (c) 2006, Giovanni P. Deretta
-//
-//  This code may be used under either of the following two licences:
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy 
-//  of this software and associated documentation files (the "Software"), to deal 
-//  in the Software without restriction, including without limitation the rights 
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-//  copies of the Software, and to permit persons to whom the Software is 
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in 
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-//  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-//  THE SOFTWARE. OF SUCH DAMAGE.
-//
-//  Or:
-//
-//  Distributed under the Boost Software License, Version 1.0.
-//  (See accompanying file LICENSE_1_0.txt or copy at
-//  http://www.boost.org/LICENSE_1_0.txt)
-/*****************************************************************************/
-
 #define BOOST_RESULT_OF_USE_TR1 1
-// On some platforms, Boost.Coroutine must #define magic symbols before
-// #including platform-API headers. Naturally, that's ineffective unless the
-// Boost.Coroutine #include is the *first* #include of the platform header.
-// That means that client code must generally #include Boost.Coroutine headers
-// before anything else.
-#include <boost/dcoroutine/coroutine.hpp>
 #include <boost/bind.hpp>
 #include <boost/range.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
 
 #include "linden_common.h"
 
@@ -80,8 +42,6 @@
 #include "llsd.h"
 #include "llsdutil.h"
 #include "llevents.h"
-#include "tests/wrapllerrs.h"
-#include "stringize.h"
 #include "llcoros.h"
 #include "lleventcoro.h"
 #include "../test/debug.h"
@@ -89,39 +49,6 @@
 using namespace llcoro;
 
 /*****************************************************************************
-*   from the banana.cpp example program borrowed for test<1>()
-*****************************************************************************/
-namespace coroutines = boost::dcoroutines;
-using coroutines::coroutine;
-
-template<typename Iter>
-bool match(Iter first, Iter last, std::string match) {
-  std::string::iterator i = match.begin();
-  for(; (first != last) && (i != match.end()); ++i) {
-    if (*first != *i)
-      return false;
-    ++first;
-  }
-  return i == match.end();
-}
-
-template<typename BidirectionalIterator> 
-BidirectionalIterator 
-match_substring(BidirectionalIterator begin, 
-		BidirectionalIterator end, 
-		std::string xmatch,
-		BOOST_DEDUCED_TYPENAME coroutine<BidirectionalIterator(void)>::self& self) { 
-//BidirectionalIterator begin_ = begin;
-  for(; begin != end; ++begin) 
-    if(match(begin, end, xmatch)) {
-      self.yield(begin);
-    }
-  return end;
-} 
-
-typedef coroutine<std::string::iterator(void)> match_coroutine_type;
-
-/*****************************************************************************
 *   Test helpers
 *****************************************************************************/
 /// Simulate an event API whose response is immediate: sent on receipt of the
@@ -150,6 +77,8 @@ public:
         LLSD::Integer value(event["value"]);
         LLSD::String replyPumpName(event.has("fail")? "error" : "reply");
         LLEventPumps::instance().obtain(event[replyPumpName]).post(value + 1);
+        // give listener a chance to process
+        llcoro::suspend();
         return false;
     }
 
@@ -167,51 +96,6 @@ namespace tut
     typedef coroutine_group::object object;
     coroutine_group coroutinegrp("coroutine");
 
-    template<> template<>
-    void object::test<1>()
-    {
-        set_test_name("From banana.cpp example program in Boost.Coroutine distro");
-        std::string buffer = "banananana"; 
-        std::string match = "nana"; 
-        std::string::iterator begin = buffer.begin();
-        std::string::iterator end = buffer.end();
-
-#if defined(BOOST_CORO_POSIX_IMPL)
-//      std::cout << "Using Boost.Coroutine " << BOOST_CORO_POSIX_IMPL << '\n';
-#else
-//      std::cout << "Using non-Posix Boost.Coroutine implementation" << std::endl;
-#endif
-
-        typedef std::string::iterator signature(std::string::iterator, 
-                                                std::string::iterator, 
-                                                std::string,
-                                                match_coroutine_type::self&);
-
-        coroutine<std::string::iterator(void)> matcher
-            (boost::bind(static_cast<signature*>(match_substring), 
-                         begin, 
-                         end, 
-                         match, 
-                         _1)); 
-
-        std::string::iterator i = matcher();
-/*==========================================================================*|
-        while(matcher && i != buffer.end()) {
-            std::cout <<"Match at: "<< std::distance(buffer.begin(), i)<<'\n'; 
-            i = matcher();
-        }
-|*==========================================================================*/
-        size_t matches[] = { 2, 4, 6 };
-        for (size_t *mi(boost::begin(matches)), *mend(boost::end(matches));
-             mi != mend; ++mi, i = matcher())
-        {
-            ensure("more", matcher);
-            ensure("found", i != buffer.end());
-            ensure_equals("value", std::distance(buffer.begin(), i), *mi);
-        }
-        ensure("done", ! matcher);
-    }
-
     // use static data so we can intersperse coroutine functions with the
     // tests that engage them
     ImmediateAPI immediateAPI;
@@ -231,7 +115,7 @@ namespace tut
         which = 0;
     }
 
-    void explicit_wait(boost::shared_ptr<LLCoros::Future<std::string>::callback_t>& cbp)
+    void explicit_wait(boost::shared_ptr<LLCoros::Promise<std::string>>& cbp)
     {
         BEGIN
         {
@@ -241,44 +125,40 @@ namespace tut
             // provides a callback-style notification (and prove that it
             // works).
 
-            LLCoros::Future<std::string> future;
-            // get the callback from that future
-            LLCoros::Future<std::string>::callback_t callback(future.make_callback());
-
             // Perhaps we would send a request to a remote server and arrange
-            // for 'callback' to be called on response. Of course that might
-            // involve an adapter object from the actual callback signature to
-            // the signature of 'callback' -- in this case, void(std::string).
-            // For test purposes, instead of handing 'callback' (or the
+            // for cbp->set_value() to be called on response.
+            // For test purposes, instead of handing 'callback' (or an
             // adapter) off to some I/O subsystem, we'll just pass it back to
             // our caller.
-            cbp.reset(new LLCoros::Future<std::string>::callback_t(callback));
+            cbp = boost::make_shared<LLCoros::Promise<std::string>>();
+            LLCoros::Future<std::string> future = LLCoros::getFuture(*cbp);
 
-            ensure("Not yet", ! future);
             // calling get() on the future causes us to suspend
             debug("about to suspend");
             stringdata = future.get();
-            ensure("Got it", bool(future));
+            ensure_equals("Got it", stringdata, "received");
         }
         END
     }
 
     template<> template<>
-    void object::test<2>()
+    void object::test<1>()
     {
         clear();
         set_test_name("explicit_wait");
         DEBUG;
 
         // Construct the coroutine instance that will run explicit_wait.
-        boost::shared_ptr<LLCoros::Future<std::string>::callback_t> respond;
-        LLCoros::instance().launch("test<2>",
+        boost::shared_ptr<LLCoros::Promise<std::string>> respond;
+        LLCoros::instance().launch("test<1>",
                                    boost::bind(explicit_wait, boost::ref(respond)));
         // When the coroutine waits for the future, it returns here.
         debug("about to respond");
-        // Now we're the I/O subsystem delivering a result. This immediately
-        // transfers control back to the coroutine.
-        (*respond)("received");
+        // Now we're the I/O subsystem delivering a result. This should make
+        // the coroutine ready.
+        respond->set_value("received");
+        // but give it a chance to wake up
+        llcoro::suspend();
         // ensure the coroutine ran and woke up again with the intended result
         ensure_equals(stringdata, "received");
     }
@@ -293,60 +173,20 @@ namespace tut
     }
 
     template<> template<>
-    void object::test<3>()
+    void object::test<2>()
     {
         clear();
         set_test_name("waitForEventOn1");
         DEBUG;
-        LLCoros::instance().launch("test<3>", waitForEventOn1);
+        LLCoros::instance().launch("test<2>", waitForEventOn1);
         debug("about to send");
         LLEventPumps::instance().obtain("source").post("received");
+        // give waitForEventOn1() a chance to run
+        llcoro::suspend();
         debug("back from send");
         ensure_equals(result.asString(), "received");
     }
 
-    void waitForEventOn2()
-    {
-        BEGIN
-        {
-            LLEventWithID pair = suspendUntilEventOn("reply", "error");
-            result = pair.first;
-            which  = pair.second;
-            debug(STRINGIZE("result = " << result << ", which = " << which));
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<4>()
-    {
-        clear();
-        set_test_name("waitForEventOn2 reply");
-        {
-        DEBUG;
-        LLCoros::instance().launch("test<4>", waitForEventOn2);
-        debug("about to send");
-        LLEventPumps::instance().obtain("reply").post("received");
-        debug("back from send");
-        }
-        ensure_equals(result.asString(), "received");
-        ensure_equals("which pump", which, 0);
-    }
-
-    template<> template<>
-    void object::test<5>()
-    {
-        clear();
-        set_test_name("waitForEventOn2 error");
-        DEBUG;
-        LLCoros::instance().launch("test<5>", waitForEventOn2);
-        debug("about to send");
-        LLEventPumps::instance().obtain("error").post("badness");
-        debug("back from send");
-        ensure_equals(result.asString(), "badness");
-        ensure_equals("which pump", which, 1);
-    }
-
     void coroPump()
     {
         BEGIN
@@ -359,175 +199,20 @@ namespace tut
     }
 
     template<> template<>
-    void object::test<6>()
+    void object::test<3>()
     {
         clear();
         set_test_name("coroPump");
         DEBUG;
-        LLCoros::instance().launch("test<6>", coroPump);
-        debug("about to send");
-        LLEventPumps::instance().obtain(replyName).post("received");
-        debug("back from send");
-        ensure_equals(result.asString(), "received");
-    }
-
-    void coroPumps()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            replyName = waiter.getName0();
-            errorName = waiter.getName1();
-            LLEventWithID pair(waiter.suspend());
-            result = pair.first;
-            which  = pair.second;
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<7>()
-    {
-        clear();
-        set_test_name("coroPumps reply");
-        DEBUG;
-        LLCoros::instance().launch("test<7>", coroPumps);
-        debug("about to send");
-        LLEventPumps::instance().obtain(replyName).post("received");
-        debug("back from send");
-        ensure_equals(result.asString(), "received");
-        ensure_equals("which pump", which, 0);
-    }
-
-    template<> template<>
-    void object::test<8>()
-    {
-        clear();
-        set_test_name("coroPumps error");
-        DEBUG;
-        LLCoros::instance().launch("test<8>", coroPumps);
-        debug("about to send");
-        LLEventPumps::instance().obtain(errorName).post("badness");
-        debug("back from send");
-        ensure_equals(result.asString(), "badness");
-        ensure_equals("which pump", which, 1);
-    }
-
-    void coroPumpsNoEx()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            replyName = waiter.getName0();
-            errorName = waiter.getName1();
-            result = waiter.suspendWithException();
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<9>()
-    {
-        clear();
-        set_test_name("coroPumpsNoEx");
-        DEBUG;
-        LLCoros::instance().launch("test<9>", coroPumpsNoEx);
-        debug("about to send");
-        LLEventPumps::instance().obtain(replyName).post("received");
-        debug("back from send");
-        ensure_equals(result.asString(), "received");
-    }
-
-    void coroPumpsEx()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            replyName = waiter.getName0();
-            errorName = waiter.getName1();
-            try
-            {
-                result = waiter.suspendWithException();
-                debug("no exception");
-            }
-            catch (const LLErrorEvent& e)
-            {
-                debug(STRINGIZE("exception " << e.what()));
-                errordata = e.getData();
-            }
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<10>()
-    {
-        clear();
-        set_test_name("coroPumpsEx");
-        DEBUG;
-        LLCoros::instance().launch("test<10>", coroPumpsEx);
-        debug("about to send");
-        LLEventPumps::instance().obtain(errorName).post("badness");
-        debug("back from send");
-        ensure("no result", result.isUndefined());
-        ensure_equals("got error", errordata.asString(), "badness");
-    }
-
-    void coroPumpsNoLog()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            replyName = waiter.getName0();
-            errorName = waiter.getName1();
-            result = waiter.suspendWithLog();
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<11>()
-    {
-        clear();
-        set_test_name("coroPumpsNoLog");
-        DEBUG;
-        LLCoros::instance().launch("test<11>", coroPumpsNoLog);
+        LLCoros::instance().launch("test<3>", coroPump);
         debug("about to send");
         LLEventPumps::instance().obtain(replyName).post("received");
+        // give coroPump() a chance to run
+        llcoro::suspend();
         debug("back from send");
         ensure_equals(result.asString(), "received");
     }
 
-    void coroPumpsLog()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            replyName = waiter.getName0();
-            errorName = waiter.getName1();
-            WrapLLErrs capture;
-            threw = capture.catch_llerrs([&waiter, &debug](){
-                    result = waiter.suspendWithLog();
-                    debug("no exception");
-                });
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<12>()
-    {
-        clear();
-        set_test_name("coroPumpsLog");
-        DEBUG;
-        LLCoros::instance().launch("test<12>", coroPumpsLog);
-        debug("about to send");
-        LLEventPumps::instance().obtain(errorName).post("badness");
-        debug("back from send");
-        ensure("no result", result.isUndefined());
-        ensure_contains("got error", threw, "badness");
-    }
-
     void postAndWait1()
     {
         BEGIN
@@ -541,71 +226,17 @@ namespace tut
     }
 
     template<> template<>
-    void object::test<13>()
+    void object::test<4>()
     {
         clear();
         set_test_name("postAndWait1");
         DEBUG;
-        LLCoros::instance().launch("test<13>", postAndWait1);
+        LLCoros::instance().launch("test<4>", postAndWait1);
+        // give postAndWait1() a chance to run
+        llcoro::suspend();
         ensure_equals(result.asInteger(), 18);
     }
 
-    void postAndWait2()
-    {
-        BEGIN
-        {
-            LLEventWithID pair = ::postAndSuspend2(LLSDMap("value", 18),
-                                                immediateAPI.getPump(),
-                                                "reply2",
-                                                "error2",
-                                                "reply",
-                                                "error");
-            result = pair.first;
-            which  = pair.second;
-            debug(STRINGIZE("result = " << result << ", which = " << which));
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<14>()
-    {
-        clear();
-        set_test_name("postAndWait2");
-        DEBUG;
-        LLCoros::instance().launch("test<14>", postAndWait2);
-        ensure_equals(result.asInteger(), 19);
-        ensure_equals(which, 0);
-    }
-
-    void postAndWait2_1()
-    {
-        BEGIN
-        {
-            LLEventWithID pair = ::postAndSuspend2(LLSDMap("value", 18)("fail", LLSD()),
-                                                immediateAPI.getPump(),
-                                                "reply2",
-                                                "error2",
-                                                "reply",
-                                                "error");
-            result = pair.first;
-            which  = pair.second;
-            debug(STRINGIZE("result = " << result << ", which = " << which));
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<15>()
-    {
-        clear();
-        set_test_name("postAndWait2_1");
-        DEBUG;
-        LLCoros::instance().launch("test<15>", postAndWait2_1);
-        ensure_equals(result.asInteger(), 19);
-        ensure_equals(which, 1);
-    }
-
     void coroPumpPost()
     {
         BEGIN
@@ -618,177 +249,14 @@ namespace tut
     }
 
     template<> template<>
-    void object::test<16>()
+    void object::test<5>()
     {
         clear();
         set_test_name("coroPumpPost");
         DEBUG;
-        LLCoros::instance().launch("test<16>", coroPumpPost);
+        LLCoros::instance().launch("test<5>", coroPumpPost);
+        // give coroPumpPost() a chance to run
+        llcoro::suspend();
         ensure_equals(result.asInteger(), 18);
     }
-
-    void coroPumpsPost()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            LLEventWithID pair(waiter.postAndSuspend(LLSDMap("value", 23),
-                                                  immediateAPI.getPump(), "reply", "error"));
-            result = pair.first;
-            which  = pair.second;
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<17>()
-    {
-        clear();
-        set_test_name("coroPumpsPost reply");
-        DEBUG;
-        LLCoros::instance().launch("test<17>", coroPumpsPost);
-        ensure_equals(result.asInteger(), 24);
-        ensure_equals("which pump", which, 0);
-    }
-
-    void coroPumpsPost_1()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            LLEventWithID pair(
-                waiter.postAndSuspend(LLSDMap("value", 23)("fail", LLSD()),
-                                   immediateAPI.getPump(), "reply", "error"));
-            result = pair.first;
-            which  = pair.second;
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<18>()
-    {
-        clear();
-        set_test_name("coroPumpsPost error");
-        DEBUG;
-        LLCoros::instance().launch("test<18>", coroPumpsPost_1);
-        ensure_equals(result.asInteger(), 24);
-        ensure_equals("which pump", which, 1);
-    }
-
-    void coroPumpsPostNoEx()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            result = waiter.postAndSuspendWithException(LLSDMap("value", 8),
-                                                     immediateAPI.getPump(), "reply", "error");
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<19>()
-    {
-        clear();
-        set_test_name("coroPumpsPostNoEx");
-        DEBUG;
-        LLCoros::instance().launch("test<19>", coroPumpsPostNoEx);
-        ensure_equals(result.asInteger(), 9);
-    }
-
-    void coroPumpsPostEx()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            try
-            {
-                result = waiter.postAndSuspendWithException(
-                    LLSDMap("value", 9)("fail", LLSD()),
-                    immediateAPI.getPump(), "reply", "error");
-                debug("no exception");
-            }
-            catch (const LLErrorEvent& e)
-            {
-                debug(STRINGIZE("exception " << e.what()));
-                errordata = e.getData();
-            }
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<20>()
-    {
-        clear();
-        set_test_name("coroPumpsPostEx");
-        DEBUG;
-        LLCoros::instance().launch("test<20>", coroPumpsPostEx);
-        ensure("no result", result.isUndefined());
-        ensure_equals("got error", errordata.asInteger(), 10);
-    }
-
-    void coroPumpsPostNoLog()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            result = waiter.postAndSuspendWithLog(LLSDMap("value", 30),
-                                               immediateAPI.getPump(), "reply", "error");
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<21>()
-    {
-        clear();
-        set_test_name("coroPumpsPostNoLog");
-        DEBUG;
-        LLCoros::instance().launch("test<21>", coroPumpsPostNoLog);
-        ensure_equals(result.asInteger(), 31);
-    }
-
-    void coroPumpsPostLog()
-    {
-        BEGIN
-        {
-            LLCoroEventPumps waiter;
-            WrapLLErrs capture;
-            threw = capture.catch_llerrs(
-                [&waiter, &debug](){
-                    result = waiter.postAndSuspendWithLog(
-                        LLSDMap("value", 31)("fail", LLSD()),
-                        immediateAPI.getPump(), "reply", "error");
-                    debug("no exception");
-                });
-        }
-        END
-    }
-
-    template<> template<>
-    void object::test<22>()
-    {
-        clear();
-        set_test_name("coroPumpsPostLog");
-        DEBUG;
-        LLCoros::instance().launch("test<22>", coroPumpsPostLog);
-        ensure("no result", result.isUndefined());
-        ensure_contains("got error", threw, "32");
-    }
 }
-
-/*==========================================================================*|
-#include <boost/context/guarded_stack_allocator.hpp>
-
-namespace tut
-{
-    template<> template<>
-    void object::test<23>()
-    {
-        set_test_name("stacksize");
-        std::cout << "default_stacksize: " << boost::context::guarded_stack_allocator::default_stacksize() << '\n';
-    }
-} // namespace tut
-|*==========================================================================*/