From: Amitay Isaacs Date: Tue, 27 Oct 2015 04:34:30 +0000 (+1100) Subject: ctdb-include: Move client function prototypes to ctdb_client.h X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=03beaa3d3daa51826361f06ec1a05c8791a096e2;p=obnox%2Fsamba%2Fsamba-obnox.git ctdb-include: Move client function prototypes to ctdb_client.h Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 07e360c74b5..b9f4cd7b435 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -471,4 +471,138 @@ ctdb_ctrl_set_db_sticky_send(struct ctdb_context *ctdb, uint32_t destnode, uint3 int ctdb_ctrl_set_db_sticky_recv(struct ctdb_context *ctdb, struct ctdb_client_control_state *state); int ctdb_ctrl_set_db_sticky(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid); +/* + allocate a packet for use in client<->daemon communication + */ +struct ctdb_req_header *_ctdbd_allocate_pkt(struct ctdb_context *ctdb, + TALLOC_CTX *mem_ctx, + enum ctdb_operation operation, + size_t length, size_t slength, + const char *type); +#define ctdbd_allocate_pkt(ctdb, mem_ctx, operation, length, type) \ + (type *)_ctdbd_allocate_pkt(ctdb, mem_ctx, operation, length, sizeof(type), #type) + +int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t vnn, + uint64_t srvid, TDB_DATA data); + +int ctdb_socket_connect(struct ctdb_context *ctdb); +void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args); + +void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr); + +int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call, + struct ctdb_ltdb_header *header, TALLOC_CTX *mem_ctx, + TDB_DATA *data, bool updatetdb); + +int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid, + uint32_t opcode, uint32_t flags, TDB_DATA data, + TALLOC_CTX *mem_ctx, TDB_DATA *outdata, int32_t *status, + struct timeval *timeout, char **errormsg); +int ctdb_control_recv(struct ctdb_context *ctdb, + struct ctdb_client_control_state *state, + TALLOC_CTX *mem_ctx, + TDB_DATA *outdata, int32_t *status, char **errormsg); + +struct ctdb_client_control_state * +ctdb_control_send(struct ctdb_context *ctdb, + uint32_t destnode, uint64_t srvid, + uint32_t opcode, uint32_t flags, TDB_DATA data, + TALLOC_CTX *mem_ctx, + struct timeval *timeout, + char **errormsg); + +int ctdb_ctrl_takeover_ip(struct ctdb_context *ctdb, struct timeval timeout, + uint32_t destnode, struct ctdb_public_ip *ip); +int ctdb_ctrl_release_ip(struct ctdb_context *ctdb, struct timeval timeout, + uint32_t destnode, struct ctdb_public_ip *ip); + +int ctdb_ctrl_get_public_ips(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + TALLOC_CTX *mem_ctx, + struct ctdb_all_public_ips **ips); + +int ctdb_ctrl_get_public_ips_flags(struct ctdb_context *ctdb, + struct timeval timeout, uint32_t destnode, + TALLOC_CTX *mem_ctx, + uint32_t flags, + struct ctdb_all_public_ips **ips); + +int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, + struct timeval timeout, uint32_t destnode, + TALLOC_CTX *mem_ctx, + const ctdb_sock_addr *addr, + struct ctdb_control_public_ip_info **info); +int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb, + struct timeval timeout, uint32_t destnode, + TALLOC_CTX *mem_ctx, + struct ctdb_control_get_ifaces **ifaces); +int ctdb_ctrl_set_iface_link(struct ctdb_context *ctdb, + struct timeval timeout, uint32_t destnode, + TALLOC_CTX *mem_ctx, + const struct ctdb_control_iface_info *info); + +int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + struct ctdb_tunable *tunables); + +int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + struct ctdb_tcp_connection *killtcp); + +int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + struct ctdb_control_ip_iface *pub); + +int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + struct ctdb_control_ip_iface *pub); + +int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + ctdb_sock_addr *addr, + const char *ifname); + +int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, + struct timeval timeout, + uint32_t destnode, + TALLOC_CTX *mem_ctx, + ctdb_sock_addr *addr, + struct ctdb_control_tcp_tickle_list **list); + +typedef void (*client_async_callback)(struct ctdb_context *ctdb, uint32_t node_pnn, int32_t res, TDB_DATA outdata, void *callback_data); + +struct client_async_data { + enum ctdb_controls opcode; + bool dont_log_errors; + uint32_t count; + uint32_t fail_count; + client_async_callback callback; + client_async_callback fail_callback; + void *callback_data; +}; + +void ctdb_client_async_add(struct client_async_data *data, struct ctdb_client_control_state *state); +int ctdb_client_async_wait(struct ctdb_context *ctdb, struct client_async_data *data); +int ctdb_client_async_control(struct ctdb_context *ctdb, + enum ctdb_controls opcode, + uint32_t *nodes, + uint64_t srvid, + struct timeval timeout, + bool dont_log_errors, + TDB_DATA data, + client_async_callback client_callback, + client_async_callback fail_callback, + void *callback_data); + +int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb, struct timeval timeout, double latency); + +struct ctdb_record_handle; +struct ctdb_ltdb_header *ctdb_header_from_record_handle(struct ctdb_record_handle *h); + #endif /* _CTDB_CLIENT_H */ diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index a0313919350..95b41e7078e 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -528,51 +528,8 @@ struct ctdb_fetch_handle { /* internal prototypes */ -void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr); - -/* - allocate a packet for use in client<->daemon communication - */ -struct ctdb_req_header *_ctdbd_allocate_pkt(struct ctdb_context *ctdb, - TALLOC_CTX *mem_ctx, - enum ctdb_operation operation, - size_t length, size_t slength, - const char *type); -#define ctdbd_allocate_pkt(ctdb, mem_ctx, operation, length, type) \ - (type *)_ctdbd_allocate_pkt(ctdb, mem_ctx, operation, length, sizeof(type), #type) - -int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t vnn, - uint64_t srvid, TDB_DATA data); - -int ctdb_call_local(struct ctdb_db_context *ctdb_db, struct ctdb_call *call, - struct ctdb_ltdb_header *header, TALLOC_CTX *mem_ctx, - TDB_DATA *data, bool updatetdb); - #define ctdb_reqid_find(ctdb, reqid, type) (type *)_ctdb_reqid_find(ctdb, reqid, #type, __location__) -int ctdb_socket_connect(struct ctdb_context *ctdb); -void ctdb_client_read_cb(uint8_t *data, size_t cnt, void *args); - -int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid, - uint32_t opcode, uint32_t flags, TDB_DATA data, - TALLOC_CTX *mem_ctx, TDB_DATA *outdata, int32_t *status, - struct timeval *timeout, char **errormsg); -int ctdb_control_recv(struct ctdb_context *ctdb, - struct ctdb_client_control_state *state, - TALLOC_CTX *mem_ctx, - TDB_DATA *outdata, int32_t *status, char **errormsg); - -struct ctdb_client_control_state * -ctdb_control_send(struct ctdb_context *ctdb, - uint32_t destnode, uint64_t srvid, - uint32_t opcode, uint32_t flags, TDB_DATA data, - TALLOC_CTX *mem_ctx, - struct timeval *timeout, - char **errormsg); - - - - #define CHECK_CONTROL_DATA_SIZE(size) do { \ if (indata.dsize != size) { \ DEBUG(0,(__location__ " Invalid data size in opcode %u. Got %u expected %u\n", \ @@ -603,35 +560,6 @@ struct ctdb_client_call_state { } async; }; -int ctdb_ctrl_takeover_ip(struct ctdb_context *ctdb, struct timeval timeout, - uint32_t destnode, struct ctdb_public_ip *ip); -int ctdb_ctrl_release_ip(struct ctdb_context *ctdb, struct timeval timeout, - uint32_t destnode, struct ctdb_public_ip *ip); - -int ctdb_ctrl_get_public_ips(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - TALLOC_CTX *mem_ctx, - struct ctdb_all_public_ips **ips); -int ctdb_ctrl_get_public_ips_flags(struct ctdb_context *ctdb, - struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, - uint32_t flags, - struct ctdb_all_public_ips **ips); - -int ctdb_ctrl_get_public_ip_info(struct ctdb_context *ctdb, - struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, - const ctdb_sock_addr *addr, - struct ctdb_control_public_ip_info **info); -int ctdb_ctrl_get_ifaces(struct ctdb_context *ctdb, - struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, - struct ctdb_control_get_ifaces **ifaces); -int ctdb_ctrl_set_iface_link(struct ctdb_context *ctdb, - struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, - const struct ctdb_control_iface_info *info); /* Details of a byte range lock */ struct ctdb_lock_info { @@ -641,75 +569,14 @@ struct ctdb_lock_info { bool read_only; }; -typedef void (*client_async_callback)(struct ctdb_context *ctdb, uint32_t node_pnn, int32_t res, TDB_DATA outdata, void *callback_data); - -int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - struct ctdb_tunable *tunables); - -int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - struct ctdb_tcp_connection *killtcp); - -int ctdb_ctrl_add_public_ip(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - struct ctdb_control_ip_iface *pub); - -int ctdb_ctrl_del_public_ip(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - struct ctdb_control_ip_iface *pub); - -int ctdb_ctrl_gratious_arp(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - ctdb_sock_addr *addr, - const char *ifname); - -int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb, - struct timeval timeout, - uint32_t destnode, - TALLOC_CTX *mem_ctx, - ctdb_sock_addr *addr, - struct ctdb_control_tcp_tickle_list **list); - int32_t ctdb_control_persistent_store(struct ctdb_context *ctdb, struct ctdb_req_control *c, TDB_DATA recdata, bool *async_reply); -struct client_async_data { - enum ctdb_controls opcode; - bool dont_log_errors; - uint32_t count; - uint32_t fail_count; - client_async_callback callback; - client_async_callback fail_callback; - void *callback_data; -}; -void ctdb_client_async_add(struct client_async_data *data, struct ctdb_client_control_state *state); -int ctdb_client_async_wait(struct ctdb_context *ctdb, struct client_async_data *data); -int ctdb_client_async_control(struct ctdb_context *ctdb, - enum ctdb_controls opcode, - uint32_t *nodes, - uint64_t srvid, - struct timeval timeout, - bool dont_log_errors, - TDB_DATA data, - client_async_callback client_callback, - client_async_callback fail_callback, - void *callback_data); - extern int script_log_level; extern bool fast_start; extern const char *ctdbd_pidfile; -int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb, struct timeval timeout, double latency); - -struct ctdb_ltdb_header *ctdb_header_from_record_handle(struct ctdb_record_handle *h); - typedef void (*deferred_requeue_fn)(void *call_context, struct ctdb_req_header *hdr); /*