testsuite: Only free the main mutex when and if all the worker threads are done

diff --git a/changes/weasel-testuite-thread-fixes b/changes/weasel-testuite-thread-fixes
new file mode 100644 (file)
index 0000000..8fed729
--- /dev/null
+++ b/changes/weasel-testuite-thread-fixes
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Testsuite:  In the util/threads test no longer free the test_mutex
+      before all worker threads have finished.

diff --git a/src/or/test.c b/src/or/test.c
index 6b7066c38552a727fc4f75136cda0caa35c35e68..652a4ee44fad2c5b692f9b7ba7e7ee23b792b014 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2356,13 +2356,14 @@ test_util_threads(void)
     }
     tor_mutex_release(_thread_test_mutex);
   }
-  tor_mutex_free(_thread_test_mutex);
 
   tor_mutex_acquire(_thread_test_start1);
   tor_mutex_release(_thread_test_start1);
   tor_mutex_acquire(_thread_test_start2);
   tor_mutex_release(_thread_test_start2);
 
+  tor_mutex_free(_thread_test_mutex);
+
   if (timedout) {
     printf("\nTimed out: %d %d", t1_count, t2_count);
     test_assert(strmap_get(_thread_test_strmap, "thread 1"));