Browse Source

Generalise locking init code.

Con Kolivas 14 years ago
parent
commit
9840c12e74
2 changed files with 16 additions and 10 deletions
  1. 4 10
      main.c
  2. 12 0
      miner.h

+ 4 - 10
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);
 

+ 12 - 0
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;