Test running without BoehmDisableGC

DeterminateSystems · Jul 22, 2024 · fb5b08c · fb5b08c
1 parent 867b9dc
commit fb5b08c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/libexpr/eval-gc.cc b/src/libexpr/eval-gc.cc
@@ -30,6 +30,7 @@ static void * oomHandler(size_t requested)
     throw std::bad_alloc();
 }
 
+#  if 0
 class BoehmGCStackAllocator : public StackAllocator
 {
     boost::coroutines2::protected_fixedsize_stack stack{
@@ -89,34 +90,34 @@ void fixupBoehmStackPointer(void ** sp_ptr, void * _pthread_id)
     void * osStackLow;
     void * osStackBase;
 
-#  ifdef __APPLE__
+#    ifdef __APPLE__
     osStackSize = pthread_get_stacksize_np(pthread_id);
     osStackLow = pthread_get_stackaddr_np(pthread_id);
-#  else
+#    else
     if (pthread_attr_init(&pattr)) {
         throw Error("fixupBoehmStackPointer: pthread_attr_init failed");
     }
-#    ifdef HAVE_PTHREAD_GETATTR_NP
+#      ifdef HAVE_PTHREAD_GETATTR_NP
     if (pthread_getattr_np(pthread_id, &pattr)) {
         throw Error("fixupBoehmStackPointer: pthread_getattr_np failed");
     }
-#    elif HAVE_PTHREAD_ATTR_GET_NP
+#      elif HAVE_PTHREAD_ATTR_GET_NP
     if (!pthread_attr_init(&pattr)) {
         throw Error("fixupBoehmStackPointer: pthread_attr_init failed");
     }
     if (!pthread_attr_get_np(pthread_id, &pattr)) {
         throw Error("fixupBoehmStackPointer: pthread_attr_get_np failed");
     }
-#    else
-#      error "Need one of `pthread_attr_get_np` or `pthread_getattr_np`"
-#    endif
+#      else
+#        error "Need one of `pthread_attr_get_np` or `pthread_getattr_np`"
+#      endif
     if (pthread_attr_getstack(&pattr, &osStackLow, &osStackSize)) {
         throw Error("fixupBoehmStackPointer: pthread_attr_getstack failed");
     }
     if (pthread_attr_destroy(&pattr)) {
         throw Error("fixupBoehmStackPointer: pthread_attr_destroy failed");
     }
-#  endif
+#    endif
     osStackBase = (char *) osStackLow + osStackSize;
     // NOTE: We assume the stack grows down, as it does on all architectures we support.
     //       Architectures that grow the stack up are rare.
@@ -142,6 +143,7 @@ class BoehmDisableGC
         GC_enable();
     };
 };
+#  endif
 
 static inline void initGCReal()
 {
@@ -159,22 +161,24 @@ static inline void initGCReal()
 
     GC_set_oom_fn(oomHandler);
 
+#  if 0
     StackAllocator::defaultAllocator = &boehmGCStackAllocator;
 
 // TODO: Remove __APPLE__ condition.
 //       Comment suggests an implementation that works on darwin and windows
 //       https://github.com/ivmai/bdwgc/issues/362#issuecomment-1936672196
-#  if GC_VERSION_MAJOR >= 8 && GC_VERSION_MINOR >= 2 && GC_VERSION_MICRO >= 4 && !defined(__APPLE__)
+#    if GC_VERSION_MAJOR >= 8 && GC_VERSION_MINOR >= 2 && GC_VERSION_MICRO >= 4 && !defined(__APPLE__)
     GC_set_sp_corrector(&fixupBoehmStackPointer);
 
     if (!GC_get_sp_corrector()) {
         printTalkative("BoehmGC on this platform does not support sp_corrector; will disable GC inside coroutines");
         /* Used to disable GC when entering coroutines on macOS */
         create_coro_gc_hook = []() -> std::shared_ptr<void> { return std::make_shared<BoehmDisableGC>(); };
     }
-#  else
-#    warning \
-        "BoehmGC version does not support GC while coroutine exists. GC will be disabled inside coroutines. Consider updating bdw-gc to 8.2.4 or later."
+#    else
+#      warning \
+          "BoehmGC version does not support GC while coroutine exists. GC will be disabled inside coroutines. Consider updating bdw-gc to 8.2.4 or later."
+#    endif
 #  endif
 
     /* Set the initial heap size to something fairly big (25% of

diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
@@ -241,7 +241,6 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
             cur = in;
 
             if (!coro) {
-                CoroutineContext ctx;
                 coro = coro_t::push_type(VirtualStackAllocator{}, [&](coro_t::pull_type & yield) {
                     LambdaSource source([&](char * out, size_t out_len) {
                         if (cur.empty()) {
@@ -262,7 +261,6 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
             if (!*coro) { abort(); }
 
             if (!cur.empty()) {
-                CoroutineContext ctx;
                 (*coro)(false);
             }
         }
@@ -272,7 +270,6 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
             if (!coro) return;
             if (!*coro) abort();
             {
-                CoroutineContext ctx;
                 (*coro)(true);
             }
             if (*coro) abort();
@@ -306,7 +303,6 @@ std::unique_ptr<Source> sinkToSource(
         size_t read(char * data, size_t len) override
         {
             if (!coro) {
-                CoroutineContext ctx;
                 coro = coro_t::pull_type(VirtualStackAllocator{}, [&](coro_t::push_type & yield) {
                     LambdaSink sink([&](std::string_view data) {
                         if (!data.empty()) yield(std::string(data));
@@ -319,7 +315,6 @@ std::unique_ptr<Source> sinkToSource(
 
             if (pos == cur.size()) {
                 if (!cur.empty()) {
-                    CoroutineContext ctx;
                     (*coro)();
                 }
                 cur = coro->get();