From 8b57b889bb521e405ec70e7a9cabf564d361b4b5 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Fri, 16 Dec 2016 10:45:48 +0100 Subject: [PATCH] async: formatted code with clang-formant --- src/modules/async/async_mod.c | 130 +++++++++++++++----------------- src/modules/async/async_sleep.c | 93 ++++++++++------------- src/modules/async/async_sleep.h | 6 +- 3 files changed, 104 insertions(+), 125 deletions(-) diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 281b3e10543..c7817530423 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -41,21 +41,21 @@ MODULE_VERSION static int async_workers = 1; -static int mod_init(void); -static int child_init(int); +static int mod_init(void); +static int child_init(int); static void mod_destroy(void); -static int w_async_sleep(sip_msg_t* msg, char* sec, char* str2); -static int fixup_async_sleep(void** param, int param_no); -static int w_async_route(sip_msg_t* msg, char* rt, char* sec); -static int fixup_async_route(void** param, int param_no); -static int w_async_task_route(sip_msg_t* msg, char* rt, char* p2); -static int fixup_async_task_route(void** param, int param_no); +static int w_async_sleep(sip_msg_t *msg, char *sec, char *str2); +static int fixup_async_sleep(void **param, int param_no); +static int w_async_route(sip_msg_t *msg, char *rt, char *sec); +static int fixup_async_route(void **param, int param_no); +static int w_async_task_route(sip_msg_t *msg, char *rt, char *p2); +static int fixup_async_task_route(void **param, int param_no); /* tm */ struct tm_binds tmb; - +/* clang-format off */ static cmd_export_t cmds[]={ {"async_route", (cmd_function)w_async_route, 2, fixup_async_route, 0, REQUEST_ROUTE|FAILURE_ROUTE}, @@ -85,7 +85,7 @@ struct module_exports exports = { mod_destroy, /* destroy function */ child_init /* per child init function */ }; - +/* clang-format on */ /** @@ -93,15 +93,15 @@ struct module_exports exports = { */ static int mod_init(void) { - if (load_tm_api( &tmb ) == -1) { + if(load_tm_api(&tmb) == -1) { LM_ERR("cannot load the TM-functions. Missing TM module?\n"); return -1; } - if(async_workers<=0) + if(async_workers <= 0) return 0; - if(async_init_timer_list()<0) { + if(async_init_timer_list() < 0) { LM_ERR("cannot initialize internal structure\n"); return -1; } @@ -118,15 +118,16 @@ static int child_init(int rank) { int i; - if (rank!=PROC_MAIN) + if(rank != PROC_MAIN) return 0; - if(async_workers<=0) + if(async_workers <= 0) return 0; - for(i=0; ipinterval, &s)!=0) - { + ap = (async_param_t *)sec; + if(fixup_get_ivalue(msg, ap->pinterval, &s) != 0) { LM_ERR("no async sleep time value\n"); return -1; } - if(ap->type==0) - { - if(ap->u.paction==NULL || ap->u.paction->next==NULL) - { + if(ap->type == 0) { + if(ap->u.paction == NULL || ap->u.paction->next == NULL) { LM_ERR("cannot be executed as last action in a route block\n"); return -1; } - if(async_sleep(msg, s, ap->u.paction->next)<0) + if(async_sleep(msg, s, ap->u.paction->next) < 0) return -1; /* force exit in config */ return 0; @@ -185,23 +182,22 @@ static int w_async_sleep(sip_msg_t* msg, char* sec, char* str2) /** * */ -static int fixup_async_sleep(void** param, int param_no) +static int fixup_async_sleep(void **param, int param_no) { async_param_t *ap; - if(param_no!=1) + if(param_no != 1) return 0; - ap = (async_param_t*)pkg_malloc(sizeof(async_param_t)); - if(ap==NULL) - { + ap = (async_param_t *)pkg_malloc(sizeof(async_param_t)); + if(ap == NULL) { LM_ERR("no more pkg memory available\n"); return -1; } memset(ap, 0, sizeof(async_param_t)); ap->u.paction = get_action_from_param(param, param_no); - if(fixup_igp_null(param, param_no)<0) + if(fixup_igp_null(param, param_no) < 0) return -1; - ap->pinterval = (gparam_t*)(*param); - *param = (void*)ap; + ap->pinterval = (gparam_t *)(*param); + *param = (void *)ap; return 0; } @@ -214,19 +210,17 @@ int ki_async_route(sip_msg_t *msg, str *rn, int s) int ri; ri = route_get(&main_rt, rn->s); - if(ri<0) - { + if(ri < 0) { LM_ERR("unable to find route block [%.*s]\n", rn->len, rn->s); return -1; } act = main_rt.rlist[ri]; - if(act==NULL) - { + if(act == NULL) { LM_ERR("empty action lists in route block [%.*s]\n", rn->len, rn->s); return -1; } - if(async_sleep(msg, s, act)<0) + if(async_sleep(msg, s, act) < 0) return -1; /* force exit in config */ return 0; @@ -235,28 +229,25 @@ int ki_async_route(sip_msg_t *msg, str *rn, int s) /** * */ -static int w_async_route(sip_msg_t* msg, char* rt, char* sec) +static int w_async_route(sip_msg_t *msg, char *rt, char *sec) { int s; str rn; - if(msg==NULL) + if(msg == NULL) return -1; - if(async_workers<=0) - { + if(async_workers <= 0) { LM_ERR("no async mod timer workers\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)rt, &rn)!=0) - { + if(fixup_get_svalue(msg, (gparam_t *)rt, &rn) != 0) { LM_ERR("no async route block name\n"); return -1; } - if(fixup_get_ivalue(msg, (gparam_t*)sec, &s)!=0) - { + if(fixup_get_ivalue(msg, (gparam_t *)sec, &s) != 0) { LM_ERR("no async interval value\n"); return -1; } @@ -266,15 +257,14 @@ static int w_async_route(sip_msg_t* msg, char* rt, char* sec) /** * */ -static int fixup_async_route(void** param, int param_no) +static int fixup_async_route(void **param, int param_no) { - if(param_no==1) - { - if(fixup_spve_null(param, 1)<0) + if(param_no == 1) { + if(fixup_spve_null(param, 1) < 0) return -1; return 0; - } else if(param_no==2) { - if(fixup_igp_null(param, 1)<0) + } else if(param_no == 2) { + if(fixup_igp_null(param, 1) < 0) return -1; } return 0; @@ -283,25 +273,23 @@ static int fixup_async_route(void** param, int param_no) /** * */ -int ki_async_task_route(sip_msg_t* msg, str* rn) +int ki_async_task_route(sip_msg_t *msg, str *rn) { cfg_action_t *act; int ri; ri = route_get(&main_rt, rn->s); - if(ri<0) - { + if(ri < 0) { LM_ERR("unable to find route block [%.*s]\n", rn->len, rn->s); return -1; } act = main_rt.rlist[ri]; - if(act==NULL) - { + if(act == NULL) { LM_ERR("empty action lists in route block [%.*s]\n", rn->len, rn->s); return -1; } - if(async_send_task(msg, act)<0) + if(async_send_task(msg, act) < 0) return -1; /* force exit in config */ return 0; @@ -310,15 +298,14 @@ int ki_async_task_route(sip_msg_t* msg, str* rn) /** * */ -static int w_async_task_route(sip_msg_t* msg, char* rt, char* sec) +static int w_async_task_route(sip_msg_t *msg, char *rt, char *sec) { str rn; - if(msg==NULL) + if(msg == NULL) return -1; - if(fixup_get_svalue(msg, (gparam_t*)rt, &rn)!=0) - { + if(fixup_get_svalue(msg, (gparam_t *)rt, &rn) != 0) { LM_ERR("no async route block name\n"); return -1; } @@ -328,17 +315,16 @@ static int w_async_task_route(sip_msg_t* msg, char* rt, char* sec) /** * */ -static int fixup_async_task_route(void** param, int param_no) +static int fixup_async_task_route(void **param, int param_no) { if(!async_task_initialized()) { LM_ERR("async task framework was not initialized" - " - set async_workers parameter in core\n"); + " - set async_workers parameter in core\n"); return -1; } - if(param_no==1) - { - if(fixup_spve_null(param, 1)<0) + if(param_no == 1) { + if(fixup_spve_null(param, 1) < 0) return -1; return 0; } @@ -348,6 +334,7 @@ static int fixup_async_task_route(void** param, int param_no) /** * */ +/* clang-format off */ static sr_kemi_t sr_kemi_async_exports[] = { { str_init("async"), str_init("route"), SR_KEMIP_INT, ki_async_route, @@ -362,6 +349,7 @@ static sr_kemi_t sr_kemi_async_exports[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; +/* clang-format on */ /** * diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index b029b94d9d7..64ce6516571 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -37,6 +37,7 @@ /* tm */ extern struct tm_binds tmb; +/* clang-format off */ typedef struct async_item { unsigned int tindex; unsigned int tlabel; @@ -57,26 +58,26 @@ static struct async_list_head { async_slot_t ring[ASYNC_RING_SIZE]; async_slot_t *later; } *_async_list_head = NULL; +/* clang-format on */ +/** + * + */ int async_init_timer_list(void) { int i; - _async_list_head = (struct async_list_head*) - shm_malloc(sizeof(struct async_list_head)); - if(_async_list_head==NULL) - { + _async_list_head = (struct async_list_head *)shm_malloc( + sizeof(struct async_list_head)); + if(_async_list_head == NULL) { LM_ERR("no more shm\n"); return -1; } memset(_async_list_head, 0, sizeof(struct async_list_head)); - for(i=0; iring[i].lock)==0) - { + for(i = 0; i < ASYNC_RING_SIZE; i++) { + if(lock_init(&_async_list_head->ring[i].lock) == 0) { LM_ERR("cannot init lock at %d\n", i); i--; - while(i>=0) - { + while(i >= 0) { lock_destroy(&_async_list_head->ring[i].lock); i--; } @@ -92,10 +93,9 @@ int async_init_timer_list(void) int async_destroy_timer_list(void) { int i; - if(_async_list_head==NULL) + if(_async_list_head == NULL) return 0; - for(i=0; iring[i].lock); } @@ -104,33 +104,29 @@ int async_destroy_timer_list(void) return 0; } -int async_sleep(struct sip_msg* msg, int seconds, cfg_action_t *act) +int async_sleep(struct sip_msg *msg, int seconds, cfg_action_t *act) { int slot; unsigned int ticks; async_item_t *ai; tm_cell_t *t = 0; - if(seconds<=0) { + if(seconds <= 0) { LM_ERR("negative or zero sleep time (%d)\n", seconds); return -1; } - if(seconds>=ASYNC_RING_SIZE) - { + if(seconds >= ASYNC_RING_SIZE) { LM_ERR("max sleep time is %d sec (%d)\n", ASYNC_RING_SIZE, seconds); return -1; } t = tmb.t_gett(); - if (t==NULL || t==T_UNDEFINED) - { - if(tmb.t_newtran(msg)<0) - { + if(t == NULL || t == T_UNDEFINED) { + if(tmb.t_newtran(msg) < 0) { LM_ERR("cannot create the transaction\n"); return -1; } t = tmb.t_gett(); - if (t==NULL || t==T_UNDEFINED) - { + if(t == NULL || t == T_UNDEFINED) { LM_ERR("cannot lookup the transaction\n"); return -1; } @@ -138,17 +134,15 @@ int async_sleep(struct sip_msg* msg, int seconds, cfg_action_t *act) ticks = seconds + get_ticks(); slot = ticks % ASYNC_RING_SIZE; - ai = (async_item_t*)shm_malloc(sizeof(async_item_t)); - if(ai==NULL) - { + ai = (async_item_t *)shm_malloc(sizeof(async_item_t)); + if(ai == NULL) { LM_ERR("no more shm memory\n"); return -1; } memset(ai, 0, sizeof(async_item_t)); ai->ticks = ticks; ai->act = act; - if(tmb.t_suspend(msg, &ai->tindex, &ai->tlabel)<0) - { + if(tmb.t_suspend(msg, &ai->tindex, &ai->tlabel) < 0) { LM_ERR("failed to suspend the processing\n"); shm_free(ai); return -1; @@ -166,7 +160,7 @@ void async_timer_exec(unsigned int ticks, void *param) int slot; async_item_t *ai; - if(_async_list_head==NULL) + if(_async_list_head == NULL) return; slot = ticks % ASYNC_RING_SIZE; @@ -174,13 +168,13 @@ void async_timer_exec(unsigned int ticks, void *param) while(1) { lock_get(&_async_list_head->ring[slot].lock); ai = _async_list_head->ring[slot].lstart; - if(ai!=NULL) + if(ai != NULL) _async_list_head->ring[slot].lstart = ai->next; lock_release(&_async_list_head->ring[slot].lock); - if(ai==NULL) + if(ai == NULL) break; - if(ai->act!=NULL) + if(ai->act != NULL) tmb.t_continue(ai->tindex, ai->tlabel, ai->act); shm_free(ai); } @@ -197,12 +191,12 @@ void async_exec_task(void *param) unsigned int tindex; unsigned int tlabel; - act = *((cfg_action_t**)param); - p = (unsigned int*)((char*)param + sizeof(cfg_action_t*)); + act = *((cfg_action_t **)param); + p = (unsigned int *)((char *)param + sizeof(cfg_action_t *)); tindex = p[0]; tlabel = p[1]; - if(act!=NULL) + if(act != NULL) tmb.t_continue(tindex, tlabel, act); /* param is freed along with the async task strucutre in core */ } @@ -210,7 +204,7 @@ void async_exec_task(void *param) /** * */ -int async_send_task(sip_msg_t* msg, cfg_action_t *act) +int async_send_task(sip_msg_t *msg, cfg_action_t *act) { async_task_t *at; tm_cell_t *t = 0; @@ -220,39 +214,34 @@ int async_send_task(sip_msg_t* msg, cfg_action_t *act) unsigned int *p; t = tmb.t_gett(); - if (t==NULL || t==T_UNDEFINED) - { - if(tmb.t_newtran(msg)<0) - { + if(t == NULL || t == T_UNDEFINED) { + if(tmb.t_newtran(msg) < 0) { LM_ERR("cannot create the transaction\n"); return -1; } t = tmb.t_gett(); - if (t==NULL || t==T_UNDEFINED) - { + if(t == NULL || t == T_UNDEFINED) { LM_ERR("cannot lookup the transaction\n"); return -1; } } - dsize = sizeof(async_task_t) + sizeof(cfg_action_t*) - + 2*sizeof(unsigned int); - at = (async_task_t*)shm_malloc(dsize); - if(at==NULL) - { + dsize = sizeof(async_task_t) + sizeof(cfg_action_t *) + + 2 * sizeof(unsigned int); + at = (async_task_t *)shm_malloc(dsize); + if(at == NULL) { LM_ERR("no more shm memory\n"); return -1; } memset(at, 0, dsize); - if(tmb.t_suspend(msg, &tindex, &tlabel)<0) - { + if(tmb.t_suspend(msg, &tindex, &tlabel) < 0) { LM_ERR("failed to suspend the processing\n"); shm_free(at); return -1; } at->exec = async_exec_task; - at->param = (char*)at + sizeof(async_task_t); - *((cfg_action_t**)at->param) = act; - p = (unsigned int*)((char*)at->param + sizeof(cfg_action_t*)); + at->param = (char *)at + sizeof(async_task_t); + *((cfg_action_t **)at->param) = act; + p = (unsigned int *)((char *)at->param + sizeof(cfg_action_t *)); p[0] = tindex; p[1] = tlabel; async_task_push(at); diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 6257a4c6f54..dbde646a085 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -27,6 +27,7 @@ #include "../../core/route_struct.h" #include "../../core/mod_fix.h" +/* clang-format off */ typedef struct async_param { int type; gparam_t *pinterval; @@ -35,15 +36,16 @@ typedef struct async_param { gparam_t *proute; } u; } async_param_t; +/* clang-format on */ int async_init_timer_list(void); int async_destroy_timer_list(void); -int async_sleep(sip_msg_t* msg, int seconds, cfg_action_t *act); +int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act); void async_timer_exec(unsigned int ticks, void *param); -int async_send_task(sip_msg_t* msg, cfg_action_t *act); +int async_send_task(sip_msg_t *msg, cfg_action_t *act); #endif