From: Pekka Riikonen Date: Thu, 12 Dec 2002 21:24:51 +0000 (+0000) Subject: Fixed to assert lock/unlock cases. X-Git-Tag: silc.client.0.9.11~30 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=4798103044eaeedcc40db1c276fc7e895b8d50af Fixed to assert lock/unlock cases. --- diff --git a/lib/silcutil/unix/silcunixmutex.c b/lib/silcutil/unix/silcunixmutex.c index 6b92ee32..d6eb0f23 100644 --- a/lib/silcutil/unix/silcunixmutex.c +++ b/lib/silcutil/unix/silcunixmutex.c @@ -25,6 +25,7 @@ struct SilcMutexStruct { #ifdef SILC_THREADS pthread_mutex_t mutex; + unsigned int locked : 1; #else void *tmp; #endif /* SILC_THREADS */ @@ -36,7 +37,6 @@ bool silc_mutex_alloc(SilcMutex *mutex) *mutex = silc_calloc(1, sizeof(**mutex)); if (*mutex == NULL) return FALSE; - pthread_mutex_init(&(*mutex)->mutex, NULL); #endif /* SILC_THREADS */ return TRUE; @@ -55,12 +55,16 @@ void silc_mutex_lock(SilcMutex mutex) #ifdef SILC_THREADS if (pthread_mutex_lock(&mutex->mutex)) assert(FALSE); + assert(mutex->locked == 0); + mutex->locked = 1; #endif /* SILC_THREADS */ } void silc_mutex_unlock(SilcMutex mutex) { #ifdef SILC_THREADS + assert(mutex->locked == 1); + mutex->locked = 0; if (pthread_mutex_unlock(&mutex->mutex)) assert(FALSE); #endif /* SILC_THREADS */