diff options
| -rw-r--r-- | src/mapi/u_thread.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/mapi/u_thread.h b/src/mapi/u_thread.h index ba5d98ea902..3e183589c98 100644 --- a/src/mapi/u_thread.h +++ b/src/mapi/u_thread.h @@ -89,10 +89,28 @@ typedef mtx_t u_mutex; #define u_mutex_lock(name) (void) mtx_lock(&(name)) #define u_mutex_unlock(name) (void) mtx_unlock(&(name)) + static INLINE unsigned long u_thread_self(void) { + /* + * XXX: Callers of u_thread_self assume it is a lightweight function, + * returning a numeric value. But unfortunately C11's thrd_current() gives + * no such guarantees. In fact, it's pretty hard to have a compliant + * implementation of thrd_current() on Windows with such characteristics. + * So for now, we side-step this mess and use Windows thread primitives + * directly here. + * + * FIXME: On the other hand, u_thread_self() and _glthread_GetID() are bad + * abstractions. Even with pthreads, there is no guarantee that + * pthread_self() will return numeric IDs -- we should be using + * pthread_equal() instead of assuming we can compare thread ids... + */ +#ifdef _WIN32 + return GetCurrentThreadId(); +#else return (unsigned long) (uintptr_t) thrd_current(); +#endif } |