smbtorture3: Add LOCAL-PTHREADPOOL-TEVENT

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 0a0cb08abfca505f20cac03aef956c117a23c5d3..dbd4c58a30818734a2129f847ea2a70c4083d213 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -114,6 +114,7 @@ local_tests = [
     "LOCAL-MESSAGING-FDPASS2",
     "LOCAL-MESSAGING-FDPASS2a",
     "LOCAL-MESSAGING-FDPASS2b",
+    "LOCAL-PTHREADPOOL-TEVENT",
     "LOCAL-hex_encode_buf",
     "LOCAL-sprintf_append",
     "LOCAL-remove_duplicate_addrs2"]

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index fc7c33f2d231ebcdd2865d6c75d571000834539e..7d2deddd564076f72ecf702e187cc2e02406a1e7 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -121,5 +121,6 @@ bool run_messaging_fdpass2(int dummy);
 bool run_messaging_fdpass2a(int dummy);
 bool run_messaging_fdpass2b(int dummy);
 bool run_oplock_cancel(int dummy);
+bool run_pthreadpool_tevent(int dummy);
 
 #endif /* __TORTURE_H__ */

diff --git a/source3/torture/test_pthreadpool_tevent.c b/source3/torture/test_pthreadpool_tevent.c
new file mode 100644 (file)
index 0000000..c90a394
--- /dev/null
+++ b/source3/torture/test_pthreadpool_tevent.c
@@ -0,0 +1,82 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Test pthreadpool_tevent
+ * Copyright (C) Volker Lendecke 2016
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "system/select.h"
+#include "proto.h"
+#include "lib/pthreadpool/pthreadpool_tevent.h"
+
+static void job_fn(void *private_data);
+
+bool run_pthreadpool_tevent(int dummy)
+{
+       struct tevent_context *ev;
+       struct pthreadpool_tevent *pool;
+       struct tevent_req *req;
+       int ret, val;
+       bool ok;
+
+       ev = tevent_context_init_byname(NULL, "poll");
+       if (ev == NULL) {
+               fprintf(stderr, "tevent_context_init failed\n");
+               return false;
+       }
+
+       ret = pthreadpool_tevent_init(ev, 100, &pool);
+       if (ret != 0) {
+               fprintf(stderr, "pthreadpool_tevent_init failed: %s\n",
+                       strerror(ret));
+               return false;
+       }
+
+       val = -1;
+
+       req = pthreadpool_tevent_job_send(ev, ev, pool, job_fn, &val);
+       if (req == NULL) {
+               fprintf(stderr, "pthreadpool_tevent_job_send failed\n");
+               return false;
+       }
+
+       ok = tevent_req_poll(req, ev);
+       if (!ok) {
+               fprintf(stderr, "tevent_req_poll failed\n");
+               return false;
+       }
+
+       ret = pthreadpool_tevent_job_recv(req);
+       if (ret != 0) {
+               fprintf(stderr, "pthreadpool_tevent_job failed: %s\n",
+                       strerror(ret));
+               return false;
+       }
+
+       printf("%d\n", val);
+
+       TALLOC_FREE(pool);
+       TALLOC_FREE(ev);
+       return true;
+}
+
+static void job_fn(void *private_data)
+{
+       int *pret = private_data;
+       *pret = 4711;
+
+       poll(NULL, 0, 100);
+}

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index f9766bbf1b2f2537cb2e20fc010ca960b7774ba1..06b919e1971fd96bdc9a3a9968f180f6816c7ea2 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -10534,6 +10534,7 @@ static struct {
        { "local-tdb-writer", run_local_tdb_writer, 0 },
        { "LOCAL-DBWRAP-CTDB", run_local_dbwrap_ctdb, 0 },
        { "LOCAL-BENCH-PTHREADPOOL", run_bench_pthreadpool, 0 },
+       { "LOCAL-PTHREADPOOL-TEVENT", run_pthreadpool_tevent, 0 },
        { "qpathinfo-bufsize", run_qpathinfo_bufsize, 0 },
        {NULL, NULL, 0}};
 

diff --git a/source3/wscript_build b/source3/wscript_build
index edf921c05dfd87a43ded78fa2ed6ce69d7e1b7b4..1d6f0434d09fea67ce33b8ae23ada70db4bf6bb6 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1288,6 +1288,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  torture/test_messaging_read.c
                  torture/test_messaging_fd_passing.c
                  torture/test_oplock_cancel.c
+                 torture/test_pthreadpool_tevent.c
                  torture/t_strappend.c
                  torture/bench_pthreadpool.c
                  torture/wbc_async.c''',