Commit 9840c12e7419f0972e83e8289869d2a43d22fe3e

Con Kolivas 2012-01-20T14:47:17

Generalise locking init code.

diff --git a/main.c b/main.c
index 51cfdb3..585d21f 100644
--- a/main.c
+++ b/main.c
@@ -5871,16 +5871,10 @@ int main (int argc, char *argv[])
 	if (unlikely(curl_global_init(CURL_GLOBAL_ALL)))
 		quit(1, "Failed to curl_global_init");
 
-	if (unlikely(pthread_mutex_init(&hash_lock, NULL)))
-		quit(1, "Failed to pthread_mutex_init");
-	if (unlikely(pthread_mutex_init(&qd_lock, NULL)))
-		quit(1, "Failed to pthread_mutex_init");
-	if (unlikely(pthread_mutex_init(&curses_lock, NULL)))
-		quit(1, "Failed to pthread_mutex_init");
-	if (unlikely(pthread_mutex_init(&control_lock, NULL)))
-		quit(1, "Failed to pthread_mutex_init");
-	if (unlikely(pthread_rwlock_init(&blk_lock, NULL)))
-		quit(1, "Failed to pthread_rwlock_init");
+	mutex_init(&hash_lock);
+	mutex_init(&curses_lock);
+	mutex_init(&control_lock);
+	rwlock_init(&blk_lock);
 
 	sprintf(packagename, "%s %s", PACKAGE, VERSION);
 
diff --git a/miner.h b/miner.h
index 79f7ac1..a21de5f 100644
--- a/miner.h
+++ b/miner.h
@@ -389,6 +389,18 @@ static inline void wr_unlock(pthread_rwlock_t *lock)
 	rw_unlock(lock);
 }
 
+static inline void mutex_init(pthread_mutex_t *lock)
+{
+	if (unlikely(pthread_mutex_init(lock, NULL)))
+		quit(1, "Failed to pthread_mutex_init");
+}
+
+static inline void rwlock_init(pthread_rwlock_t *lock)
+{
+	if (unlikely(pthread_rwlock_init(lock, NULL)))
+		quit(1, "Failed to pthread_rwlock_init");
+}
+
 struct pool;
 
 extern bool opt_debug;