diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c deleted file mode 100644 index 3a4557eab17..00000000000 --- a/ctdb/common/cmdline.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - common commandline code to ctdb test tools - - Copyright (C) Andrew Tridgell 2007 - - 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 "replace.h" -#include "system/filesys.h" -#include "system/network.h" - -#include -#include -#include -#include - -#include "lib/util/debug.h" -#include "ctdb_private.h" -#include "ctdb_client.h" - -#include "common/rb_tree.h" -#include "common/common.h" -#include "common/logging.h" -#include "common/cmdline.h" - - - -/* Handle common command line options for ctdb test progs - */ - -static struct { - const char *socketname; - const char *debuglevel; - int torture; - const char *events; -} ctdb_cmdline = { - .torture = 0, - .debuglevel = "NOTICE", -}; - -enum {OPT_EVENTSYSTEM=1}; - -static void ctdb_cmdline_callback(poptContext con, - enum poptCallbackReason reason, - const struct poptOption *opt, - const char *arg, const void *data) -{ - switch (opt->val) { - case OPT_EVENTSYSTEM: - tevent_set_default_backend(arg); - break; - } -} - - -struct poptOption popt_ctdb_cmdline[] = { - { NULL, 0, POPT_ARG_CALLBACK, (void *)ctdb_cmdline_callback }, - { "socket", 0, POPT_ARG_STRING, &ctdb_cmdline.socketname, 0, "local socket name", "filename" }, - { "debug", 'd', POPT_ARG_STRING, &ctdb_cmdline.debuglevel, 0, "debug level"}, - { "torture", 0, POPT_ARG_NONE, &ctdb_cmdline.torture, 0, "enable nastiness in library", NULL }, - { "events", 0, POPT_ARG_STRING, NULL, OPT_EVENTSYSTEM, "event system", NULL }, - { NULL } -}; - - -/* - startup daemon side of ctdb according to command line options - */ -struct ctdb_context *ctdb_cmdline_init(struct tevent_context *ev) -{ - struct ctdb_context *ctdb; - enum debug_level log_level; - int ret; - - /* initialise ctdb */ - ctdb = ctdb_init(ev); - if (ctdb == NULL) { - printf("Failed to init ctdb\n"); - exit(1); - } - - if (ctdb_cmdline.torture) { - ctdb_set_flags(ctdb, CTDB_FLAG_TORTURE); - } - - /* command line specified a socket name */ - if (ctdb_cmdline.socketname != NULL) { - setenv("CTDB_SOCKET", ctdb_cmdline.socketname, 1); - ret = ctdb_set_socketname(ctdb, ctdb_cmdline.socketname); - if (ret == -1) { - printf("ctdb_set_socketname failed - %s\n", - ctdb_errstr(ctdb)); - exit(1); - } - } - - /* Set the debug level */ - if (debug_level_parse(ctdb_cmdline.debuglevel, &log_level)) { - DEBUGLEVEL = debug_level_to_int(log_level); - } else { - DEBUGLEVEL = debug_level_to_int(DEBUG_NOTICE); - } - - return ctdb; -} - - -/* - startup a client only ctdb context - */ -struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev, - struct timeval req_timeout) -{ - struct ctdb_context *ctdb; - enum debug_level log_level; - char *socket_name; - int ret; - - /* initialise ctdb */ - ctdb = ctdb_init(ev); - if (ctdb == NULL) { - fprintf(stderr, "Failed to init ctdb\n"); - exit(1); - } - - /* tell ctdb the socket address */ - socket_name = getenv("CTDB_SOCKET"); - if (socket_name != NULL) { - ret = ctdb_set_socketname(ctdb, socket_name); - if (ret == -1) { - printf("ctdb_set_socketname failed - %s\n", - ctdb_errstr(ctdb)); - exit(1); - } - } - - if (ctdb_cmdline.socketname != NULL) { - ret = ctdb_set_socketname(ctdb, ctdb_cmdline.socketname); - if (ret == -1) { - fprintf(stderr, "ctdb_set_socketname failed - %s\n", - ctdb_errstr(ctdb)); - exit(1); - } - } - - /* Set the debug level */ - if (debug_level_parse(ctdb_cmdline.debuglevel, &log_level)) { - DEBUGLEVEL = debug_level_to_int(log_level); - } else { - DEBUGLEVEL = debug_level_to_int(DEBUG_NOTICE); - } - - ret = ctdb_socket_connect(ctdb); - if (ret != 0) { - fprintf(stderr, __location__ " Failed to connect to daemon\n"); - talloc_free(ctdb); - return NULL; - } - - /* get our pnn */ - ctdb->pnn = ctdb_ctrl_getpnn(ctdb, req_timeout, CTDB_CURRENT_NODE); - if (ctdb->pnn == (uint32_t)-1) { - DEBUG(DEBUG_CRIT,(__location__ " Failed to get ctdb pnn\n")); - talloc_free(ctdb); - return NULL; - } - - return ctdb; -} diff --git a/ctdb/common/cmdline.h b/ctdb/common/cmdline.h deleted file mode 100644 index 0285b4d125e..00000000000 --- a/ctdb/common/cmdline.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CTDB_CMDLINE_H -#define CTDB_CMDLINE_H - -extern struct poptOption popt_ctdb_cmdline[]; - -#define POPT_CTDB_CMDLINE { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_ctdb_cmdline, 0, "Common ctdb options:", NULL }, - -struct ctdb_context *ctdb_cmdline_init(struct tevent_context *ev); - -struct ctdb_context *ctdb_cmdline_client(struct tevent_context *ev, - struct timeval req_timeout); - -#endif /* CTDB_CMDLINE_H */ diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 92ba35f3310..68618333ad7 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -38,7 +38,6 @@ #include "ctdb_client.h" #include "common/system.h" -#include "common/cmdline.h" #include "common/common.h" #include "common/logging.h" diff --git a/ctdb/tests/src/porting_tests.c b/ctdb/tests/src/porting_tests.c index 146218f2761..74dbf0781b4 100644 --- a/ctdb/tests/src/porting_tests.c +++ b/ctdb/tests/src/porting_tests.c @@ -31,7 +31,6 @@ #include "lib/util/blocking.h" #include "protocol/protocol.h" -#include "common/cmdline.h" #include "common/system.h" #include "common/logging.h" diff --git a/ctdb/wscript b/ctdb/wscript index c775cb5dc94..a69e57b2a82 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -338,7 +338,7 @@ def build(bld): bld.SAMBA_SUBSYSTEM('ctdb-common', source=bld.SUBDIR('common', '''ctdb_io.c ctdb_util.c ctdb_ltdb.c - cmdline.c'''), + '''), includes='include', deps='replace popt talloc tevent tdb popt ctdb-system')