Introducing the Big Tinc Lock.

[tinc] / src / threads.h

diff --git a/src/threads.h b/src/threads.h
index d2ef4a6..85aaced 100644 (file)
--- a/src/threads.h
+++ b/src/threads.h
@@ -32,11 +32,16 @@ static inline bool thread_create(thread_t *tid, void (*func)(void *), void *arg)
        return !pthread_create(tid, NULL, (void *(*)(void *))func, arg);
 }
 static inline void thread_destroy(thread_t *tid) {
+       pthread_cancel(*tid);
        pthread_join(*tid, NULL);
 }
 static inline void mutex_create(mutex_t *mutex) {
        pthread_mutex_init(mutex, NULL);
 }
+#if 1
+#define mutex_lock(m) logger(LOG_DEBUG, "mutex_lock() at " __FILE__ " line %d", __LINE__); pthread_mutex_lock(m)
+#define mutex_unlock(m) logger(LOG_DEBUG, "mutex_unlock() at " __FILE__ " line %d", __LINE__); pthread_mutex_unlock(m)
+#else
 static inline void mutex_lock(mutex_t *mutex) {
        pthread_mutex_lock(mutex);
 }
@@ -44,5 +49,6 @@ static inline void mutex_unlock(mutex_t *mutex) {
        pthread_mutex_unlock(mutex);
 }
 #endif
+#endif
 
 #endif