make srvid 64 bits instead of 32 bits

(This used to be ctdb commit 723bcfbba1d5aa711496d37b9658190b78a2d66b)

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index f2b719f67b38d6877a1500a6f4c5527d094ad55f..e9f1e8eb79f96b0363fe455a8792f3808412f830 100644 (file)
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -376,7 +376,7 @@ int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call)
   tell the daemon what messaging srvid we will use, and register the message
   handler function in the client
 */
-int ctdb_set_message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+int ctdb_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                             ctdb_message_fn_t handler,
                             void *private_data)
                                    
@@ -411,7 +411,7 @@ int ctdb_set_message_handler(struct ctdb_context *ctdb, uint32_t srvid,
   send a message - from client context
  */
 int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
-                     uint32_t srvid, TDB_DATA data)
+                     uint64_t srvid, TDB_DATA data)
 {
        struct ctdb_req_message *r;
        int len, res;
@@ -665,7 +665,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb,
 /*
   send a ctdb control message
  */
-int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint32_t srvid, 
+int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid, 
                 uint32_t opcode, TDB_DATA data, 
                 TALLOC_CTX *mem_ctx, TDB_DATA *outdata, int32_t *status)
 {

diff --git a/ctdb/common/ctdb_control.c b/ctdb/common/ctdb_control.c
index 7a9327ec57467422559a9a10cd37922135f069c9..423e4eedfc75f6135c31c94bc3e716132bdf64e3 100644 (file)
--- a/ctdb/common/ctdb_control.c
+++ b/ctdb/common/ctdb_control.c
@@ -220,7 +220,7 @@ static int ctdb_control_destructor(struct ctdb_control_state *state)
   send a control message to a node
  */
 int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
-                            uint32_t srvid, uint32_t opcode, TDB_DATA data,
+                            uint64_t srvid, uint32_t opcode, TDB_DATA data,
                             ctdb_control_callback_fn_t callback,
                             void *private_data)
 {

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index 00baa4dd91542c66434663fe4d097a7142eacca9..49f3e24a1a0c71029b8909ac44b02cec48ed64a7 100644 (file)
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -105,7 +105,7 @@ static int daemon_queue_send(struct ctdb_client *client, struct ctdb_req_header
   message handler for when we are in daemon mode. This redirects the message
   to the right client
  */
-static void daemon_message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void daemon_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                                    TDB_DATA data, void *private_data)
 {
        struct ctdb_client *client = talloc_get_type(private_data, struct ctdb_client);
@@ -146,10 +146,10 @@ static void daemon_request_register_message_handler(struct ctdb_client *client,
                                            c->srvid, daemon_message_handler, 
                                            client);
        if (res != 0) {
-               DEBUG(0,(__location__ " Failed to register handler %u in daemon\n", 
+               DEBUG(0,(__location__ " Failed to register handler %llu in daemon\n", 
                         c->srvid));
        } else {
-               DEBUG(2,(__location__ " Registered message handler for srvid=%u\n", 
+               DEBUG(2,(__location__ " Registered message handler for srvid=%llu\n", 
                         c->srvid));
        }
 }

diff --git a/ctdb/common/ctdb_message.c b/ctdb/common/ctdb_message.c
index cb85d21a6052f4979df1a7dff2909cf9b6b4038e..379af26e03e8e76f62e430115d92ca7344057edc 100644 (file)
--- a/ctdb/common/ctdb_message.c
+++ b/ctdb/common/ctdb_message.c
@@ -32,7 +32,7 @@
 /*
   this dispatches the messages to the registered ctdb message handler
 */
-static int ctdb_dispatch_message(struct ctdb_context *ctdb, uint32_t srvid, TDB_DATA data)
+static int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA data)
 {
        struct ctdb_message_list *ml;
 
@@ -67,7 +67,7 @@ void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
  */
 struct ctdb_local_message {
        struct ctdb_context *ctdb;
-       uint32_t srvid;
+       uint64_t srvid;
        TDB_DATA data;
 };
 
@@ -80,12 +80,12 @@ static void ctdb_local_message_trigger(struct event_context *ev, struct timed_ev
 
        res = ctdb_dispatch_message(m->ctdb, m->srvid, m->data);
        if (res != 0) {
-               DEBUG(0, (__location__ " Failed to dispatch message for srvid=%u\n", m->srvid));
+               DEBUG(0, (__location__ " Failed to dispatch message for srvid=%llu\n", m->srvid));
        }
        talloc_free(m);
 }
 
-static int ctdb_local_message(struct ctdb_context *ctdb, uint32_t srvid, TDB_DATA data)
+static int ctdb_local_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA data)
 {
        struct ctdb_local_message *m;
        m = talloc(ctdb, struct ctdb_local_message);
@@ -109,7 +109,7 @@ static int ctdb_local_message(struct ctdb_context *ctdb, uint32_t srvid, TDB_DAT
   send a ctdb message
 */
 int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t vnn,
-                            uint32_t srvid, TDB_DATA data)
+                            uint64_t srvid, TDB_DATA data)
 {
        struct ctdb_req_message *r;
        int len;
@@ -176,7 +176,7 @@ static int message_handler_destructor(struct ctdb_message_list *m)
 */
 int ctdb_register_message_handler(struct ctdb_context *ctdb, 
                                  TALLOC_CTX *mem_ctx,
-                                 uint32_t srvid,
+                                 uint64_t srvid,
                                  ctdb_message_fn_t handler,
                                  void *private_data)
 {

diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h
index af4198887e22f9860d7686b809e8caf6e0990ee2..0dd8c90c799d0b55b0c471ca977032988f18ace8 100644 (file)
--- a/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@ -56,7 +56,7 @@ struct ctdb_call_info {
 /* 
    a message handler ID meaning "give me all messages"
  */
-#define CTDB_SRVID_ALL 0xFFFFFFFF
+#define CTDB_SRVID_ALL 0xFFFFFFFFFFFFFFFFLL
 
 struct event_context;
 
@@ -160,9 +160,9 @@ uint32_t ctdb_get_vnn(struct ctdb_context *ctdb);
 uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb);
 
 /* setup a handler for ctdb messages */
-typedef void (*ctdb_message_fn_t)(struct ctdb_context *, uint32_t srvid, 
+typedef void (*ctdb_message_fn_t)(struct ctdb_context *, uint64_t srvid, 
                                  TDB_DATA data, void *);
-int ctdb_set_message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+int ctdb_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                             ctdb_message_fn_t handler,
                             void *private_data);
 
@@ -173,7 +173,7 @@ int ctdb_call_recv(struct ctdb_client_call_state *state, struct ctdb_call *call)
 
 /* send a ctdb message */
 int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
-                     uint32_t srvid, TDB_DATA data);
+                     uint64_t srvid, TDB_DATA data);
 
 
 /* 
@@ -203,7 +203,7 @@ int ctdb_record_store(struct ctdb_record_handle *h, TDB_DATA data);
 
 int ctdb_register_message_handler(struct ctdb_context *ctdb, 
                                  TALLOC_CTX *mem_ctx,
-                                 uint32_t srvid,
+                                 uint64_t srvid,
                                  ctdb_message_fn_t handler,
                                  void *private_data);
 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 848941f84bfa781387bf3e90558230e147babaa0..f3d0f72e128d7387cba8a3f04301e21ed5494b1d 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -108,7 +108,7 @@ struct ctdb_upcalls {
 struct ctdb_message_list {
        struct ctdb_context *ctdb;
        struct ctdb_message_list *next, *prev;
-       uint32_t srvid;
+       uint64_t srvid;
        ctdb_message_fn_t message_handler;
        void *message_private;
 };
@@ -364,12 +364,12 @@ struct ctdb_reply_dmaster {
 
 struct ctdb_req_register {
        struct ctdb_req_header hdr;
-       uint32_t srvid;
+       uint64_t srvid;
 };
 
 struct ctdb_req_message {
        struct ctdb_req_header hdr;
-       uint32_t srvid;
+       uint64_t srvid;
        uint32_t datalen;
        uint8_t data[1];
 };
@@ -406,7 +406,7 @@ struct ctdb_reply_getdbpath {
 struct ctdb_req_control {
        struct ctdb_req_header hdr;
        uint32_t opcode;
-       uint32_t srvid;
+       uint64_t srvid;
        uint32_t datalen;
        uint8_t data[1];
 };
@@ -516,18 +516,18 @@ struct ctdb_call_state *ctdb_client_call_send(struct ctdb_db_context *ctdb_db,
 */
 int ctdb_client_call_recv(struct ctdb_call_state *state, struct ctdb_call *call);
 
-int ctdb_daemon_set_message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+int ctdb_daemon_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                             ctdb_message_fn_t handler,
                             void *private_data);
 
 int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t vnn,
-                            uint32_t srvid, TDB_DATA data);
+                            uint64_t srvid, TDB_DATA data);
 
 /*
   send a ctdb message
 */
 int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t vnn,
-                            uint32_t srvid, TDB_DATA data);
+                            uint64_t srvid, TDB_DATA data);
 
 
 /*
@@ -571,7 +571,7 @@ void ctdb_request_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
 void ctdb_reply_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr);
 
 int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
-                            uint32_t srvid, uint32_t opcode, TDB_DATA data,
+                            uint64_t srvid, uint32_t opcode, TDB_DATA data,
                             ctdb_control_callback_fn_t callback,
                             void *private_data);
 

diff --git a/ctdb/tests/ctdb_bench.c b/ctdb/tests/ctdb_bench.c
index ead3184157e28442a52b5ef8ecf430ce0a74e543..296bfc48cd3d820429f6ac9e61cdb20ea21cb49e 100644 (file)
--- a/ctdb/tests/ctdb_bench.c
+++ b/ctdb/tests/ctdb_bench.c
@@ -84,7 +84,7 @@ static int msg_plus, msg_minus;
 /*
   handler for messages in bench_ring()
 */
