gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: [OSX] Try to set the thread name for debugger display.

Browse Source
This commit is contained in:
Michael Lutz 2018-01-28 23:45:02 +01:00
parent 4971678f52
commit f670277ff5
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/macosx/macos.h
View File

@ -38,4 +38,6 @@ static inline bool MacOSVersionIsAtLeast(long major, long minor, long bugfix)
bool IsMonospaceFont(CFStringRef name);
void MacOSSetThreadName(const char *name);
#endif /* MACOS_H */

19
src/os/macosx/macos.mm
View File

@ -14,6 +14,7 @@
#include "../../rev.h"
#include "macos.h"
#include "../../string_func.h"
#include <pthread.h>
#define Rect OTTDRect
#define Point OTTDPoint
@ -233,3 +234,21 @@ bool IsMonospaceFont(CFStringRef name)
return font != NULL ? [ font isFixedPitch ] : false;
}
/**
* Set the name of the current thread for the debugger.
* @param name The new name of the current thread.
*/
void MacOSSetThreadName(const char *name)
{
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
if (MacOSVersionIsAtLeast(10, 6, 0)) {
pthread_setname_np(name);
}
#endif
NSThread *cur = [ NSThread currentThread ];
if (cur != NULL && [ cur respondsToSelector:@selector(setName:) ]) {
[ cur performSelector:@selector(setName:) withObject:[ NSString stringWithUTF8String:name ] ];
}
}

7
src/thread/thread_pthread.cpp
View File

@ -14,6 +14,10 @@
#include <pthread.h>
#include <errno.h>
#if defined(__APPLE__)
#include "../os/macosx/macos.h"
#endif
#include "../safeguards.h"
/**
@ -69,6 +73,9 @@ private:
pthread_setname_np(pthread_self(), self->name);
}
#endif
#endif
#if defined(__APPLE__)
MacOSSetThreadName(self->name);
#endif
self->ThreadProc();
pthread_exit(NULL);