fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 15:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

c11/threads: Remove Win32 null checks

Browse source 
Nonsensical to pass null. glibc doesn't check, and neither should we.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7138>
This commit is contained in:
James Park 2020-08-11 19:26:39 -07:00 • committed by Marge Bot
parent 1afb8e23c7
commit e317103753
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
include/c11/threads_win32.h
View file

@ -338,7 +338,7 @@ call_once(once_flag *flag, void (*func)(void))
static inline int static inline int
cnd_broadcast(cnd_t *cond) cnd_broadcast(cnd_t *cond)
{ {
if (!cond) return thrd_error; assert(cond != NULL);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
WakeAllConditionVariable(&cond->condvar); WakeAllConditionVariable(&cond->condvar);
#else #else
@ -351,7 +351,7 @@ cnd_broadcast(cnd_t *cond)
static inline void static inline void
cnd_destroy(cnd_t *cond) cnd_destroy(cnd_t *cond)
{ {
assert(cond); assert(cond != NULL);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
// do nothing // do nothing
#else #else
@ -365,7 +365,7 @@ cnd_destroy(cnd_t *cond)
static inline int static inline int
cnd_init(cnd_t *cond) cnd_init(cnd_t *cond)
{ {
if (!cond) return thrd_error; assert(cond != NULL);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
InitializeConditionVariable(&cond->condvar); InitializeConditionVariable(&cond->condvar);
#else #else
@ -383,7 +383,7 @@ cnd_init(cnd_t *cond)
static inline int static inline int
cnd_signal(cnd_t *cond) cnd_signal(cnd_t *cond)
{ {
if (!cond) return thrd_error; assert(cond != NULL);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
WakeConditionVariable(&cond->condvar); WakeConditionVariable(&cond->condvar);
#else #else
@ -396,7 +396,9 @@ cnd_signal(cnd_t *cond)
static inline int static inline int
cnd_timedwait(cnd_t *cond, mtx_t *mtx, const struct timespec *abs_time) cnd_timedwait(cnd_t *cond, mtx_t *mtx, const struct timespec *abs_time)
{ {
if (!cond || !mtx || !abs_time) return thrd_error; assert(cond != NULL);
assert(mtx != NULL);
assert(abs_time != NULL);
#ifdef HAVE_TIMESPEC_GET #ifdef HAVE_TIMESPEC_GET
const DWORD timeout = impl_abs2relmsec(abs_time); const DWORD timeout = impl_abs2relmsec(abs_time);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
@ -415,7 +417,8 @@ cnd_timedwait(cnd_t *cond, mtx_t *mtx, const struct timespec *abs_time)
static inline int static inline int
cnd_wait(cnd_t *cond, mtx_t *mtx) cnd_wait(cnd_t *cond, mtx_t *mtx)
{ {
if (!cond || !mtx) return thrd_error; assert(cond != NULL);
assert(mtx != NULL);
#ifdef EMULATED_THREADS_USE_NATIVE_CV #ifdef EMULATED_THREADS_USE_NATIVE_CV
SleepConditionVariableCS(&cond->condvar, mtx, INFINITE); SleepConditionVariableCS(&cond->condvar, mtx, INFINITE);
#else #else
@ -438,7 +441,7 @@ mtx_destroy(mtx_t *mtx)
static inline int static inline int
mtx_init(mtx_t *mtx, int type) mtx_init(mtx_t *mtx, int type)
{ {
if (!mtx) return thrd_error; assert(mtx != NULL);
if (type != mtx_plain && type != mtx_timed && type != mtx_try if (type != mtx_plain && type != mtx_timed && type != mtx_try
&& type != (mtx_plain|mtx_recursive) && type != (mtx_plain|mtx_recursive)
&& type != (mtx_timed|mtx_recursive) && type != (mtx_timed|mtx_recursive)
@ -452,7 +455,7 @@ mtx_init(mtx_t *mtx, int type)
static inline int static inline int
mtx_lock(mtx_t *mtx) mtx_lock(mtx_t *mtx)
{ {
if (!mtx) return thrd_error; assert(mtx != NULL);
EnterCriticalSection(mtx); EnterCriticalSection(mtx);
return thrd_success; return thrd_success;
} }
@ -461,7 +464,8 @@ mtx_lock(mtx_t *mtx)
static inline int static inline int
mtx_timedlock(mtx_t *mtx, const struct timespec *ts) mtx_timedlock(mtx_t *mtx, const struct timespec *ts)
{ {
if (!mtx || !ts) return thrd_error; assert(mtx != NULL);
assert(ts != NULL);
#ifdef HAVE_TIMESPEC_GET #ifdef HAVE_TIMESPEC_GET
while (mtx_trylock(mtx) != thrd_success) { while (mtx_trylock(mtx) != thrd_success) {
if (impl_abs2relmsec(ts) == 0) if (impl_abs2relmsec(ts) == 0)
@ -479,7 +483,7 @@ mtx_timedlock(mtx_t *mtx, const struct timespec *ts)
static inline int static inline int
mtx_trylock(mtx_t *mtx) mtx_trylock(mtx_t *mtx)
{ {
if (!mtx) return thrd_error; assert(mtx != NULL);
return TryEnterCriticalSection(mtx) ? thrd_success : thrd_busy; return TryEnterCriticalSection(mtx) ? thrd_success : thrd_busy;
} }
@ -487,7 +491,7 @@ mtx_trylock(mtx_t *mtx)
static inline int static inline int
mtx_unlock(mtx_t *mtx) mtx_unlock(mtx_t *mtx)
{ {
if (!mtx) return thrd_error; assert(mtx != NULL);
LeaveCriticalSection(mtx); LeaveCriticalSection(mtx);
return thrd_success; return thrd_success;
} }
@ -500,7 +504,7 @@ thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
{ {
struct impl_thrd_param *pack; struct impl_thrd_param *pack;
uintptr_t handle; uintptr_t handle;
if (!thr) return thrd_error; assert(thr != NULL);
pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param)); pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
if (!pack) return thrd_nomem; if (!pack) return thrd_nomem;
pack->func = func; pack->func = func;
@ -620,7 +624,7 @@ thrd_yield(void)
static inline int static inline int
tss_create(tss_t *key, tss_dtor_t dtor) tss_create(tss_t *key, tss_dtor_t dtor)
{ {
if (!key) return thrd_error; assert(key != NULL);
*key = TlsAlloc(); *key = TlsAlloc();
if (dtor) { if (dtor) {
if (impl_tss_dtor_register(*key, dtor)) { if (impl_tss_dtor_register(*key, dtor)) {
@ -659,7 +663,7 @@ tss_set(tss_t key, void *val)
static inline int static inline int
timespec_get(struct timespec *ts, int base) timespec_get(struct timespec *ts, int base)
{ {
if (!ts) return 0; assert(ts != NULL);
if (base == TIME_UTC) { if (base == TIME_UTC) {
ts->tv_sec = time(NULL); ts->tv_sec = time(NULL);
ts->tv_nsec = 0; ts->tv_nsec = 0;