The branch, master has been updated
via dfc4670 pthreadpool: Fix deadlock
from 6c9ac73 pthreadpool: Add some asserts
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dfc4670640341761b346065922a62a3e755e9e58
Author: Volker Lendecke <v...@samba.org>
Date: Tue Dec 12 23:07:39 2017 +0100
pthreadpool: Fix deadlock
Christof's idea from
https://lists.samba.org/archive/samba-technical/2017-December/124384.html
was that the thread already exited. It could also be that the thread is
not yet idle when the new pthreadpool_add_jobs comes around the corner.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Christof Schmitt <c...@samba.org>
Autobuild-User(master): Christof Schmitt <c...@samba.org>
Autobuild-Date(master): Wed Dec 13 04:46:12 CET 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
lib/pthreadpool/tests_cmocka.c | 3 +++
1 file changed, 3 insertions(+)
Changeset truncated at 500 lines:
diff --git a/lib/pthreadpool/tests_cmocka.c b/lib/pthreadpool/tests_cmocka.c
index 75a935f..9753d21 100644
--- a/lib/pthreadpool/tests_cmocka.c
+++ b/lib/pthreadpool/tests_cmocka.c
@@ -28,6 +28,7 @@
#include <pthreadpool_tevent.h>
#include <cmocka.h>
+#include <poll.h>
struct pthreadpool_tevent_test {
struct tevent_context *ev;
@@ -152,6 +153,8 @@ static void test_create(void **state)
assert_return_code(ret, 0);
assert_false(in_main_thread);
+ poll(NULL, 0, 10);
+
/*
* Workerthread will still be active for a second; immediately
* running another job will also use the worker thread, even
--
Samba Shared Repository
