From 6ce1aa916e6c5b9abf3421cb3afe1e44a4fef0fb Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Fri, 23 Oct 2015 16:00:39 +1100 Subject: [PATCH] ctdb-include: Group function prototypes from server/eventscript.c Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/include/ctdb_private.h | 47 ++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 6067ba729629..93537cfcc594 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -792,8 +792,6 @@ struct ctdb_client_call_state { } async; }; -int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb, struct ctdb_req_control *c, TDB_DATA data, bool *async_reply); - 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, @@ -853,16 +851,6 @@ struct ctdb_lock_info { typedef void (*client_async_callback)(struct ctdb_context *ctdb, uint32_t node_pnn, int32_t res, TDB_DATA outdata, void *callback_data); -int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_eventscript_call call); -int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call call, - const char *fmt, ...) PRINTF_ATTRIBUTE(3,4); -int ctdb_event_script_callback(struct ctdb_context *ctdb, - TALLOC_CTX *mem_ctx, - void (*callback)(struct ctdb_context *, int, void *), - void *private_data, - enum ctdb_eventscript_call call, - const char *fmt, ...) PRINTF_ATTRIBUTE(6,7); - int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, @@ -926,15 +914,8 @@ extern int script_log_level; extern bool fast_start; extern const char *ctdbd_pidfile; -int32_t ctdb_control_get_event_script_status(struct ctdb_context *ctdb, - uint32_t call_type, - TDB_DATA *outdata); - int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb, struct timeval timeout, double latency); -int32_t ctdb_control_enable_script(struct ctdb_context *ctdb, TDB_DATA indata); -int32_t ctdb_control_disable_script(struct ctdb_context *ctdb, TDB_DATA indata); - /** * structure to pass to a schedule_for_deletion_control */ @@ -1501,4 +1482,32 @@ void ctdb_local_remove_from_delete_queue(struct ctdb_db_context *ctdb_db, const struct ctdb_ltdb_header *hdr, const TDB_DATA key); +/* from eventscript.c */ + +int32_t ctdb_control_get_event_script_status(struct ctdb_context *ctdb, + uint32_t call_type, + TDB_DATA *outdata); + +int ctdb_event_script_callback(struct ctdb_context *ctdb, + TALLOC_CTX *mem_ctx, + void (*callback)(struct ctdb_context *, + int, void *), + void *private_data, + enum ctdb_eventscript_call call, + const char *fmt, ...) PRINTF_ATTRIBUTE(6,7); + +int ctdb_event_script_args(struct ctdb_context *ctdb, + enum ctdb_eventscript_call call, + const char *fmt, ...) PRINTF_ATTRIBUTE(3,4); + +int ctdb_event_script(struct ctdb_context *ctdb, + enum ctdb_eventscript_call call); + +int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb, + struct ctdb_req_control *c, + TDB_DATA data, bool *async_reply); + +int32_t ctdb_control_enable_script(struct ctdb_context *ctdb, TDB_DATA indata); +int32_t ctdb_control_disable_script(struct ctdb_context *ctdb, TDB_DATA indata); + #endif -- 2.34.1