From: Amitay Isaacs Date: Fri, 27 May 2016 03:50:06 +0000 (+1000) Subject: ctdb-daemon: Use lib/util functions instead of redefinitions X-Git-Tag: tdb-1.3.10~908 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ac97d6c073c30c0fdefb8ae7c31d6fa6b29924;p=thirdparty%2Fsamba.git ctdb-daemon: Use lib/util functions instead of redefinitions Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 4ed8f0aa298..7e98499b69b 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -294,9 +294,9 @@ int ctdb_socket_connect(struct ctdb_context *ctdb) return -1; } - set_nonblocking(ctdb->daemon.sd); + set_blocking(ctdb->daemon.sd, false); set_close_on_exec(ctdb->daemon.sd); - + ctdb->daemon.queue = ctdb_queue_setup(ctdb, ctdb, ctdb->daemon.sd, CTDB_DS_ALIGNMENT, ctdb_client_read_cb, ctdb, "to-ctdbd"); diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c index de69b9ee687..48cd7817c91 100644 --- a/ctdb/common/system_aix.c +++ b/ctdb/common/system_aix.c @@ -25,6 +25,7 @@ #include "system/wait.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "protocol/protocol.h" @@ -65,7 +66,7 @@ int ctdb_sys_open_sending_socket(void) return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); return s; @@ -142,7 +143,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); memset(&ip4pkt, 0, sizeof(ip4pkt)); diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c index 38450191c0f..a03b97ad2f3 100644 --- a/ctdb/common/system_freebsd.c +++ b/ctdb/common/system_freebsd.c @@ -30,6 +30,7 @@ #include "system/wait.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "protocol/protocol.h" @@ -179,7 +180,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0, diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c index 70361d737fd..09c4ffef8e9 100644 --- a/ctdb/common/system_gnu.c +++ b/ctdb/common/system_gnu.c @@ -29,6 +29,7 @@ #include "system/wait.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "protocol/protocol.h" @@ -177,7 +178,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0, &dest->ip, sizeof(dest->ip)); diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c index 9b5c9ce1ce9..56f7c1c75f0 100644 --- a/ctdb/common/system_kfreebsd.c +++ b/ctdb/common/system_kfreebsd.c @@ -29,6 +29,7 @@ #include "system/wait.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "protocol/protocol.h" @@ -177,7 +178,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0, &dest->ip, sizeof(dest->ip)); diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c index 2dca174e590..ef78df874fa 100644 --- a/ctdb/common/system_linux.c +++ b/ctdb/common/system_linux.c @@ -24,6 +24,7 @@ #include "system/wait.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "protocol/protocol.h" @@ -385,7 +386,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, return -1; } - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0, @@ -468,7 +469,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data) DEBUG(DEBUG_DEBUG, (__location__ " Created RAW SOCKET FD:%d for tcp tickle\n", s)); - set_nonblocking(s); + set_blocking(s, false); set_close_on_exec(s); return s; diff --git a/ctdb/server/ctdb_cluster_mutex.c b/ctdb/server/ctdb_cluster_mutex.c index fa70a001e81..34484913ce1 100644 --- a/ctdb/server/ctdb_cluster_mutex.c +++ b/ctdb/server/ctdb_cluster_mutex.c @@ -28,6 +28,7 @@ #include "lib/util/time.h" #include "lib/util/strv.h" #include "lib/util/strv_util.h" +#include "lib/util/blocking.h" #include "ctdb_private.h" #include "common/common.h" diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 321b86e49bc..0f17b0f4681 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -33,6 +33,7 @@ #include "lib/util/dlinklist.h" #include "lib/util/debug.h" #include "lib/util/samba_util.h" +#include "lib/util/blocking.h" #include "ctdb_version.h" #include "ctdb_private.h" @@ -937,7 +938,7 @@ static void ctdb_accept_client(struct tevent_context *ev, return; } - set_nonblocking(fd); + set_blocking(fd, false); set_close_on_exec(fd); DEBUG(DEBUG_DEBUG,(__location__ " Created SOCKET FD:%d to connected child\n", fd)); @@ -1006,7 +1007,7 @@ static int ux_socket_bind(struct ctdb_context *ctdb) unlink(ctdb->daemon.name); set_close_on_exec(ctdb->daemon.sd); - set_nonblocking(ctdb->daemon.sd); + set_blocking(ctdb->daemon.sd, false); if (bind(ctdb->daemon.sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) { DEBUG(DEBUG_CRIT,("Unable to bind on ctdb socket '%s'\n", ctdb->daemon.name)); diff --git a/ctdb/server/ctdb_event_helper.c b/ctdb/server/ctdb_event_helper.c index 8db02b91009..7b6e8434695 100644 --- a/ctdb/server/ctdb_event_helper.c +++ b/ctdb/server/ctdb_event_helper.c @@ -24,6 +24,8 @@ #include +#include "lib/util/blocking.h" + #include "ctdb_private.h" #include "common/system.h" diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c index 1819ab7d98c..168d3b55569 100644 --- a/ctdb/server/ctdb_logging.c +++ b/ctdb/server/ctdb_logging.c @@ -28,6 +28,7 @@ #include "lib/util/dlinklist.h" #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "ctdb_private.h" #include "ctdb_client.h" diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c index a56320da736..bd11c8065f7 100644 --- a/ctdb/tcp/tcp_connect.c +++ b/ctdb/tcp/tcp_connect.c @@ -27,6 +27,7 @@ #include "lib/util/debug.h" #include "lib/util/time.h" +#include "lib/util/blocking.h" #include "ctdb_private.h" @@ -148,7 +149,7 @@ void ctdb_tcp_node_connect(struct tevent_context *ev, struct tevent_timer *te, DEBUG(DEBUG_ERR, (__location__ " Failed to create socket\n")); return; } - set_nonblocking(tnode->fd); + set_blocking(tnode->fd, false); set_close_on_exec(tnode->fd); DEBUG(DEBUG_DEBUG, (__location__ " Created TCP SOCKET FD:%d\n", tnode->fd)); @@ -246,7 +247,7 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde, in->fd = fd; in->ctdb = ctdb; - set_nonblocking(in->fd); + set_blocking(in->fd, false); set_close_on_exec(in->fd); DEBUG(DEBUG_DEBUG, (__location__ " Created SOCKET FD:%d to incoming ctdb connection\n", fd)); diff --git a/ctdb/tests/src/ctdb_porting_tests.c b/ctdb/tests/src/ctdb_porting_tests.c index d281e67d692..5d5602b8944 100644 --- a/ctdb/tests/src/ctdb_porting_tests.c +++ b/ctdb/tests/src/ctdb_porting_tests.c @@ -27,6 +27,7 @@ #include #include "lib/util/debug.h" +#include "lib/util/blocking.h" #include "ctdb_private.h" #include "ctdb_client.h" @@ -68,7 +69,7 @@ static int socket_server_create(void) } set_close_on_exec(globals.socket); - //set_nonblocking(globals.socket); + //set_blocking(globals.socket, false); memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; @@ -112,7 +113,7 @@ static int socket_server_wait_peer(void) return -1; } - //set_nonblocking(fd); + //set_blocking(fd, false); set_close_on_exec(fd); return fd; } diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c index b4105a686e4..7055d1646b0 100644 --- a/ctdb/utils/pmda/pmda_ctdb.c +++ b/ctdb/utils/pmda/pmda_ctdb.c @@ -26,6 +26,7 @@ #include #include "lib/util/time.h" +#include "lib/util/blocking.h" #include "ctdb_private.h" #include "ctdb_client.h" @@ -234,7 +235,7 @@ pmda_ctdb_daemon_connect(void) goto err_ctdb; } - set_nonblocking(ctdb->daemon.sd); + set_blocking(ctdb->daemon.sd, false); set_close_on_exec(ctdb->daemon.sd); if (connect(ctdb->daemon.sd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {