summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb/tests/ctdb_bench.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-04-16 04:47:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:50:41 -0500
commite24cf892883b54a567f294eacbd94a23d7d420e4 (patch)
tree97d030b4f2b5478a5c5af8aedeb0ae198ae44910 /source4/cluster/ctdb/tests/ctdb_bench.c
parent3f7d52d538b9d717ce351284d5860e2ac8e5f294 (diff)
downloadsamba-e24cf892883b54a567f294eacbd94a23d7d420e4.tar.gz
samba-e24cf892883b54a567f294eacbd94a23d7d420e4.tar.bz2
samba-e24cf892883b54a567f294eacbd94a23d7d420e4.zip
r22234: merge test suite changes from bzr tree
(This used to be commit d825f4e6cc96a365061805352a2df3818df2364e)
Diffstat (limited to 'source4/cluster/ctdb/tests/ctdb_bench.c')
-rw-r--r--source4/cluster/ctdb/tests/ctdb_bench.c50
1 files changed, 3 insertions, 47 deletions
diff --git a/source4/cluster/ctdb/tests/ctdb_bench.c b/source4/cluster/ctdb/tests/ctdb_bench.c
index 78d66f6f2c..37c095c0c0 100644
--- a/source4/cluster/ctdb/tests/ctdb_bench.c
+++ b/source4/cluster/ctdb/tests/ctdb_bench.c
@@ -22,6 +22,7 @@
#include "lib/events/events.h"
#include "system/filesys.h"
#include "popt.h"
+#include "tests/cmdline.h"
#include <sys/time.h>
#include <time.h>
@@ -196,19 +197,10 @@ int main(int argc, const char *argv[])
{
struct ctdb_context *ctdb;
struct ctdb_db_context *ctdb_db;
- const char *nlist = NULL;
- const char *transport = "tcp";
- const char *myaddress = NULL;
- int self_connect=0;
- int daemon_mode=0;
struct poptOption popt_options[] = {
POPT_AUTOHELP
- { "nlist", 0, POPT_ARG_STRING, &nlist, 0, "node list file", "filename" },
- { "listen", 0, POPT_ARG_STRING, &myaddress, 0, "address to listen on", "address" },
- { "transport", 0, POPT_ARG_STRING, &transport, 0, "protocol transport", NULL },
- { "self-connect", 0, POPT_ARG_NONE, &self_connect, 0, "enable self connect", "boolean" },
- { "daemon", 0, POPT_ARG_NONE, &daemon_mode, 0, "spawn a ctdb daemon", "boolean" },
+ POPT_CTDB_CMDLINE
{ "timelimit", 't', POPT_ARG_INT, &timelimit, 0, "timelimit", "integer" },
{ "num-records", 'r', POPT_ARG_INT, &num_records, 0, "num_records", "integer" },
{ "num-msgs", 'n', POPT_ARG_INT, &num_msgs, 0, "num_msgs", "integer" },
@@ -239,46 +231,10 @@ int main(int argc, const char *argv[])
while (extra_argv[extra_argc]) extra_argc++;
}
- if (nlist == NULL || myaddress == NULL) {
- printf("You must provide a node list with --nlist and an address with --listen\n");
- exit(1);
- }
-
ev = event_context_init(NULL);
/* initialise ctdb */
- ctdb = ctdb_init(ev);
- if (ctdb == NULL) {
- printf("Failed to init ctdb\n");
- exit(1);
- }
-
- if (self_connect) {
- ctdb_set_flags(ctdb, CTDB_FLAG_SELF_CONNECT);
- }
- if (daemon_mode) {
- ctdb_set_flags(ctdb, CTDB_FLAG_DAEMON_MODE);
- }
-
- ret = ctdb_set_transport(ctdb, transport);
- if (ret == -1) {
- printf("ctdb_set_transport failed - %s\n", ctdb_errstr(ctdb));
- exit(1);
- }
-
- /* tell ctdb what address to listen on */
- ret = ctdb_set_address(ctdb, myaddress);
- if (ret == -1) {
- printf("ctdb_set_address failed - %s\n", ctdb_errstr(ctdb));
- exit(1);
- }
-
- /* tell ctdb what nodes are available */
- ret = ctdb_set_nlist(ctdb, nlist);
- if (ret == -1) {
- printf("ctdb_set_nlist failed - %s\n", ctdb_errstr(ctdb));
- exit(1);
- }
+ ctdb = ctdb_cmdline_init(ev);
/* attach to a specific database */
ctdb_db = ctdb_attach(ctdb, "test.tdb", TDB_DEFAULT, O_RDWR|O_CREAT|O_TRUNC, 0666);