DisableGC: replace by CoroutineContext, std::shared_ptr<void>

This commit is contained in:
Yorick 2023-02-10 15:04:17 +01:00
parent 53bb4a5327
commit 4c73eab923
No known key found for this signature in database
GPG key ID: A36E70F9DC014A15
3 changed files with 34 additions and 34 deletions

View file

@ -325,20 +325,22 @@ static Symbol getName(const AttrName & name, EvalState & state, Env & env)
} }
} }
#if HAVE_BOEHMGC
class BoehmDisableGC : public DisableGC { /* Disable GC while this object lives. Used by CoroutineContext.
*
* Boehm keeps a count of GC_disable() and GC_enable() calls,
* and only enables GC when the count matches.
*/
class BoehmDisableGC {
public: public:
BoehmDisableGC() { BoehmDisableGC() {
#if HAVE_BOEHMGC
GC_disable(); GC_disable();
#endif
}; };
virtual ~BoehmDisableGC() override { ~BoehmDisableGC() {
#if HAVE_BOEHMGC
GC_enable(); GC_enable();
};
};
#endif #endif
};
};
static bool gcInitialised = false; static bool gcInitialised = false;
@ -365,8 +367,8 @@ void initGC()
/* Used to disable GC when entering coroutines on macOS */ /* Used to disable GC when entering coroutines on macOS */
DisableGC::create = []() { create_disable_gc = []() -> std::shared_ptr<void> {
return std::dynamic_pointer_cast<DisableGC>(std::make_shared<BoehmDisableGC>()); return std::make_shared<BoehmDisableGC>();
}; };
/* Set the initial heap size to something fairly big (25% of /* Set the initial heap size to something fairly big (25% of

View file

@ -186,8 +186,21 @@ static DefaultStackAllocator defaultAllocatorSingleton;
StackAllocator *StackAllocator::defaultAllocator = &defaultAllocatorSingleton; StackAllocator *StackAllocator::defaultAllocator = &defaultAllocatorSingleton;
std::shared_ptr<DisableGC> (*DisableGC::create)() = []() { std::shared_ptr<void> (*create_disable_gc)() = []() -> std::shared_ptr<void> {
return std::dynamic_pointer_cast<DisableGC>(std::make_shared<DisableGC>()); return {};
};
/* This class is used for entry and exit hooks on coroutines */
class CoroutineContext {
#if __APPLE__
/* Disable GC when entering the coroutine on macOS, since it doesn't find the main thread stack in this case.
* std::shared_ptr<void> performs type-erasure, so it will call the right
* deleter. */
const std::shared_ptr<void> disable_gc = create_disable_gc();
#endif
public:
CoroutineContext() {};
~CoroutineContext() {};
}; };
std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun) std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
@ -211,10 +224,7 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
cur = in; cur = in;
if (!coro) { if (!coro) {
#if __APPLE__ CoroutineContext ctx;
/* Disable GC when entering the coroutine on macOS, since it doesn't find the main thread stack in this case */
auto disablegc = DisableGC::create();
#endif
coro = coro_t::push_type(VirtualStackAllocator{}, [&](coro_t::pull_type & yield) { coro = coro_t::push_type(VirtualStackAllocator{}, [&](coro_t::pull_type & yield) {
LambdaSource source([&](char *out, size_t out_len) { LambdaSource source([&](char *out, size_t out_len) {
if (cur.empty()) { if (cur.empty()) {
@ -236,9 +246,7 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
if (!*coro) { abort(); } if (!*coro) { abort(); }
if (!cur.empty()) { if (!cur.empty()) {
#if __APPLE__ CoroutineContext ctx;
auto disablegc = DisableGC::create();
#endif
(*coro)(false); (*coro)(false);
} }
} }
@ -248,9 +256,7 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
if (!coro) return; if (!coro) return;
if (!*coro) abort(); if (!*coro) abort();
{ {
#if __APPLE__ CoroutineContext ctx;
auto disablegc = DisableGC::create();
#endif
(*coro)(true); (*coro)(true);
} }
if (*coro) abort(); if (*coro) abort();
@ -284,9 +290,7 @@ std::unique_ptr<Source> sinkToSource(
size_t read(char * data, size_t len) override size_t read(char * data, size_t len) override
{ {
if (!coro) { if (!coro) {
#if __APPLE__ CoroutineContext ctx;
auto disablegc = DisableGC::create();
#endif
coro = coro_t::pull_type(VirtualStackAllocator{}, [&](coro_t::push_type & yield) { coro = coro_t::pull_type(VirtualStackAllocator{}, [&](coro_t::push_type & yield) {
LambdaSink sink([&](std::string_view data) { LambdaSink sink([&](std::string_view data) {
if (!data.empty()) yield(std::string(data)); if (!data.empty()) yield(std::string(data));
@ -299,9 +303,7 @@ std::unique_ptr<Source> sinkToSource(
if (pos == cur.size()) { if (pos == cur.size()) {
if (!cur.empty()) { if (!cur.empty()) {
#if __APPLE__ CoroutineContext ctx;
auto disablegc = DisableGC::create();
#endif
(*coro)(); (*coro)();
} }
cur = coro->get(); cur = coro->get();

View file

@ -502,13 +502,9 @@ struct StackAllocator {
}; };
/* Disabling GC when entering a coroutine (on macos). /* Disabling GC when entering a coroutine (on macos).
::create is to avoid boehm gc dependency in libutil. mutable to avoid boehm gc dependency in libutil.
*/ */
class DisableGC { extern std::shared_ptr<void> (*create_disable_gc)();
public:
DisableGC() {};
virtual ~DisableGC() {};
static std::shared_ptr<DisableGC> (*create)();
};
} }