ctdb-daemon: Use lib/util functions instead of redefinitions

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 4ed8f0aa29808c23cd22a5136f03d882e5c4f1cc..7e98499b69b5b94b9532905b173e4a65a9053250 100644 (file)
--- 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 de69b9ee687ee074f20a123ff794e3b74e474544..48cd7817c919bfcb55bd0675f395cbeec604373d 100644 (file)
--- 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 38450191c0f35e294b99918379ae0056e40157c9..a03b97ad2f3002dc06e518fbafeae2f59dd1e793 100644 (file)
--- 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 70361d737fd9beab35b63e2d71bef6e3f608ab57..09c4ffef8e9558c20e547ffb242762850ad80cb4 100644 (file)
--- 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 9b5c9ce1ce9d2f069e37bb85829785af7f252848..56f7c1c75f06e35de1b5258eb9d7bfc18a9f14a8 100644 (file)
--- 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 2dca174e5900e13f61603241110eba85829e654c..ef78df874fae0ba2a0bc26db6b3e78e699798d27 100644 (file)
--- 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 fa70a001e811ae225b5eea6819bc0b591901f64b..34484913ce1bc94019f3c2ba336eba31ca115d37 100644 (file)
--- 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 321b86e49bce8b3d19b5632004acd07272548aa2..0f17b0f46812795a1020c53cf68b55e55fca622c 100644 (file)
--- 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 8db02b9100990ce5a76e8e86e1b9b29a1a7c9c7b..7b6e8434695f76921214268c360412cd26fbee69 100644 (file)
--- a/ctdb/server/ctdb_event_helper.c
+++ b/ctdb/server/ctdb_event_helper.c
@@ -24,6 +24,8 @@
 
 #include <talloc.h>
 
+#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 1819ab7d98cdb8c94e9922bbd4fd9314e07b4627..168d3b55569b849cd52440fdc00f02a3d44ae8bb 100644 (file)
--- 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 a56320da73690f29aacff30673c5672ee17621db..bd11c8065f7c37339165a96b7150d9897145cfe4 100644 (file)
--- 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 d281e67d692198c7281e7e37edb590739582cc12..5d5602b89445e331651ce8c1f5b5a3bf02085526 100644 (file)
--- a/ctdb/tests/src/ctdb_porting_tests.c
+++ b/ctdb/tests/src/ctdb_porting_tests.c
@@ -27,6 +27,7 @@
 #include <tdb.h>
 
 #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 b4105a686e417a16fdc9167f90692e2c086b92ee..7055d1646b0e8cabeb15fb715f4070e2b9e79778 100644 (file)
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -26,6 +26,7 @@
 #include <tevent.h>
 
 #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) {