mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
Fix TLS on Win32 to something a bit more safe and portable (compiler-wise).
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@947 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
97ec77c660
commit
d71dc9b022
1 changed files with 85 additions and 1 deletions
|
|
@ -90,7 +90,78 @@ static void inittls(void) {
|
||||||
|
|
||||||
#elif HAVE_WINDOWS_H
|
#elif HAVE_WINDOWS_H
|
||||||
|
|
||||||
static __declspec(thread) char *tlsstr;
|
static DWORD tlsstr_key = TLS_OUT_OF_INDEXES;
|
||||||
|
static DWORD monitor_key = TLS_OUT_OF_INDEXES;
|
||||||
|
|
||||||
|
static void inittls(void) {
|
||||||
|
HANDLE mutex;
|
||||||
|
char name[64];
|
||||||
|
|
||||||
|
sprintf(name, "polypaudio%d", (int)GetCurrentProcessId());
|
||||||
|
|
||||||
|
mutex = CreateMutex(NULL, FALSE, name);
|
||||||
|
if (!mutex) {
|
||||||
|
fprintf(stderr, __FILE__ ": CRITICAL: Unable to create named mutex (%d)\n", (int)GetLastError());
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
WaitForSingleObject(mutex, INFINITE);
|
||||||
|
|
||||||
|
if (tlsstr_key == TLS_OUT_OF_INDEXES) {
|
||||||
|
tlsstr_key = TlsAlloc();
|
||||||
|
monitor_key = TlsAlloc();
|
||||||
|
if ((tlsstr_key == TLS_OUT_OF_INDEXES) || (monitor_key == TLS_OUT_OF_INDEXES)) {
|
||||||
|
fprintf(stderr, __FILE__ ": CRITICAL: Unable to allocate TLS key (%d)\n", (int)GetLastError());
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ReleaseMutex(mutex);
|
||||||
|
|
||||||
|
CloseHandle(mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is incredibly brain dead, but this is necessary when dealing with
|
||||||
|
* the hell that is Win32.
|
||||||
|
*/
|
||||||
|
struct monitor_data {
|
||||||
|
HANDLE thread;
|
||||||
|
void *data;
|
||||||
|
};
|
||||||
|
|
||||||
|
static DWORD WINAPI monitor_thread(LPVOID param) {
|
||||||
|
struct monitor_data *data;
|
||||||
|
|
||||||
|
data = (struct monitor_data*)param;
|
||||||
|
assert(data);
|
||||||
|
|
||||||
|
WaitForSingleObject(data->thread, INFINITE);
|
||||||
|
|
||||||
|
CloseHandle(data->thread);
|
||||||
|
pa_xfree(data->data);
|
||||||
|
pa_xfree(data);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void start_monitor(void) {
|
||||||
|
HANDLE thread;
|
||||||
|
struct monitor_data *data;
|
||||||
|
|
||||||
|
data = pa_xnew(struct monitor_data, 1);
|
||||||
|
assert(data);
|
||||||
|
|
||||||
|
DuplicateHandle(GetCurrentProcess(), GetCurrentThread(),
|
||||||
|
GetCurrentProcess(), &data->thread, 0, FALSE, DUPLICATE_SAME_ACCESS);
|
||||||
|
|
||||||
|
thread = CreateThread(NULL, 0, monitor_thread, data, 0, NULL);
|
||||||
|
assert(thread);
|
||||||
|
|
||||||
|
TlsSetValue(monitor_key, data);
|
||||||
|
|
||||||
|
CloseHandle(thread);
|
||||||
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
@ -112,6 +183,16 @@ char* pa_cstrerror(int errnum) {
|
||||||
pthread_once(&cstrerror_once, inittls);
|
pthread_once(&cstrerror_once, inittls);
|
||||||
|
|
||||||
tlsstr = pthread_getspecific(tlsstr_key);
|
tlsstr = pthread_getspecific(tlsstr_key);
|
||||||
|
#elif defined(HAVE_WINDOWS_H)
|
||||||
|
char *tlsstr;
|
||||||
|
struct monitor_data *data;
|
||||||
|
|
||||||
|
inittls();
|
||||||
|
|
||||||
|
tlsstr = TlsGetValue(tlsstr_key);
|
||||||
|
if (!tlsstr)
|
||||||
|
start_monitor();
|
||||||
|
data = TlsGetValue(monitor_key);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (tlsstr)
|
if (tlsstr)
|
||||||
|
|
@ -144,6 +225,9 @@ char* pa_cstrerror(int errnum) {
|
||||||
|
|
||||||
#ifdef HAVE_PTHREAD
|
#ifdef HAVE_PTHREAD
|
||||||
pthread_setspecific(tlsstr_key, tlsstr);
|
pthread_setspecific(tlsstr_key, tlsstr);
|
||||||
|
#elif defined(HAVE_WINDOWS_H)
|
||||||
|
TlsSetValue(tlsstr_key, tlsstr);
|
||||||
|
data->data = tlsstr;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return tlsstr;
|
return tlsstr;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue