From 6e3637ac9861cc4b4cdd9c019769960edcb7b5a5 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 6 Jul 2004 20:05:14 +0000 Subject: [PATCH] Remove extra parameter to exec messages. (Logical change 1.22) git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@59 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/amf.c | 26 +++++++++++++------------- exec/ckpt.c | 48 ++++++++++++++++++++++++------------------------ exec/clm.c | 6 +++--- exec/main.c | 7 ++++--- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/exec/amf.c b/exec/amf.c index eeceac72..d608940f 100644 --- a/exec/amf.c +++ b/exec/amf.c @@ -216,17 +216,17 @@ static int amfApiFinalize (int fd); static int amfExecutiveInitialize (void); -static int message_handler_req_exec_amf_componentregister (int fd, void *message); +static int message_handler_req_exec_amf_componentregister (void *message); -static int message_handler_req_exec_amf_componentunregister (int fd, void *message); +static int message_handler_req_exec_amf_componentunregister (void *message); -static int message_handler_req_exec_amf_errorreport (int fd, void *message); +static int message_handler_req_exec_amf_errorreport (void *message); -static int message_handler_req_exec_amf_errorcancelall (int fd, void *message); +static int message_handler_req_exec_amf_errorcancelall (void *message); -static int message_handler_req_exec_amf_readinessstateset (int fd, void *message); +static int message_handler_req_exec_amf_readinessstateset (void *message); -static int message_handler_req_exec_amf_hastateset (int fd, void *message); +static int message_handler_req_exec_amf_hastateset (void *message); static int message_handler_req_amf_init (int fd, void *message); @@ -269,7 +269,7 @@ int (*amf_libais_handler_fns[]) (int fd, void *) = { message_handler_req_amf_componentcapabilitymodelget }; -int (*amf_aisexec_handler_fns[]) (int fd, void *) = { +int (*amf_aisexec_handler_fns[]) (void *) = { message_handler_req_exec_amf_componentregister, message_handler_req_exec_amf_componentunregister, message_handler_req_exec_amf_errorreport, @@ -1493,7 +1493,7 @@ int amfApiFinalize (int fd) } -static int message_handler_req_exec_amf_componentregister (int fd, void *message) +static int message_handler_req_exec_amf_componentregister (void *message) { struct req_exec_amf_componentregister *req_exec_amf_componentregister = (struct req_exec_amf_componentregister *)message; struct res_lib_amf_componentregister res_lib_amf_componentregister; @@ -1590,7 +1590,7 @@ static int message_handler_req_exec_amf_componentregister (int fd, void *message return (0); } -static int message_handler_req_exec_amf_componentunregister (int fd, void *message) +static int message_handler_req_exec_amf_componentunregister (void *message) { struct req_exec_amf_componentunregister *req_exec_amf_componentunregister = (struct req_exec_amf_componentunregister *)message; struct res_lib_amf_componentunregister res_lib_amf_componentunregister; @@ -1659,7 +1659,7 @@ static int message_handler_req_exec_amf_componentunregister (int fd, void *messa return (0); } -static int message_handler_req_exec_amf_errorreport (int fd, void *message) +static int message_handler_req_exec_amf_errorreport (void *message) { struct req_exec_amf_errorreport *req_exec_amf_errorreport = (struct req_exec_amf_errorreport *)message; struct res_lib_amf_errorreport res_lib_amf_errorreport; @@ -1701,7 +1701,7 @@ static int message_handler_req_exec_amf_errorreport (int fd, void *message) return (0); } -static int message_handler_req_exec_amf_errorcancelall (int fd, void *message) +static int message_handler_req_exec_amf_errorcancelall (void *message) { struct req_exec_amf_errorcancelall *req_exec_amf_errorcancelall = (struct req_exec_amf_errorcancelall *)message; struct res_lib_amf_errorcancelall res_lib_amf_errorcancelall; @@ -1751,7 +1751,7 @@ static int message_handler_req_exec_amf_errorcancelall (int fd, void *message) * node. That cluster node API has verified the readiness state, so its time to let * the rest of the cluster nodes know about the readiness state change. */ -static int message_handler_req_exec_amf_readinessstateset (int fd, void *message) +static int message_handler_req_exec_amf_readinessstateset (void *message) { struct req_exec_amf_readinessstateset *req_exec_amf_readinessstateset = (struct req_exec_amf_readinessstateset *)message; struct saAmfComponent *component; @@ -1775,7 +1775,7 @@ static int message_handler_req_exec_amf_readinessstateset (int fd, void *message * node. That cluster node API has verified the ha state, so its time to let * the rest of the cluster nodes know about the HA state change. */ -static int message_handler_req_exec_amf_hastateset (int fd, void *message) +static int message_handler_req_exec_amf_hastateset (void *message) { struct req_exec_amf_hastateset *req_exec_amf_hastateset = (struct req_exec_amf_hastateset *)message; struct saAmfComponent *component; diff --git a/exec/ckpt.c b/exec/ckpt.c index dce87639..4e7063ba 100644 --- a/exec/ckpt.c +++ b/exec/ckpt.c @@ -66,25 +66,25 @@ static int ckptSectionIteratorApiFinalize (int fd); static int message_handler_req_lib_activatepoll (int fd, void *message); -static int message_handler_req_exec_ckpt_checkpointopen (int fd, void *message); +static int message_handler_req_exec_ckpt_checkpointopen (void *message); -static int message_handler_req_exec_ckpt_checkpointclose (int fd, void *message); +static int message_handler_req_exec_ckpt_checkpointclose (void *message); -static int message_handler_req_exec_ckpt_checkpointunlink (int fd, void *message); +static int message_handler_req_exec_ckpt_checkpointunlink (void *message); -static int message_handler_req_exec_ckpt_checkpointretentiondurationset (int fd, void *message); +static int message_handler_req_exec_ckpt_checkpointretentiondurationset (void *message); -static int message_handler_req_exec_ckpt_sectioncreate (int fd, void *message); +static int message_handler_req_exec_ckpt_sectioncreate (void *message); -static int message_handler_req_exec_ckpt_sectiondelete (int fd, void *message); +static int message_handler_req_exec_ckpt_sectiondelete (void *message); -static int message_handler_req_exec_ckpt_sectionexpirationtimeset (int fd, void *message); +static int message_handler_req_exec_ckpt_sectionexpirationtimeset (void *message); -static int message_handler_req_exec_ckpt_sectionwrite (int fd, void *message); +static int message_handler_req_exec_ckpt_sectionwrite (void *message); -static int message_handler_req_exec_ckpt_sectionoverwrite (int fd, void *message); +static int message_handler_req_exec_ckpt_sectionoverwrite (void *message); -static int message_handler_req_exec_ckpt_sectionread (int fd, void *message); +static int message_handler_req_exec_ckpt_sectionread (void *message); static int message_handler_req_lib_ckpt_init (int fd, void *message); @@ -138,7 +138,7 @@ int (*ckpt_libais_handler_fns[]) (int fd, void *) = { /* * TODO */ -int (*ckpt_aisexec_handler_fns[]) (int fd, void *) = { +int (*ckpt_aisexec_handler_fns[]) (void *) = { }; /* @@ -173,7 +173,7 @@ static int (*ckpt_checkpoint_libais_handler_fns[]) (int fd, void *) = { message_handler_req_lib_ckpt_checkpointsyncronizeasync }; -static int (*ckpt_checkpoint_aisexec_handler_fns[]) (int fd, void *) = { +static int (*ckpt_checkpoint_aisexec_handler_fns[]) (void *msg) = { message_handler_req_exec_ckpt_checkpointopen, message_handler_req_exec_ckpt_checkpointclose, message_handler_req_exec_ckpt_checkpointunlink, @@ -203,7 +203,7 @@ static int (*ckpt_sectioniterator_libais_handler_fns[]) (int fd, void *) = { message_handler_req_lib_ckpt_sectioniteratornext }; -static int (*ckpt_sectioniterator_aisexec_handler_fns[]) (int fd, void *) = { +static int (*ckpt_sectioniterator_aisexec_handler_fns[]) (void *msg) = { }; struct service_handler ckpt_sectioniterator_service_handler = { @@ -328,7 +328,7 @@ static int message_handler_req_lib_activatepoll (int fd, void *message) return (0); } -static int message_handler_req_exec_ckpt_checkpointopen (int fd, void *message) +static int message_handler_req_exec_ckpt_checkpointopen (void *message) { struct req_exec_ckpt_checkpointopen *req_exec_ckpt_checkpointopen = (struct req_exec_ckpt_checkpointopen *)message; struct req_lib_ckpt_checkpointopen *req_lib_ckpt_checkpointopen = (struct req_lib_ckpt_checkpointopen *)&req_exec_ckpt_checkpointopen->req_lib_ckpt_checkpointopen; @@ -401,7 +401,7 @@ static int message_handler_req_exec_ckpt_checkpointopen (int fd, void *message) /* * Setup connection information and mark checkpoint as referenced */ - log_printf (LOG_LEVEL_DEBUG, "CHECKPOINT opened fd %d is %p\n", fd, ckptCheckpoint); + log_printf (LOG_LEVEL_DEBUG, "CHECKPOINT opened is %p\n", ckptCheckpoint); ckptCheckpoint->referenceCount += 1; /* @@ -427,7 +427,7 @@ error_exit: return (0); } -extern int message_handler_req_exec_ckpt_checkpointclose (int fd, void *message) +extern int message_handler_req_exec_ckpt_checkpointclose (void *message) { struct req_exec_ckpt_checkpointclose *req_exec_ckpt_checkpointclose = (struct req_exec_ckpt_checkpointclose *)message; struct saCkptCheckpoint *checkpoint = 0; @@ -459,7 +459,7 @@ extern int message_handler_req_exec_ckpt_checkpointclose (int fd, void *message) return (0); } -static int message_handler_req_exec_ckpt_checkpointunlink (int fd, void *message) +static int message_handler_req_exec_ckpt_checkpointunlink (void *message) { struct req_exec_ckpt_checkpointunlink *req_exec_ckpt_checkpointunlink = (struct req_exec_ckpt_checkpointunlink *)message; @@ -503,7 +503,7 @@ error_exit: return (0); } -static int message_handler_req_exec_ckpt_checkpointretentiondurationset (int fd, void *message) +static int message_handler_req_exec_ckpt_checkpointretentiondurationset (void *message) { struct req_exec_ckpt_checkpointretentiondurationset *req_exec_ckpt_checkpointretentiondurationset = (struct req_exec_ckpt_checkpointretentiondurationset *)message; struct saCkptCheckpoint *checkpoint; @@ -519,7 +519,7 @@ static int message_handler_req_exec_ckpt_checkpointretentiondurationset (int fd, return (0); } -static int message_handler_req_exec_ckpt_sectioncreate (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectioncreate (void *message) { struct req_exec_ckpt_sectioncreate *req_exec_ckpt_sectioncreate = (struct req_exec_ckpt_sectioncreate *)message; struct req_lib_ckpt_sectioncreate *req_lib_ckpt_sectioncreate = (struct req_lib_ckpt_sectioncreate *)&req_exec_ckpt_sectioncreate->req_lib_ckpt_sectioncreate; struct res_lib_ckpt_sectioncreate res_lib_ckpt_sectioncreate; @@ -618,7 +618,7 @@ error_exit: return (0); } -static int message_handler_req_exec_ckpt_sectiondelete (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectiondelete (void *message) { struct req_exec_ckpt_sectiondelete *req_exec_ckpt_sectiondelete = (struct req_exec_ckpt_sectiondelete *)message; struct req_lib_ckpt_sectiondelete *req_lib_ckpt_sectiondelete = (struct req_lib_ckpt_sectiondelete *)&req_exec_ckpt_sectiondelete->req_lib_ckpt_sectiondelete; struct res_lib_ckpt_sectiondelete res_lib_ckpt_sectiondelete; @@ -677,7 +677,7 @@ error_exit: return (0); } -static int message_handler_req_exec_ckpt_sectionexpirationtimeset (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectionexpirationtimeset (void *message) { struct req_exec_ckpt_sectionexpirationtimeset *req_exec_ckpt_sectionexpirationtimeset = (struct req_exec_ckpt_sectionexpirationtimeset *)message; struct req_lib_ckpt_sectionexpirationtimeset *req_lib_ckpt_sectionexpirationtimeset = (struct req_lib_ckpt_sectionexpirationtimeset *)&req_exec_ckpt_sectionexpirationtimeset->req_lib_ckpt_sectionexpirationtimeset; struct res_lib_ckpt_sectionexpirationtimeset res_lib_ckpt_sectionexpirationtimeset; @@ -730,7 +730,7 @@ error_exit: } int exec_section_write = 0; -static int message_handler_req_exec_ckpt_sectionwrite (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectionwrite (void *message) { struct req_exec_ckpt_sectionwrite *req_exec_ckpt_sectionwrite = (struct req_exec_ckpt_sectionwrite *)message; struct req_lib_ckpt_sectionwrite *req_lib_ckpt_sectionwrite = (struct req_lib_ckpt_sectionwrite *)&req_exec_ckpt_sectionwrite->req_lib_ckpt_sectionwrite; struct res_lib_ckpt_sectionwrite res_lib_ckpt_sectionwrite; @@ -812,7 +812,7 @@ error_exit: return (0); } -static int message_handler_req_exec_ckpt_sectionoverwrite (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectionoverwrite (void *message) { struct req_exec_ckpt_sectionoverwrite *req_exec_ckpt_sectionoverwrite = (struct req_exec_ckpt_sectionoverwrite *)message; struct req_lib_ckpt_sectionoverwrite *req_lib_ckpt_sectionoverwrite = (struct req_lib_ckpt_sectionoverwrite *)&req_exec_ckpt_sectionoverwrite->req_lib_ckpt_sectionoverwrite; struct res_lib_ckpt_sectionoverwrite res_lib_ckpt_sectionoverwrite; @@ -884,7 +884,7 @@ error_exit: } return (0); } -static int message_handler_req_exec_ckpt_sectionread (int fd, void *message) { +static int message_handler_req_exec_ckpt_sectionread (void *message) { struct req_exec_ckpt_sectionread *req_exec_ckpt_sectionread = (struct req_exec_ckpt_sectionread *)message; struct req_lib_ckpt_sectionread *req_lib_ckpt_sectionread = (struct req_lib_ckpt_sectionread *)&req_exec_ckpt_sectionread->req_lib_ckpt_sectionread; struct res_lib_ckpt_sectionread res_lib_ckpt_sectionread; diff --git a/exec/clm.c b/exec/clm.c index ec250a22..4fc7d29f 100644 --- a/exec/clm.c +++ b/exec/clm.c @@ -83,7 +83,7 @@ static int clmConfChg ( struct sockaddr_in *left_list, int left_list_entries, struct sockaddr_in *joined_list, int joined_list_entries); -static int message_handler_req_exec_clm_nodejoin (int fd, void *message); +static int message_handler_req_exec_clm_nodejoin (void *message); static int message_handler_req_clm_init (int fd, void *message); @@ -102,7 +102,7 @@ static int (*clm_libais_handler_fns[]) (int fd, void *) = { message_handler_req_clm_nodeget }; -static int (*clm_aisexec_handler_fns[]) (int fd, void *) = { +static int (*clm_aisexec_handler_fns[]) (void *) = { message_handler_req_exec_clm_nodejoin }; @@ -358,7 +358,7 @@ static int clmConfChg ( return (0); } -static int message_handler_req_exec_clm_nodejoin (int fd, void *message) +static int message_handler_req_exec_clm_nodejoin (void *message) { struct req_exec_clm_nodejoin *req_exec_clm_nodejoin = (struct req_exec_clm_nodejoin *)message; int found; diff --git a/exec/main.c b/exec/main.c index e0abf839..07d26980 100644 --- a/exec/main.c +++ b/exec/main.c @@ -297,7 +297,8 @@ retry_accept: close (new_fd); return (0); /* This is an error, but -1 would indicate disconnect from poll */ } - poll_dispatch_add (aisexec_poll_handle, new_fd, POLLIN, 0, poll_handler_libais_deliver); + poll_dispatch_add (aisexec_poll_handle, new_fd, POLLIN, 0, + poll_handler_libais_deliver); connections[new_fd].service = SOCKET_SERVICE_INIT; memcpy (&connections[new_fd].ais_ci.un_addr, &un_addr, sizeof (struct sockaddr_un)); @@ -465,7 +466,7 @@ static int pool_sizes[] = { 0, 0, 0, 0, 0, 4096, 0, 1, 0, /* 256 */ 1024, 0, 1, 4096, 0, 0, 0, 0, /* 65536 */ 1, 1, 1, 1, 1, 1, 1, 1, 1 }; -static int (*aisexec_handler_fns[AIS_SERVICE_HANDLER_AISEXEC_FUNCTIONS_MAX]) (int fd, void *); +static int (*aisexec_handler_fns[AIS_SERVICE_HANDLER_AISEXEC_FUNCTIONS_MAX]) (void *msg); static int aisexec_handler_fns_count = 0; /* @@ -511,7 +512,7 @@ static void deliver_fn ( } else { header = iovec[0].iov_base; } - res = aisexec_handler_fns[header->id](0, header); + res = aisexec_handler_fns[header->id](header); } static void confchg_fn (