From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26615 invoked by alias); 11 May 2009 15:14:37 -0000 Received: (qmail 26532 invoked by alias); 11 May 2009 15:14:36 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - group_daemon: make functions static To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 7b68fe23d686a45f53a3bb208c71132a0a9a4c8a X-Git-Newrev: 3491452d008c0cf99719de02e17ad97c6dd3da19 From: David Teigland Message-Id: <20090511151327.C9EE81201EC@lists.fedorahosted.org> Date: Mon, 11 May 2009 15:14:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00272.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3491452d008c0cf99719de02e17ad97c6dd3da19 Commit: 3491452d008c0cf99719de02e17ad97c6dd3da19 Parent: 7b68fe23d686a45f53a3bb208c71132a0a9a4c8a Author: Fabio M. Di Nitto AuthorDate: Wed May 6 11:49:12 2009 +0200 Committer: David Teigland CommitterDate: Mon May 11 10:05:07 2009 -0500 group_daemon: make functions static Signed-off-by: Fabio M. Di Nitto --- group/daemon/app.c | 28 ++++++++++++++-------------- group/daemon/cpg.c | 12 ++++++------ group/daemon/joinleave.c | 2 +- group/daemon/main.c | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/group/daemon/app.c b/group/daemon/app.c index c024407..4ba6625 100644 --- a/group/daemon/app.c +++ b/group/daemon/app.c @@ -51,7 +51,7 @@ void msg_bswap_in(msg_t *msg) msg->ms_event_id = le64_to_cpu(msg->ms_event_id); } -uint64_t make_event_id(group_t *g, int state, int nodeid) +static uint64_t make_event_id(group_t *g, int state, int nodeid) { uint64_t id; uint32_t n = nodeid; @@ -79,7 +79,7 @@ uint64_t make_event_id(group_t *g, int state, int nodeid) return id; } -void free_event(event_t *ev) +static void free_event(event_t *ev) { struct nodeid *id, *id_safe; @@ -90,7 +90,7 @@ void free_event(event_t *ev) free(ev); } -int event_id_to_nodeid(uint64_t id) +static int event_id_to_nodeid(uint64_t id) { int nodeid; uint64_t n = id >> 32; @@ -98,7 +98,7 @@ int event_id_to_nodeid(uint64_t id) return nodeid; } -int event_id_to_type(uint64_t id) +static int event_id_to_type(uint64_t id) { uint64_t n; n = id & 0x000000000000FFFF; @@ -296,7 +296,7 @@ struct recovery_set *add_recovery_set_cpg(int nodeid, int procdown) return rs; } -void _del_recovery_set(group_t *g, int nodeid, int purge) +static void _del_recovery_set(group_t *g, int nodeid, int purge) { struct recovery_set *rs, *rs2; struct recovery_entry *re, *re2; @@ -352,7 +352,7 @@ void _del_recovery_set(group_t *g, int nodeid, int purge) one failed nodeid). Remove this group from recovery sets for those nodeids and free any recovery sets that are now completed. */ -void del_recovery_set(group_t *g, event_t *ev, int purge) +static void del_recovery_set(group_t *g, event_t *ev, int purge) { struct nodeid *id; @@ -374,7 +374,7 @@ void del_recovery_set(group_t *g, event_t *ev, int purge) callbacks, not cman callbacks, so that's why we might be trying to do recovery without having heard from cman yet.] */ -int cman_quorum_updated(void) +static int cman_quorum_updated(void) { struct recovery_set *rs; @@ -388,7 +388,7 @@ int cman_quorum_updated(void) return 1; } -int is_recovery_event(event_t *ev) +static int is_recovery_event(event_t *ev) { if (event_id_to_type(ev->id) == 3) return 1; @@ -600,7 +600,7 @@ static void add_event_nodes(group_t *g, event_t *ev) } } -event_t *search_event(group_t *g, int nodeid) +static event_t *search_event(group_t *g, int nodeid) { event_t *ev; @@ -611,7 +611,7 @@ event_t *search_event(group_t *g, int nodeid) return NULL; } -void dump_queued_events(group_t *g) +static void dump_queued_events(group_t *g) { event_t *ev; @@ -755,7 +755,7 @@ static int is_our_leave(event_t *ev) groupd_down() will fill in stops for us for nodes that fail before sending stopped for our leave. */ -void finalize_our_leave(group_t *g) +static void finalize_our_leave(group_t *g) { struct recovery_set *rs; struct recovery_entry *re, *re2; @@ -927,7 +927,7 @@ static int count_nodes_not_stopped(app_t *a) return i; } -int event_state_begin(app_t *a) +static int event_state_begin(app_t *a) { if (a->current_event->state == EST_JOIN_BEGIN || a->current_event->state == EST_LEAVE_BEGIN || @@ -963,7 +963,7 @@ int event_state_all_stopped(app_t *a) return FALSE; } -int event_state_all_started(app_t *a) +static int event_state_all_started(app_t *a) { if (a->current_event->state == EST_JOIN_ALL_STARTED || a->current_event->state == EST_LEAVE_ALL_STARTED || @@ -1498,7 +1498,7 @@ void dump_all_groups(void) /* handle a node failure while processing an event. returning > 0 means we want process_current_event() to be called for the group */ -int recover_current_event(group_t *g) +static int recover_current_event(group_t *g) { app_t *a = g->app; event_t *ev, *rev; diff --git a/group/daemon/cpg.c b/group/daemon/cpg.c index e81b496..caed50d 100644 --- a/group/daemon/cpg.c +++ b/group/daemon/cpg.c @@ -476,7 +476,7 @@ static int send_gid(uint32_t gid) return send_message_groupd(&g, &msg, sizeof(msg), MSG_GLOBAL_ID); } -void process_groupd_confchg(void) +static void process_groupd_confchg(void) { group_t *g; struct recovery_set *rs; @@ -598,7 +598,7 @@ int in_groupd_cpg(int nodeid) return 0; } -group_t *find_group_by_handle(cpg_handle_t h) +static group_t *find_group_by_handle(cpg_handle_t h) { group_t *g; @@ -609,7 +609,7 @@ group_t *find_group_by_handle(cpg_handle_t h) return NULL; } -void deliver_cb(cpg_handle_t handle, +static void deliver_cb(cpg_handle_t handle, const struct cpg_name *group_name, uint32_t nodeid, uint32_t pid, void *data, size_t data_len) @@ -696,7 +696,7 @@ void deliver_cb(cpg_handle_t handle, queue_app_message(g, save); } -void process_confchg(void) +static void process_confchg(void) { group_t *g; int i; @@ -744,7 +744,7 @@ void process_confchg(void) } } -void confchg_cb(cpg_handle_t handle, +static void confchg_cb(cpg_handle_t handle, const struct cpg_name *group_name, const struct cpg_address *member_list, size_t member_list_entries, @@ -812,7 +812,7 @@ cpg_callbacks_t callbacks = { .cpg_confchg_fn = confchg_cb, }; -void process_cpg(int ci) +static void process_cpg(int ci) { group_t *g = NULL; cpg_error_t error; diff --git a/group/daemon/joinleave.c b/group/daemon/joinleave.c index a9dcc8e..e2a1ea7 100644 --- a/group/daemon/joinleave.c +++ b/group/daemon/joinleave.c @@ -38,7 +38,7 @@ int create_group(const char *name, int level, group_t **g_out) return 0; } -void free_group_memb(group_t *g) +static void free_group_memb(group_t *g) { node_t *node, *n; diff --git a/group/daemon/main.c b/group/daemon/main.c index e24ecbb..0915bdf 100644 --- a/group/daemon/main.c +++ b/group/daemon/main.c @@ -124,7 +124,7 @@ void read_ccs_int(const char *path, int *config_val) #define GROUPD_WAIT_PATH "/cluster/group/@groupd_wait" #define GROUPD_MODE_DELAY_PATH "/cluster/group/@groupd_mode_delay" -int setup_ccs(void) +static int setup_ccs(void) { int cd; @@ -150,7 +150,7 @@ int setup_ccs(void) return 0; } -void close_ccs(void) +static void close_ccs(void) { ccs_disconnect(ccs_handle); } @@ -297,7 +297,7 @@ enum { DO_GET_VERSION, }; -int get_action(char *buf) +static int get_action(char *buf) { char act[16]; int i;