From 2e0990fef2b85ad14318290f03c2f8502c081ae7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 8 Aug 2016 15:04:39 +0200 Subject: [PATCH] smbtorture3: Add LOCAL-PTHREADPOOL-TEVENT Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source3/selftest/tests.py | 1 + source3/torture/proto.h | 1 + source3/torture/test_pthreadpool_tevent.c | 82 +++++++++++++++++++++++ source3/torture/torture.c | 1 + source3/wscript_build | 1 + 5 files changed, 86 insertions(+) create mode 100644 source3/torture/test_pthreadpool_tevent.c diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 0a0cb08abfc..dbd4c58a308 100755 --- 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 fc7c33f2d23..7d2deddd564 100644 --- 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 index 00000000000..c90a3943a8b --- /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 . + */ + +#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 f9766bbf1b2..06b919e1971 100644 --- 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 edf921c05df..1d6f0434d09 100755 --- 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''',