marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StdSchedulerMac: Only add NSRunLoop additions for main thread

stable-5.4
Martin Plicht 2014-01-25 22:16:33 +01:00
parent 80fce0968d
commit 6c8b944272
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/C4AppMac.mm
View File

@ -63,7 +63,13 @@ bool C4AbstractApp::IsClipboardFull(bool fClipboard)
void C4AbstractApp::MessageDialog(const char * message)
{
NSAlert* alert = [NSAlert alertWithMessageText:@"Fatal Error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:[NSString stringWithUTF8String:message]];
NSAlert* alert = [NSAlert alertWithMessageText:@"Fatal Error"
defaultButton:nil
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"%@",
[NSString stringWithUTF8String:message]
];
[alert runModal];
}

18
src/platform/StdSchedulerMac.mm
View File

@ -22,7 +22,7 @@ using namespace std;
@interface SCHNotify : SCHAddition
{
list<CFRunLoopSourceRef> socketSources;
list<pair<CFRunLoopSourceRef, CFSocketRef>> socketSources;
}
- (void) registerAt:(SCHAdditions*) _additions;
- (void) unregisterFrom:(SCHAdditions*) _additions;
@ -207,15 +207,19 @@ void callback (CFSocketRef s, CFSocketCallBackType type, CFDataRef address, cons
);
auto runLoopSource = CFSocketCreateRunLoopSource(NULL, socket, 0);
CFRunLoopAddSource([_additions.runLoop getCFRunLoop], runLoopSource, kCFRunLoopDefaultMode);
socketSources.push_back(runLoopSource);
socketSources.push_back(make_pair(runLoopSource, socket));
}
}
- (void) unregisterFrom:(SCHAdditions*) _additions
{
auto runLoop = [_additions.runLoop getCFRunLoop];
for (auto r : socketSources)
{
CFRunLoopSourceInvalidate(r);
CFRelease(r);
CFRunLoopRemoveSource(runLoop, r.first, kCFRunLoopDefaultMode);
CFSocketDisableCallBacks(r.second, kCFSocketReadCallBack|kCFSocketWriteCallBack);
CFRunLoopSourceInvalidate(r.first);
CFRelease(r.second);
CFRelease(r.first);
}
socketSources.clear();
[super unregisterFrom:_additions];
@ -224,6 +228,8 @@ void callback (CFSocketRef s, CFSocketCallBackType type, CFDataRef address, cons
void StdScheduler::Added(StdSchedulerProc *pProc)
{
if ([NSRunLoop currentRunLoop] != [NSRunLoop mainRunLoop])
return; // scrap using that for other (network...) threads for now
auto x = [SCHAdditions requestAdditionForScheduler:this];
auto addition = [x assignAdditionForProc:pProc];
if (addition)
@ -232,12 +238,16 @@ void StdScheduler::Added(StdSchedulerProc *pProc)
void StdScheduler::Removing(StdSchedulerProc *pProc)
{
if ([NSRunLoop currentRunLoop] != [NSRunLoop mainRunLoop])
return; // scrap using that for other (network...) threads for now
auto x = [SCHAdditions requestAdditionForScheduler:this];
[x removeAdditionForProc:pProc];
}
void StdScheduler::Changed(StdSchedulerProc* pProc)
{
if ([NSRunLoop currentRunLoop] != [NSRunLoop mainRunLoop])
return; // scrap using that for other (network...) threads for now
auto x = [SCHAdditions requestAdditionForScheduler:this];
auto addition = [x additionForProc:pProc];
if (addition)