diff options
| author | Peter Palfrader <peter@palfrader.org> | 2010-04-12 22:49:58 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-04-12 18:15:17 -0400 |
| commit | a02923122e597e833a987dc38a3b0b8a62e0b122 (patch) | |
| tree | 9374d7de37521150834f7ee08cbde433d57a249c | |
| parent | 0324d3b0ec6d8ee0ec24c2e93915c9aa70e1665d (diff) | |
| download | tor-a02923122e597e833a987dc38a3b0b8a62e0b122.tar.gz tor-a02923122e597e833a987dc38a3b0b8a62e0b122.zip | |
testsuite: Only free the main mutex when and if all the worker threads are done
| -rw-r--r-- | changes/weasel-testuite-thread-fixes | 3 | ||||
| -rw-r--r-- | src/or/test.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/weasel-testuite-thread-fixes b/changes/weasel-testuite-thread-fixes new file mode 100644 index 0000000000..8fed7297d7 --- /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 6b7066c385..652a4ee44f 100644 --- 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")); |