wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code Activity

Disable GC inside coroutines on mac OS

Browse source
This commit is contained in:
Yorick van Pelt 2023-02-03 17:50:01 +01:00 • committed by Théophane Hufschmitt
parent 81dfc2b012
commit 2c53ef1bfe
3 changed files with 63 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libutil/serialise.cc
View file

@ -186,6 +186,10 @@ static DefaultStackAllocator defaultAllocatorSingleton;
StackAllocator *StackAllocator::defaultAllocator = &defaultAllocatorSingleton;
std::shared_ptr<DisableGC> (*DisableGC::create)() = []() {
return std::dynamic_pointer_cast<DisableGC>(std::make_shared<DisableGC>());
};
std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
{
struct SourceToSink : FinishSink
@ -206,7 +210,11 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
if (in.empty()) return;
cur = in;
if (!coro)
if (!coro) {
#if __APPLE__
/* 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) {
LambdaSource source([&](char *out, size_t out_len) {
if (cur.empty()) {
@ -223,17 +231,28 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
});
fun(source);
});
}
if (!*coro) { abort(); }
if (!cur.empty()) (*coro)(false);
if (!cur.empty()) {
#if __APPLE__
auto disablegc = DisableGC::create();
#endif
(*coro)(false);
}
}
void finish() override
{
if (!coro) return;
if (!*coro) abort();
(*coro)(true);
{
#if __APPLE__
auto disablegc = DisableGC::create();
#endif
(*coro)(true);
}
if (*coro) abort();
}
};
@ -264,18 +283,27 @@ std::unique_ptr<Source> sinkToSource(
size_t read(char * data, size_t len) override
{
if (!coro)
if (!coro) {
#if __APPLE__
auto disablegc = DisableGC::create();
#endif
coro = coro_t::pull_type(VirtualStackAllocator{}, [&](coro_t::push_type & yield) {
LambdaSink sink([&](std::string_view data) {
if (!data.empty()) yield(std::string(data));
});
fun(sink);
});
}
if (!*coro) { eof(); abort(); }
if (pos == cur.size()) {
if (!cur.empty()) (*coro)();
if (!cur.empty()) {
#if __APPLE__
auto disablegc = DisableGC::create();
#endif
(*coro)();
}
cur = coro->get();
pos = 0;
}