Attachment 13855 Details for Bug 13170 – Additional fix for cmocka test (4.7. only)

[patch] Additional fix for cmocka test (4.7. only)

0001-pthreadpool-Fix-deadlock.patch.txt (text/plain), 1.45 KB, created by Karolin Seeger on 2017-12-13 08:58:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2017-12-13 08:58:26 UTC

Size: 1.45 KB

patch

obsolete

>From 4003ceb07c0cadcc048267c4bed24f022aa8a3f9 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 12 Dec 2017 23:07:39 +0100
>Subject: [PATCH] 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 <vl@samba.org>
>Reviewed-by: Christof Schmitt <cs@samba.org>
>
>Autobuild-User(master): Christof Schmitt <cs@samba.org>
>Autobuild-Date(master): Wed Dec 13 04:46:12 CET 2017 on sn-devel-144
>
>(cherry picked from commit dfc4670640341761b346065922a62a3e755e9e58)
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13170
>---
> lib/pthreadpool/tests_cmocka.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/lib/pthreadpool/tests_cmocka.c b/lib/pthreadpool/tests_cmocka.c
>index 75a935fa42c..9753d212e1c 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
>-- 
>2.11.0
>

Flags:

vl: review+

Actions: View

Attachments on bug 13170: 13852 | 13853 | 13855