Fix CFRunLoop selection in multi-threaded scenarios.

CFRunLoopGetMain returns the main thread's run loop, as opposed to the one belonging to the calling thread.
This commit is contained in:
Sönke Ludwig 2020-05-25 14:36:29 +02:00
parent fd462d89f1
commit 167745efb0
3 changed files with 3 additions and 2 deletions

View file

@ -38,7 +38,7 @@ final class CFRunLoopEventLoop : KqueueEventLoopBase {
CFFileDescriptorEnableCallBacks(m_kqueueDescriptor, CFOptionFlags.kCFFileDescriptorReadCallBack);
m_kqueueSource = CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault, m_kqueueDescriptor, 0);
CFRunLoopAddSource(CFRunLoopGetMain(), m_kqueueSource, kCFRunLoopDefaultMode);
CFRunLoopAddSource(CFRunLoopGetCurrent(), m_kqueueSource, kCFRunLoopDefaultMode);
}
override bool doProcessEvents(Duration timeout)

View file

@ -391,7 +391,7 @@ final class FSEventsEventDriverWatchers(Events : EventDriverEvents) : EventDrive
slot.stream = FSEventStreamCreate(null, &onFSEvent, () @trusted { return &ctx; } (),
paths, since_when, 0.1, kFSEventStreamCreateFlagFileEvents|kFSEventStreamCreateFlagNoDefer);
FSEventStreamScheduleWithRunLoop(slot.stream, CFRunLoopGetMain(), kCFRunLoopDefaultMode);
FSEventStreamScheduleWithRunLoop(slot.stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
FSEventStreamStart(slot.stream);
m_streamMap[cast(void*)slot.stream] = slot.id;

View file

@ -93,6 +93,7 @@ static if (!is(CFRunLoopRef)) {
extern const CFStringRef kCFRunLoopCommonModes;
CFRunLoopRef CFRunLoopGetMain() @nogc;
CFRunLoopRef CFRunLoopGetCurrent() @nogc;
void CFRunLoopAddSource(CFRunLoopRef rl, CFRunLoopSourceRef source, CFRunLoopMode mode) @nogc;
CFRunLoopRunResult CFRunLoopRunInMode(CFRunLoopMode mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled);
}