fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 14:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util: Extract thread-id helpers from u_current

Browse source 
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9323>
This commit is contained in:
Rob Clark 2021-03-05 15:49:17 -08:00 • committed by Marge Bot
parent 1772569449
commit d2a920ee6e
2 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/mapi/u_current.c
View file

@ -49,6 +49,7 @@
*/
#include "c11/threads.h"
#include "util/u_thread.h"
#include "u_current.h"
#ifndef MAPI_MODE_UTIL
@ -150,42 +151,6 @@ u_current_init_tsd(void)
*/
static mtx_t ThreadCheckMutex = _MTX_INITIALIZER_NP;
#ifdef _WIN32
typedef DWORD thread_id;
#else
typedef thrd_t thread_id;
#endif
static inline thread_id
get_thread_id(void)
{
/*
* XXX: Callers of of this function assume it is a lightweight function.
* 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.
*/
#ifdef _WIN32
return GetCurrentThreadId();
#else
return thrd_current();
#endif
}
static inline int
thread_id_equal(thread_id t1, thread_id t2)
{
#ifdef _WIN32
return t1 == t2;
#else
return thrd_equal(t1, t2);
#endif
}
static thread_id knownID;
/**
@ -204,10 +169,10 @@ u_current_init(void)
if (firstCall) {
u_current_init_tsd();
knownID = get_thread_id();
knownID = util_get_thread_id();
firstCall = 0;
}
else if (!thread_id_equal(knownID, get_thread_id())) {
else if (!util_thread_id_equal(knownID, util_get_thread_id())) {
ThreadSafe = 1;
u_current_set_table(NULL);
u_current_set_context(NULL);
@ -257,7 +222,7 @@ u_current_get_context_internal(void)
#else
if (ThreadSafe)
return tss_get(u_current_context_tsd);
else if (!thread_id_equal(knownID, get_thread_id()))
else if (!util_thread_id_equal(knownID, util_get_thread_id()))
return NULL;
else
return u_current_context;
@ -298,7 +263,7 @@ u_current_get_table_internal(void)
#else
if (ThreadSafe)
return (struct _glapi_table *) tss_get(u_current_table_tsd);
else if (!thread_id_equal(knownID, get_thread_id()))
else if (!util_thread_id_equal(knownID, util_get_thread_id()))
return (struct _glapi_table *) table_noop_array;
else
return (struct _glapi_table *) u_current_table;

41
src/util/u_thread.h
View file

@ -319,4 +319,45 @@ static inline void util_barrier_wait(util_barrier *barrier)
#endif
/*
* Thread-id's.
*
* thrd_current() is not portable to windows (or at least not in a desirable
* way), so thread_id's provide an alternative mechanism
*/
#ifdef _WIN32
typedef DWORD thread_id;
#else
typedef thrd_t thread_id;
#endif
static inline thread_id
util_get_thread_id(void)
{
/*
* XXX: Callers of of this function assume it is a lightweight function.
* 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.
*/
#ifdef _WIN32
return GetCurrentThreadId();
#else
return thrd_current();
#endif
}
static inline int
util_thread_id_equal(thread_id t1, thread_id t2)
{
#ifdef _WIN32
return t1 == t2;
#else
return thrd_equal(t1, t2);
#endif
}
#endif /* U_THREAD_H_ */