ctdb-daemon: Rename struct ctdb_dbid_map to ctdb_dbid_map_old

[obnox/samba/samba-obnox.git] / ctdb / include / ctdb_protocol.h

diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 71e21bd610cc89501cdd79933db6f743d25bd08f..6505873d5d8267f07678b30d934229519216fc1f 100644 (file)
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -218,7 +218,7 @@ struct ctdb_call_info {
 
 #define MAX_SCRIPT_NAME 31
 #define MAX_SCRIPT_OUTPUT 511
-struct ctdb_script_wire {
+struct ctdb_script {
        char name[MAX_SCRIPT_NAME+1];
        struct timeval start;
        struct timeval finished;
@@ -226,13 +226,13 @@ struct ctdb_script_wire {
        char output[MAX_SCRIPT_OUTPUT+1];
 };
 
-struct ctdb_scripts_wire {
+struct ctdb_script_list_old {
        uint32_t num_scripts;
-       struct ctdb_script_wire scripts[1];
+       struct ctdb_script scripts[1];
 };
 
 /* different calls to event scripts. */
-enum ctdb_eventscript_call {
+enum ctdb_event {
        CTDB_EVENT_INIT,                /* CTDB starting up: no args */
        CTDB_EVENT_SETUP,               /* CTDB starting up after transport is readdy: no args. */
        CTDB_EVENT_STARTUP,             /* CTDB starting up after initial recovery: no args. */
@@ -429,7 +429,7 @@ struct ctdb_req_header {
        uint32_t reqid;
 };
 
-struct ctdb_req_call {
+struct ctdb_req_call_old {
        struct ctdb_req_header hdr;
        uint32_t flags;
        uint32_t db_id;
@@ -440,21 +440,21 @@ struct ctdb_req_call {
        uint8_t data[1]; /* key[] followed by calldata[] */
 };
 
-struct ctdb_reply_call {
+struct ctdb_reply_call_old {
        struct ctdb_req_header hdr;
        uint32_t status;
        uint32_t datalen;
        uint8_t  data[1];
 };
 
-struct ctdb_reply_error {
+struct ctdb_reply_error_old {
        struct ctdb_req_header hdr;
        uint32_t status;
        uint32_t msglen;
        uint8_t  msg[1];
 };
 
-struct ctdb_req_dmaster {
+struct ctdb_req_dmaster_old {
        struct ctdb_req_header hdr;
        uint32_t db_id;
        uint64_t rsn;
@@ -464,7 +464,7 @@ struct ctdb_req_dmaster {
        uint8_t  data[1];
 };
 
-struct ctdb_reply_dmaster {
+struct ctdb_reply_dmaster_old {
        struct ctdb_req_header hdr;
        uint32_t db_id;
        uint64_t rsn;
@@ -473,14 +473,14 @@ struct ctdb_reply_dmaster {
        uint8_t  data[1];
 };
 
-struct ctdb_req_message {
+struct ctdb_req_message_old {
        struct ctdb_req_header hdr;
        uint64_t srvid;
        uint32_t datalen;
        uint8_t data[1];
 };
 
-struct ctdb_req_control {
+struct ctdb_req_control_old {
        struct ctdb_req_header hdr;
        uint32_t opcode;
        uint32_t pad;
@@ -493,7 +493,7 @@ struct ctdb_req_control {
        uint8_t data[1];
 };
 
-struct ctdb_reply_control {
+struct ctdb_reply_control_old {
        struct ctdb_req_header hdr;
        int32_t  status;
        uint32_t datalen;
@@ -501,7 +501,7 @@ struct ctdb_reply_control {
        uint8_t data[1];
 };
 
-struct ctdb_req_keepalive {
+struct ctdb_req_keepalive_old {
        struct ctdb_req_header hdr;
 };
 
@@ -532,12 +532,10 @@ struct ctdb_ltdb_header {
 /*
   definitions for different socket structures
  */
-typedef struct sockaddr_in ctdb_addr_in;
-typedef struct sockaddr_in6 ctdb_addr_in6;
 typedef union {
        struct sockaddr sa;
-       ctdb_addr_in    ip;
-       ctdb_addr_in6   ip6;
+       struct sockaddr_in ip;
+       struct sockaddr_in6 ip6;
 } ctdb_sock_addr;
 
 /*
@@ -555,7 +553,7 @@ struct ctdb_node_and_flags {
    The nodemap is the structure containing a list of all nodes
    known to the cluster and their associated flags.
 */
-struct ctdb_node_map {
+struct ctdb_node_map_old {
        uint32_t num;
        struct ctdb_node_and_flags nodes[1];
 };
@@ -598,13 +596,13 @@ struct ctdb_public_ip {
        ctdb_sock_addr addr;
 };
 
-struct ctdb_all_public_ips {
+struct ctdb_public_ip_list_old {
        uint32_t num;
        struct ctdb_public_ip ips[1];
 };
 
 
-struct latency_counter {
+struct ctdb_latency_counter {
        int num;
        double min;
        double max;
@@ -614,7 +612,7 @@ struct latency_counter {
 /*
   structure used to pass record data between the child and parent
  */
-struct ctdb_rec_data {
+struct ctdb_rec_data_old {
        uint32_t length;
        uint32_t reqid;
        uint32_t keylen;
@@ -672,15 +670,15 @@ struct ctdb_statistics {
                uint32_t traverse;
        } timeouts;
        struct {
-               struct latency_counter ctdbd;
-               struct latency_counter recd;
+               struct ctdb_latency_counter ctdbd;
+               struct ctdb_latency_counter recd;
        } reclock;
        struct {
                uint32_t num_calls;
                uint32_t num_current;
                uint32_t num_pending;
                uint32_t num_failed;
-               struct latency_counter latency;
+               struct ctdb_latency_counter latency;
                uint32_t buckets[MAX_COUNT_BUCKETS];
        } locks;
        uint32_t total_calls;
@@ -691,8 +689,8 @@ struct ctdb_statistics {
        uint32_t __last_counter; /* hack for control_statistics_all */
        uint32_t max_hop_count;
        uint32_t hop_count_bucket[MAX_COUNT_BUCKETS];
-       struct latency_counter call_latency;
-       struct latency_counter childwrite_latency;
+       struct ctdb_latency_counter call_latency;
+       struct ctdb_latency_counter childwrite_latency;
        uint32_t num_recoveries;
        struct timeval statistics_start_time;
        struct timeval statistics_current_time;
@@ -703,7 +701,7 @@ struct ctdb_statistics {
 /*
  * wire format for statistics history
  */
-struct ctdb_statistics_wire {
+struct ctdb_statistics_list_old {
        uint32_t num;
        struct ctdb_statistics stats[1];
 };
@@ -711,17 +709,17 @@ struct ctdb_statistics_wire {
 /*
  * db statistics
  */
-struct ctdb_db_statistics {
+struct ctdb_db_statistics_old {
        struct {
                uint32_t num_calls;
                uint32_t num_current;
                uint32_t num_pending;
                uint32_t num_failed;
-               struct latency_counter latency;
+               struct ctdb_latency_counter latency;
                uint32_t buckets[MAX_COUNT_BUCKETS];
        } locks;
        struct {
-               struct latency_counter latency;
+               struct ctdb_latency_counter latency;
        } vacuum;
        uint32_t db_ro_delegations;
        uint32_t db_ro_revokes;
@@ -743,17 +741,6 @@ struct ctdb_db_statistics {
 #define CTDB_IFACE_SIZE 16
 #endif
 
-struct ctdb_iface_info {
-       char name[CTDB_IFACE_SIZE+2];
-       uint16_t link_state;
-       uint32_t references;
-};
-
-struct ctdb_ifaces_list {
-       uint32_t num;
-       struct ctdb_iface_info ifaces[1];
-};
-
 #define INVALID_GENERATION 1
 /* table that contains the mapping between a hash value and lmaster
  */
@@ -772,27 +759,26 @@ struct ctdb_vnn_map_wire {
        uint32_t map[1];
 };
 
-struct ctdb_client_notify_register {
+struct ctdb_notify_data_old {
        uint64_t srvid;
        uint32_t len;
        uint8_t notify_data[1];
 };
 
-struct ctdb_client_notify_deregister {
-       uint64_t srvid;
-};
-
 /* table that contains a list of all dbids on a node
  */
-struct ctdb_dbid_map {
-       uint32_t num;
-       struct ctdb_dbid {
-               uint32_t dbid;
+
+struct ctdb_dbid {
+       uint32_t db_id;
 #define CTDB_DB_FLAGS_PERSISTENT       0x01
 #define CTDB_DB_FLAGS_READONLY         0x02
 #define CTDB_DB_FLAGS_STICKY           0x04
-               uint8_t flags;
-       } dbs[1];
+       uint8_t flags;
+};
+
+struct ctdb_dbid_map_old {
+       uint32_t num;
+       struct ctdb_dbid dbs[1];
 };
 
 #define CTDB_RECOVERY_NORMAL           0