optimized mutex macros

2 files changed, 12 insertions, 0 deletions

diff --git a/sync.c b/sync.c
index 0151db5d..f9539153 100644
--- a/sync.c
+++ b/sync.c
@@ -57,6 +57,7 @@ SyncObjExit(pthread_mutex_t **mut)
 	}
 }
 
+#ifndef	NDEBUG
 /* lock an object. The synchronization tool (mutex) must be passed in.
  */
 void
@@ -72,5 +73,6 @@ unlockObj(pthread_mutex_t *mut)
 {
 	pthread_mutex_unlock(mut);
 }
+#endif /* #ifndef NDEBUG */
 
 #endif /* #ifdef USE_PTHREADS */
diff --git a/sync.h b/sync.h
index f2b3ae33..8a0210a7 100644
--- a/sync.h
+++ b/sync.h
@@ -33,8 +33,18 @@
 #define SYNC_OBJ_TOOL pthread_mutex_t *Sync_mut;
 #define SYNC_OBJ_TOOL_INIT(x) SyncObjInit(&((x)->Sync_mut))
 #define SYNC_OBJ_TOOL_EXIT(x) SyncObjExit(&((x)->Sync_mut))
+
+/* If we run in non-debug mode, we use inline code for the mutex
+ * operations. If we run in debug mode, we use functions, because they
+ * are better to trace in the callframe.
+ */
+#ifndef	NDEBUG
+#define LockObj(x) pthread_mutex_lock((x)->Sync_mut)
+#define UnlockObj(x) pthread_mutex_unlock((x)->Sync_mut)
+#else
 #define LockObj(x) lockObj((x)->Sync_mut)
 #define UnlockObj(x) unlockObj((x)->Sync_mut)
+#endif
 
 void SyncObjInit(pthread_mutex_t **mut);
 void SyncObjExit(pthread_mutex_t **mut);