projects
/
crypto.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clear locked flag before unlocking mutex, not after.
[crypto.git]
/
lib
/
silcutil
/
unix
/
silcunixthread.c
diff --git
a/lib/silcutil/unix/silcunixthread.c
b/lib/silcutil/unix/silcunixthread.c
index fbfb0da254c697596f9f2c4ee75fbbaf52c47bac..2415a380e31eb3bb21509ff4be74b9c58ce07d2b 100644
(file)
--- a/
lib/silcutil/unix/silcunixthread.c
+++ b/
lib/silcutil/unix/silcunixthread.c
@@
-144,8
+144,7
@@
void silc_mutex_lock(SilcMutex mutex)
{
#ifdef SILC_THREADS
if (mutex) {
{
#ifdef SILC_THREADS
if (mutex) {
- if (pthread_mutex_lock(&mutex->mutex))
- SILC_ASSERT(FALSE);
+ SILC_VERIFY(pthread_mutex_lock(&mutex->mutex) == 0);
mutex->locked = TRUE;
}
#endif /* SILC_THREADS */
mutex->locked = TRUE;
}
#endif /* SILC_THREADS */
@@
-155,9
+154,8
@@
void silc_mutex_unlock(SilcMutex mutex)
{
#ifdef SILC_THREADS
if (mutex) {
{
#ifdef SILC_THREADS
if (mutex) {
- if (pthread_mutex_unlock(&mutex->mutex))
- SILC_ASSERT(FALSE);
mutex->locked = FALSE;
mutex->locked = FALSE;
+ SILC_VERIFY(pthread_mutex_unlock(&mutex->mutex) == 0);
}
#endif /* SILC_THREADS */
}
}
#endif /* SILC_THREADS */
}
@@
-166,7
+164,7
@@
void silc_mutex_assert_locked(SilcMutex mutex)
{
#ifdef SILC_THREADS
if (mutex)
{
#ifdef SILC_THREADS
if (mutex)
- SILC_
ASSERT
(mutex->locked);
+ SILC_
VERIFY
(mutex->locked);
#endif /* SILC_THREADS */
}
#endif /* SILC_THREADS */
}
@@
-216,7
+214,7
@@
void silc_rwlock_wrlock(SilcRwLock rwlock)
{
#ifdef SILC_THREADS
if (rwlock)
{
#ifdef SILC_THREADS
if (rwlock)
-
pthread_rwlock_wrlock(&rwlock->rwlock
);
+
SILC_VERIFY(pthread_rwlock_wrlock(&rwlock->rwlock) == 0
);
#endif /* SILC_THREADS */
}
#endif /* SILC_THREADS */
}
@@
-224,7
+222,7
@@
void silc_rwlock_unlock(SilcRwLock rwlock)
{
#ifdef SILC_THREADS
if (rwlock)
{
#ifdef SILC_THREADS
if (rwlock)
-
pthread_rwlock_unlock(&rwlock->rwlock
);
+
SILC_VERIFY(pthread_rwlock_unlock(&rwlock->rwlock) == 0
);
#endif /* SILC_THREADS */
}
#endif /* SILC_THREADS */
}