Merged silc_1_0_branch to trunk.

[silc.git] / lib / silcutil / unix / silcunixmutex.c

diff --git a/lib/silcutil/unix/silcunixmutex.c b/lib/silcutil/unix/silcunixmutex.c
index da802d5755f8df14b99ab3bc95336317ce5869c4..1336eaeea7d57592db62d2983d3f4dda6efca471 100644 (file)
--- a/lib/silcutil/unix/silcunixmutex.c
+++ b/lib/silcutil/unix/silcunixmutex.c
@@ -4,52 +4,73 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 Pekka Riikonen
+  Copyright (C) 2001 - 2005 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
 */
-/* $Id: */
+/* $Id$ */
 
 #include "silcincludes.h"
 
-#ifdef SILC_THREADS
-
 /* SILC Mutex structure */
 struct SilcMutexStruct {
+#ifdef SILC_THREADS
   pthread_mutex_t mutex;
+  unsigned int locked : 1;
+#else
+  void *tmp;
+#endif /* SILC_THREADS */
 };
 
-SilcMutex silc_mutex_alloc(void)
+bool silc_mutex_alloc(SilcMutex *mutex)
 {
-  SilcMutex mutex = silc_calloc(1, sizeof(*mutex));
-  pthread_mutex_init(&mutex->mutex, NULL);
+#ifdef SILC_THREADS
+  *mutex = silc_calloc(1, sizeof(**mutex));
+  if (*mutex == NULL)
+    return FALSE;
+  pthread_mutex_init(&(*mutex)->mutex, NULL);
+#endif /* SILC_THREADS */
+  return TRUE;
 }
 
 void silc_mutex_free(SilcMutex mutex)
 {
-  pthread_mutex_destroy(&mutex->mutex);
-  silc_free(mutex);
+#ifdef SILC_THREADS
+  if (mutex) {
+    pthread_mutex_destroy(&mutex->mutex);
+    silc_free(mutex);
+  }
+#endif /* SILC_THREADS */
 }
 
 void silc_mutex_lock(SilcMutex mutex)
 {
-  if (pthread_mutex_lock(&mutex->mutex))
-    assert(FALSE);
+#ifdef SILC_THREADS
+  if (mutex) {
+    if (pthread_mutex_lock(&mutex->mutex))
+      assert(FALSE);
+    assert(mutex->locked == 0);
+    mutex->locked = 1;
+  }
+#endif /* SILC_THREADS */
 }
 
 void silc_mutex_unlock(SilcMutex mutex)
 {
-  if (pthread_mutex_unlock(&mutex->mutex))
-    assert(FALSE);
-}
-
+#ifdef SILC_THREADS
+  if (mutex) {
+    assert(mutex->locked == 1);
+    mutex->locked = 0;
+    if (pthread_mutex_unlock(&mutex->mutex))
+      assert(FALSE);
+  }
 #endif /* SILC_THREADS */
+}