-static void ring_message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void ring_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                                 TDB_DATA data, void *private_data)
 {
        int incr = *(int *)data.dptr;

diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c
index 39bd861fc1d589af70acc8c1ddb704524d53b7e6..2af25ed2c18449c750f8976492cb3391d4e14197 100644 (file)
--- a/ctdb/tests/ctdb_fetch.c
+++ b/ctdb/tests/ctdb_fetch.c
@@ -107,7 +107,7 @@ static void bench_fetch_1node(struct ctdb_context *ctdb)
 /*
   handler for messages in bench_ring()
 */
-static void message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                            TDB_DATA data, void *private_data)
 {
        msg_count++;

diff --git a/ctdb/tests/ctdb_fetch1.c b/ctdb/tests/ctdb_fetch1.c
index b92e7fcda3273a1287a997466ca622bb41de6f65..bfe340ea72578f670c3f7b2ce134dea28ce8d868 100644 (file)
--- a/ctdb/tests/ctdb_fetch1.c
+++ b/ctdb/tests/ctdb_fetch1.c
@@ -47,12 +47,12 @@ static double end_timer(void)
                (tp1.tv_sec + (tp1.tv_usec*1.0e-6));
 }
 
-static void message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                            TDB_DATA data, void *private_data)
 {
        num_msg++;
 }
-static void child_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void child_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                            TDB_DATA data, void *private_data)
 {
        num_msg++;

diff --git a/ctdb/tests/ctdb_messaging.c b/ctdb/tests/ctdb_messaging.c
index e7057b64fb970cf37a420fe7a93e87e4e235ac4e..557cc5b2586a6ab72f9c08e52bb7816d884f4493 100644 (file)
--- a/ctdb/tests/ctdb_messaging.c
+++ b/ctdb/tests/ctdb_messaging.c
@@ -33,10 +33,10 @@ static int num_clients = 2;
 /*
   handler for messages in bench_ring()
 */
-static void message_handler(struct ctdb_context *ctdb, uint32_t srvid, 
+static void message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
                                 TDB_DATA data, void *private_data)
 {
-       printf("client vnn:%d received a message to srvid:%d [%s]\n",ctdb_get_vnn(ctdb),srvid,data.dptr);
+       printf("client vnn:%d received a message to srvid:%lld [%s]\n",ctdb_get_vnn(ctdb),srvid,data.dptr);
        fflush(stdout);
 }