diff options
| author | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-30 12:09:27 +0200 |
| commit | 4f100fff5844f7af08b1d9be23e990e4a48b27de (patch) | |
| tree | cc3ce0245cfb7d57bc68ec648631ddf3c2329faf /erts/lib_src/common/ethr_mutex.c | |
| parent | c4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (diff) | |
| parent | d389ff6f96cbd855e95a7455407b6140f1601d0f (diff) | |
| download | otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.gz otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.bz2 otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.zip | |
Merge branch 'rickard/cpu-info/OTP-8765' into dev
* rickard/cpu-info/OTP-8765:
Initialize environment functionality after thread lib
Fix faulty assertions
Implement automatic detection of CPU topology on Windows
Make it possible to reread and update detected CPU information
Diffstat (limited to 'erts/lib_src/common/ethr_mutex.c')
| -rw-r--r-- | erts/lib_src/common/ethr_mutex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c index f918bba81d..aac0d44a32 100644 --- a/erts/lib_src/common/ethr_mutex.c +++ b/erts/lib_src/common/ethr_mutex.c @@ -1048,7 +1048,7 @@ ethr_cond_signal(ethr_cond *cnd) ethr_ts_event *tse; ETHR_ASSERT(!ethr_not_inited__); - ETHR_ASSERT(!cnd); + ETHR_ASSERT(cnd); ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED); ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd); @@ -1089,7 +1089,7 @@ ethr_cond_broadcast(ethr_cond *cnd) int got_all; ethr_ts_event *tse; ETHR_ASSERT(!ethr_not_inited__); - ETHR_ASSERT(!cnd); + ETHR_ASSERT(cnd); ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED); ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd); @@ -1158,9 +1158,9 @@ ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx) ethr_ts_event *tse; ETHR_ASSERT(!ethr_not_inited__); - ETHR_ASSERT(!cnd); + ETHR_ASSERT(cnd); ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED); - ETHR_ASSERT(!mtx); + ETHR_ASSERT(mtx); ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED); tse = ethr_get_ts_event(); |