sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:tirpi/cfg_framework_multivalue: cfg framework: group instances can be deleted + bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 8e1d174cc6ddcbdb573e2f6435ed2086d5b1c5ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e1d174… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 9 16:21:41 2010 +0200 cfg framework: group instances can be deleted + bugfix - cfg_del_group_inst() is added which can be used to delete the group instances apart from the default one. - cfg_find_group_inst() used a wrong offset for shifting. - The copies of the default variable needs to be updated even if the variable is atomic. --- cfg/cfg_ctx.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++---- cfg/cfg_ctx.h | 3 + cfg/cfg_struct.c | 43 +++++++++++++++++++++- cfg/cfg_struct.h | 7 +++ 4 files changed, 151 insertions(+), 10 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index b0fa851..3ecc69e 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -274,10 +274,11 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, int i, clone_done=0; cfg_group_inst_t *array, *ginst; - array = meta->array; + if (!(array = meta->array)) + return 0; for (i = 0; i < meta->num; i++) { ginst = (cfg_group_inst_t *)((char *)array - + (sizeof(cfg_group_meta_t) + group->size - 1) * i); + + (sizeof(cfg_group_inst_t) + group->size - 1) * i); if (!CFG_VAR_TEST(ginst, var)) { /* The variable uses the default value, it needs to be rewritten. */ @@ -514,15 +515,15 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va it cannot be freed */ if (cfg_shmized) { - if (!group_inst && block && CFG_GROUP_META(block, group)->array) { - if (cfg_update_defaults(CFG_GROUP_META(block, group), + if (!group_inst) { + /* the default value is changed, the copies of this value + need to be also updated */ + if (cfg_update_defaults(CFG_GROUP_META(block ? block : *cfg_global, group), group, var, p, - ((var->def->type & CFG_ATOMIC) == 0)) /* clone if needed */ - ) { - LOG(L_ERR, "ERROR: cfg_set_now(): not enough shm memory\n"); + block ? 1 : 0) /* clone if needed */ + ) goto error; - } - if (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array) + if (block && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array)) new_array = CFG_GROUP_META(block, group)->array; } @@ -1338,3 +1339,92 @@ error: return -1; } + +/* Delete an instance of a group */ +int cfg_del_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) +{ + cfg_group_t *group; + cfg_block_t *block = NULL; + void **replaced = NULL; + cfg_group_inst_t *new_array = NULL, *group_inst; + + /* verify the context even if we do not need it now + to make sure that a cfg driver has called the function + (very very weak security) */ + if (!ctx) { + LOG(L_ERR, "ERROR: cfg_del_group_inst(): context is undefined\n"); + return -1; + } + + if (!cfg_shmized) { + /* It makes no sense to delete a group instance that has not + been created yet */ + return -1; + } + + if (!(group = cfg_lookup_group(group_name->s, group_name->len))) { + LOG(L_ERR, "ERROR: cfg_del_group_inst(): group not found\n"); + return -1; + } + + /* make sure that nobody else replaces the global config + while the new one is prepared */ + CFG_WRITER_LOCK(); + if (!(group_inst = cfg_find_group(CFG_GROUP_META(*cfg_global, group), + group->size, + group_id)) + ) { + LOG(L_DBG, "DEBUG: cfg_del_group_inst(): the group instance does not exist\n"); + goto error; + } + + /* clone the global memory block because the additional array can be + replaced only together with the block. */ + if (!(block = cfg_clone_global())) + goto error; + + /* Remove the group instance from the array. */ + if (cfg_collapse_array(CFG_GROUP_META(*cfg_global, group), group, + group_inst, + &new_array) + ) + goto error; + + CFG_GROUP_META(block, group)->array = new_array; + CFG_GROUP_META(block, group)->num--; + + if (CFG_GROUP_META(*cfg_global, group)->array) { + /* prepare the array of the replaced strings, + and replaced group instances, + they will be freed when the old block is freed */ + replaced = (void **)shm_malloc(sizeof(void *) * 2); + if (!replaced) { + LOG(L_ERR, "ERROR: cfg_del_group_inst(): not enough shm memory\n"); + goto error; + } + replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; + replaced[1] = NULL; + } + /* replace the global config with the new one */ + cfg_install_global(block, replaced, NULL, NULL); + CFG_WRITER_UNLOCK(); + + LOG(L_INFO, "INFO: cfg_del_group_inst(): " + "group instance is deleted: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return 0; +error: + CFG_WRITER_UNLOCK(); + if (block) cfg_block_free(block); + if (new_array) shm_free(new_array); + if (replaced) shm_free(replaced); + + LOG(L_ERR, "ERROR: cfg_add_group_inst(): " + "Failed to delete the group instance: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return -1; +} diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index 255911e..964e7f5 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -180,4 +180,7 @@ void cfg_diff_release(cfg_ctx_t *ctx); /* Add a new instance to an existing group */ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id); +/* Delete an instance of a group */ +int cfg_del_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id); + #endif /* _CFG_CTX_H */ diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 77d7cf5..9d5f008 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -645,6 +645,47 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, return new_array; } +/* Remove an instance from a group array. + * inst must point to an instance within meta->array. + * *_new_array is set to the newly allocated array. */ +int cfg_collapse_array(cfg_group_meta_t *meta, cfg_group_t *group, + cfg_group_inst_t *inst, + cfg_group_inst_t **_new_array) +{ + cfg_group_inst_t *new_array, *old_array; + int inst_size, offset; + + if (!meta->num) + return -1; + + if (meta->num == 1) { + *_new_array = NULL; + return 0; + } + + inst_size = sizeof(cfg_group_inst_t) + group->size - 1; + new_array = (cfg_group_inst_t *)shm_malloc(inst_size * (meta->num - 1)); + if (!new_array) { + LOG(L_ERR, "ERROR: cfg_collapse_array(): not enough shm memory\n"); + return -1; + } + + old_array = meta->array; + offset = (char *)inst - (char *)old_array; + if (offset) + memcpy( new_array, + old_array, + offset); + + if (meta->num * inst_size > offset + inst_size) + memcpy( (char *)new_array + offset, + (char *)old_array + offset + inst_size, + (meta->num - 1) * inst_size - offset); + + *_new_array = new_array; + return 0; +} + /* Find the group instance within the meta-data based on the group_id */ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigned int group_id) { @@ -658,7 +699,7 @@ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigne TODO: improve */ for (i = 0; i < meta->num; i++) { ginst = (cfg_group_inst_t *)((char *)meta->array - + (sizeof(cfg_group_meta_t) + group_size - 1) * i); + + (sizeof(cfg_group_inst_t) + group_size - 1) * i); if (ginst->id == group_id) return ginst; else if (ginst->id > group_id) diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 65519e2..5f1fa0a 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -381,6 +381,13 @@ cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, unsigned int group_id, cfg_group_inst_t **new_group); +/* Remove an instance from a group array. + * inst must point to an instance within meta->array. + * *_new_array is set to the newly allocated array. */ +int cfg_collapse_array(cfg_group_meta_t *meta, cfg_group_t *group, + cfg_group_inst_t *inst, + cfg_group_inst_t **_new_array); + /* clones a string to shared memory */ int cfg_clone_str(str *src, str *dst);

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: error messages added

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 99b680c32a92d5d528b7b4375ed8c2974221bc45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99b680c… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 14 15:49:25 2010 +0200 cfg framework: error messages added When a group instance is deleted while there are pending changes to this instance which are not yet committed, the commit failed without any error. An error message is added, and cfg_diff_next returns also error in this case to let the drivers farther propagate the error. --- cfg/cfg_ctx.c | 13 ++++++++++--- cfg/cfg_ctx.h | 13 +++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 9413d75..534cf49 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -1027,8 +1027,11 @@ int cfg_commit(cfg_ctx_t *ctx) group = changed->group; if (!(CFG_GROUP_META(block, group)->array = cfg_clone_array(CFG_GROUP_META(*cfg_global, group), group)) - ) + ) { + LOG(L_ERR, "ERROR: cfg_set_now(): group array cannot be cloned for %.*s[%u]\n", + group->name_len, group->name, changed->group_id); goto error; + } replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; replaced_num++; @@ -1318,6 +1321,10 @@ int cfg_diff_init(cfg_ctx_t *ctx, /* return the pending changes that have not been * committed yet + * return value: + * 1: valid value is found + * 0: no more changed value found + * -1: error occured */ int cfg_diff_next(void **h, str *gname, unsigned int **gid, str *vname, @@ -1348,7 +1355,7 @@ int cfg_diff_next(void **h, } else { if (!cfg_local) { LOG(L_ERR, "ERROR: cfg_diff_next(): Local configuration is missing\n"); - return 0; + return -1; } group_inst = cfg_find_group(CFG_GROUP_META(cfg_local, changed->group), changed->group->size, @@ -1356,7 +1363,7 @@ int cfg_diff_next(void **h, if (!group_inst) { LOG(L_ERR, "ERROR: cfg_diff_next(): local group instance %.*s[%u] is not found\n", changed->group->name_len, changed->group->name, changed->group_id); - return 0; + return -1; } pval = (union cfg_var_value*) (group_inst->vars + changed->var->offset); diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index 1bfd348..8a0836e 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -157,19 +157,28 @@ int cfg_diff_init(cfg_ctx_t *ctx, /*! \brief return the pending changes that have not been * committed yet + * return value: + * 1: valid value is found + * 0: no more changed value found + * -1: error occured + * * * can be used as follows: * * void *handle; * if (cfg_diff_init(ctx, &handle)) return -1 - * while (cfg_diff_next(&handle + * while ((err = cfg_diff_next(&handle * &group_name, &group_id, &var_name, * &old_val, &new_val - * &val_type) + * &val_type)) > 0 * ) { * ... * } * cfg_diff_release(ctx); + * if (err) { + * error occured, the changes cannot be retrieved + * ... + * } */ int cfg_diff_next(void **h, str *gname, unsigned int **gid, str *vname,

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: cfg_add_group_inst() added

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 28d46c65eaecd623a5e472522fc53564730fe2c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28d46c6… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 15:26:59 2010 +0200 cfg framework: cfg_add_group_inst() added The function can add a new group instance to an existing group. The values of the new instance are identical to the default values of the group. After the new group instance is added, the values can be changed by cfg_set_now(). --- cfg/cfg_ctx.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_struct.c | 49 +++++++++++++++++++++++++-- cfg/cfg_struct.h | 6 +++ 3 files changed, 146 insertions(+), 4 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index cc64a0d..1ca2ec9 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -593,6 +593,7 @@ error: if (block) cfg_block_free(block); if (new_array) shm_free(new_array); if (child_cb) cfg_child_cb_free(child_cb); + if (replaced) shm_free(replaced); error0: LOG(L_ERR, "ERROR: cfg_set_now(): failed to set the variable: %.*s.%.*s\n", @@ -1219,3 +1220,97 @@ void cfg_diff_release(cfg_ctx_t *ctx) CFG_CTX_UNLOCK(ctx); } + +/* Add a new instance to an existing group */ +int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) +{ + cfg_group_t *group; + cfg_block_t *block = NULL; + void **replaced = NULL; + cfg_group_inst_t *new_array = NULL, *new_inst; + + /* verify the context even if we do not need it now + to make sure that a cfg driver has called the function + (very very weak security) */ + if (!ctx) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): context is undefined\n"); + return -1; + } + + if (!cfg_shmized) { + /* TODO: Add a new fake variable belonging to + the additional group instance to the linked list. */ + return -1; + } + + if (!(group = cfg_lookup_group(group_name->s, group_name->len))) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): group not found\n"); + return -1; + } + + /* make sure that nobody else replaces the global config + while the new one is prepared */ + CFG_WRITER_LOCK(); + if (cfg_find_group(CFG_GROUP_META(*cfg_global, group), + group->size, + group_id) + ) { + LOG(L_DBG, "DEBUG: cfg_add_group_inst(): the group instance already exists\n"); + CFG_WRITER_UNLOCK(); + return 0; /* not an error */ + } + + /* clone the global memory block because the additional array can be + replaced only together with the block. */ + if (!(block = cfg_clone_global())) + goto error; + + /* Extend the array with a new group instance */ + if (!(new_array = cfg_extend_array(CFG_GROUP_META(*cfg_global, group), group, + group_id, + &new_inst)) + ) + goto error; + + /* fill in the new group instance with the default data */ + memcpy( new_inst->vars, + CFG_GROUP_DATA(*cfg_global, group), + sizeof(cfg_group_inst_t) + group->size - 1); + + CFG_GROUP_META(block, group)->array = new_array; + + if (CFG_GROUP_META(*cfg_global, group)->array) { + /* prepare the array of the replaced strings, + and replaced group instances, + they will be freed when the old block is freed */ + replaced = (void **)shm_malloc(sizeof(void *) * 2); + if (!replaced) { + LOG(L_ERR, "ERROR: cfg_add_group_inst(): not enough shm memory\n"); + goto error; + } + replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; + replaced[1] = NULL; + } + /* replace the global config with the new one */ + cfg_install_global(block, replaced, NULL, NULL); + CFG_WRITER_UNLOCK(); + + LOG(L_INFO, "INFO: cfg_add_group_inst(): " + "group instance is added: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return 0; +error: + CFG_WRITER_UNLOCK(); + if (block) cfg_block_free(block); + if (new_array) shm_free(new_array); + if (replaced) shm_free(replaced); + + LOG(L_ERR, "ERROR: cfg_add_group_inst(): " + "Failed to add the group instance: %.*s[%u]\n", + group_name->len, group_name->s, + group_id); + + return -1; +} diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 3e92080..77d7cf5 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -584,9 +584,7 @@ cfg_block_t *cfg_clone_global(void) return block; } -/* Clone an array of configuration group instances. - * WARNING: unsafe, cfg_writer_lock or cfg_global_lock must be held! - */ +/* Clone an array of configuration group instances. */ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group) { cfg_group_inst_t *new_array; @@ -606,6 +604,47 @@ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group) return new_array; } +/* Extend the array of configuration group instances with one more instance. + * Only the ID of the new group is set, nothing else. */ +cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, + unsigned int group_id, + cfg_group_inst_t **new_group) +{ + int i; + cfg_group_inst_t *new_array, *old_array; + int inst_size; + + inst_size = sizeof(cfg_group_inst_t) + group->size - 1; + new_array = (cfg_group_inst_t *)shm_malloc(inst_size * (meta->num + 1)); + if (!new_array) { + LOG(L_ERR, "ERROR: cfg_extend_array(): not enough shm memory\n"); + return NULL; + } + /* Find the position of the new group in the array. The array is ordered + by the group IDs. */ + old_array = meta->array; + for ( i = 0; + (i < meta->num) + && (((cfg_group_inst_t *)((char *)old_array + inst_size * i))->id < group_id); + i++ + ); + if (i > 0) + memcpy( new_array, + old_array, + inst_size * i); + + memset((char*)new_array + inst_size * i, 0, inst_size); + *new_group = (cfg_group_inst_t *)((char*)new_array + inst_size * i); + (*new_group)->id = group_id; + + if (i < meta->num) + memcpy( (char*)new_array + inst_size * (i + 1), + (char*)old_array + inst_size * i, + inst_size * (meta->num - i)); + + return new_array; +} + /* Find the group instance within the meta-data based on the group_id */ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigned int group_id) { @@ -615,13 +654,15 @@ cfg_group_inst_t *cfg_find_group(cfg_group_meta_t *meta, int group_size, unsigne if (!meta) return NULL; - /* For now, search lineray till the end of the array. + /* For now, search lineray. TODO: improve */ for (i = 0; i < meta->num; i++) { ginst = (cfg_group_inst_t *)((char *)meta->array + (sizeof(cfg_group_meta_t) + group_size - 1) * i); if (ginst->id == group_id) return ginst; + else if (ginst->id > group_id) + break; /* needless to continue, the array is ordered */ } return NULL; } diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 58cd810..65519e2 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -375,6 +375,12 @@ cfg_block_t *cfg_clone_global(void); /* Clone an array of configuration group instances. */ cfg_group_inst_t *cfg_clone_array(cfg_group_meta_t *meta, cfg_group_t *group); +/* Extend the array of configuration group instances with one more instance. + * Only the ID of the new group is set, nothing else. */ +cfg_group_inst_t *cfg_extend_array(cfg_group_meta_t *meta, cfg_group_t *group, + unsigned int group_id, + cfg_group_inst_t **new_group); + /* clones a string to shared memory */ int cfg_clone_str(str *src, str *dst);

14 years, 2 months

git:tirpi/cfg_framework_multivalue: modules_k/kex: updated to the cfg framework changes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 72c10ee1d2f8debdefea7ea5163c4ab530a45bb7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72c10ee… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 14 16:12:55 2010 +0200 modules_k/kex: updated to the cfg framework changes The debug value is set in the default "core" group. --- modules_k/kex/mi_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 36f5b93..b7c20af 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -328,7 +328,7 @@ static struct mi_root *mi_debug(struct mi_root *cmd, void *param) return init_mi_tree( 400, MI_SSTR(MI_BAD_PARM)); set = 1; } else { - if(cfg_get_by_name(_kex_cfg_ctx, &group_name, &var_name, &vval, + if(cfg_get_by_name(_kex_cfg_ctx, &group_name, NULL /* group id */, &var_name, &vval, &val_type)!=0) return init_mi_tree( 500, MI_SSTR(MI_INTERNAL_ERR)); new_debug = (int)(long)vval; @@ -346,7 +346,7 @@ static struct mi_root *mi_debug(struct mi_root *cmd, void *param) } if(set==1) { - cfg_set_now(_kex_cfg_ctx, &group_name, &var_name, + cfg_set_now(_kex_cfg_ctx, &group_name, NULL /* group id */, &var_name, (void *)(long)new_debug, CFG_VAR_INT); }

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance support in cfg_get_by_name() + bugfix

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 5d4d6ae9ed9848d92e10e746a8d870833b5c683d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d4d6ae… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 9 12:56:58 2010 +0200 cfg framework: group instance support in cfg_get_by_name() + bugfix - cfg_get_by_name() can return the value from both the default or from a specific group instance. - bugfix: cfg_add_group_inst() overwrote a larger memory area then the group size. - More verbose log messages when the group instance is not found. --- cfg/cfg_ctx.c | 36 ++++++++++++++++++++++++++++-------- cfg/cfg_ctx.h | 5 ++++- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 480fab5..b0fa851 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -387,7 +387,8 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group->size, *group_id); if (!group_inst) { - LOG(L_ERR, "ERROR: cfg_set_now(): local group instance is not found\n"); + LOG(L_ERR, "ERROR: cfg_set_now(): local group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); goto error0; } var_block = group_inst->vars; @@ -432,7 +433,8 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group->size, *group_id); if (!group_inst) { - LOG(L_ERR, "ERROR: cfg_set_now(): global group instance is not found\n"); + LOG(L_ERR, "ERROR: cfg_set_now(): global group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); goto error; } var_block = group_inst->vars; @@ -1038,7 +1040,7 @@ int cfg_rollback(cfg_ctx_t *ctx) * -1 - error * 1 - variable exists, but it is not readable */ -int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, +int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type) { cfg_group_t *group; @@ -1046,6 +1048,7 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, void *p; static str s; /* we need the value even after the function returns */ + cfg_group_inst_t *group_inst; /* verify the context even if we do not need it now to make sure that a cfg driver has called the function @@ -1066,10 +1069,27 @@ int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, return 1; } - /* use the module's handle to access the variable - It means that the variable is read from the local config - after forking */ - p = *(group->handle) + var->offset; + if (group_id) { + if (!cfg_local) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): Local configuration is missing\n"); + return -1; + } + group_inst = cfg_find_group(CFG_GROUP_META(cfg_local, group), + group->size, + *group_id); + if (!group_inst) { + LOG(L_ERR, "ERROR: cfg_get_by_name(): local group instance %.*s[%u] is not found\n", + group_name->len, group_name->s, *group_id); + return -1; + } + p = group_inst->vars + var->offset; + + } else { + /* use the module's handle to access the variable + It means that the variable is read from the local config + after forking */ + p = *(group->handle) + var->offset; + } switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -1278,7 +1298,7 @@ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) /* fill in the new group instance with the default data */ memcpy( new_inst->vars, CFG_GROUP_DATA(*cfg_global, group), - sizeof(cfg_group_inst_t) + group->size - 1); + group->size); CFG_GROUP_META(block, group)->array = new_array; CFG_GROUP_META(block, group)->num++; diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index 0e2299f..255911e 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -110,7 +110,7 @@ int cfg_commit(cfg_ctx_t *ctx); int cfg_rollback(cfg_ctx_t *ctx); /*! \brief returns the value of a variable */ -int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, str *var_name, +int cfg_get_by_name(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void **val, unsigned int *val_type); /*! \brief returns the description of a variable */ @@ -177,4 +177,7 @@ int cfg_diff_next(void **h, /*! \brief destroy the handle of cfg_diff_next() */ void cfg_diff_release(cfg_ctx_t *ctx); +/* Add a new instance to an existing group */ +int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id); + #endif /* _CFG_CTX_H */

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: group instance bug fixes

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 54d8259ea0bd7ab6a80a996d9cc1fcfa398fecf5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d8259… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Sep 9 09:55:04 2010 +0200 cfg framework: group instance bug fixes - Check whether the new config block is really created. - Increase the number if items within the array when a new instance is added --- cfg/cfg_ctx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 94f2d98..480fab5 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -512,7 +512,7 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va it cannot be freed */ if (cfg_shmized) { - if (!group_inst && CFG_GROUP_META(block, group)->array) { + if (!group_inst && block && CFG_GROUP_META(block, group)->array) { if (cfg_update_defaults(CFG_GROUP_META(block, group), group, var, p, ((var->def->type & CFG_ATOMIC) == 0)) /* clone if needed */ @@ -1281,6 +1281,7 @@ int cfg_add_group_inst(cfg_ctx_t *ctx, str *group_name, unsigned int group_id) sizeof(cfg_group_inst_t) + group->size - 1); CFG_GROUP_META(block, group)->array = new_array; + CFG_GROUP_META(block, group)->num++; if (CFG_GROUP_META(*cfg_global, group)->array) { /* prepare the array of the replaced strings,

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: unlock on error

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: a138e2b1aba2cea03310d1061e641736b452e7b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a138e2b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 17:32:48 2010 +0200 cfg framework: unlock on error release the global lock when the group instance is not found --- cfg/cfg_ctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index cbdd5a7..94f2d98 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -433,7 +433,7 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va *group_id); if (!group_inst) { LOG(L_ERR, "ERROR: cfg_set_now(): global group instance is not found\n"); - goto error0; + goto error; } var_block = group_inst->vars; } else {

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: log message added

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 1e3ac66d09b8cd0759b81187169ac2d3552eb2d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e3ac66… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Sep 8 16:58:18 2010 +0200 cfg framework: log message added cfg_set_now() prints out the id of the group which is modified. --- cfg/cfg_ctx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 1ca2ec9..cbdd5a7 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -584,6 +584,9 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va group_name->len, group_name->s, var_name->len, var_name->s, ((str *)val)->len, ((str *)val)->s); + if (group_id) + LOG(L_INFO, "INFO: cfg_set_now(): group id = %u\n", + *group_id); convert_val_cleanup(); return 0;

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: cfg_set_now() supports the group instances

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 6a44d0bd28c2cb896b9e53f7974d1bad88654c24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a44d0b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 7 17:09:07 2010 +0200 cfg framework: cfg_set_now() supports the group instances cfg_set_now() can write the variables within both the default and the additional group instances. If the additional variable is not explicitely set, then the default value overwrites it. Note: the group instance must exist before cfg_set_now() is called, it is not created dynamicaly. The function does not work yet before the config is shmized. --- cfg/cfg.c | 1 + cfg/cfg_ctx.c | 228 +++++++++++++++++++++++++++++++++++++++++++----------- cfg/cfg_ctx.h | 22 ++++-- cfg/cfg_script.c | 1 + cfg/cfg_script.h | 1 + cfg/cfg_struct.c | 48 +++++++++++- cfg/cfg_struct.h | 50 +++++++++++- 7 files changed, 293 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6a4…

14 years, 2 months

git:tirpi/cfg_framework_multivalue: cfg framework: free the memory of the old group instance

by Miklos Tirpak

Module: sip-router Branch: tirpi/cfg_framework_multivalue Commit: 27580846d9c01de2846601a9ef1bfac0210fecd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2758084… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 7 17:37:20 2010 +0200 cfg framework: free the memory of the old group instance The memory area of the old group instances is freed when the additional array is replaced. --- cfg/cfg_ctx.c | 27 +++++++++++++++++++-------- cfg/cfg_struct.c | 2 +- cfg/cfg_struct.h | 5 +++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 57e6670..cc64a0d 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -306,13 +306,14 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *var_name, void *val, unsigned int val_type) { + int i; cfg_group_t *group; cfg_mapping_t *var; void *p, *v; cfg_block_t *block = NULL; str s, s2; char *old_string = NULL; - char **replaced = NULL; + void **replaced = NULL; cfg_child_cb_t *child_cb = NULL; cfg_group_inst_t *group_inst, *new_array = NULL; unsigned char *var_block; @@ -523,16 +524,26 @@ int cfg_set_now(cfg_ctx_t *ctx, str *group_name, unsigned int *group_id, str *va new_array = CFG_GROUP_META(block, group)->array; } - if (old_string) { + if (old_string || new_array) { /* prepare the array of the replaced strings, + and replaced group instances, they will be freed when the old block is freed */ - replaced = (char **)shm_malloc(sizeof(char *)*2); + replaced = (void **)shm_malloc(sizeof(void *) + * ((old_string?1:0) + (new_array?1:0) + 1)); if (!replaced) { LOG(L_ERR, "ERROR: cfg_set_now(): not enough shm memory\n"); goto error; } - replaced[0] = old_string; - replaced[1] = NULL; + i = 0; + if (old_string) { + replaced[i] = old_string; + i++; + } + if (new_array) { + replaced[i] = CFG_GROUP_META(*cfg_global, group)->array; + i++; + } + replaced[i] = NULL; } /* replace the global config with the new one */ if (block) cfg_install_global(block, replaced, child_cb, child_cb); @@ -845,7 +856,7 @@ int cfg_commit(cfg_ctx_t *ctx) int replaced_num = 0; cfg_changed_var_t *changed, *changed2; cfg_block_t *block; - char **replaced = NULL; + void **replaced = NULL; cfg_child_cb_t *child_cb; cfg_child_cb_t *child_cb_first = NULL; cfg_child_cb_t *child_cb_last = NULL; @@ -899,8 +910,8 @@ int cfg_commit(cfg_ctx_t *ctx) if (replaced_num) { /* allocate memory for the replaced string array */ - size = sizeof(char *)*(replaced_num + 1); - replaced = (char **)shm_malloc(size); + size = sizeof(void *)*(replaced_num + 1); + replaced = (void **)shm_malloc(size); if (!replaced) { LOG(L_ERR, "ERROR: cfg_commit(): not enough shm memory\n"); goto error; diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 13605ae..3e92080 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -645,7 +645,7 @@ void cfg_install_child_cb(cfg_child_cb_t *cb_first, cfg_child_cb_t *cb_last) * cb_first and cb_last define a linked list of per-child process * callbacks. This list is added to the global linked list. */ -void cfg_install_global(cfg_block_t *block, char **replaced, +void cfg_install_global(cfg_block_t *block, void **replaced, cfg_child_cb_t *cb_first, cfg_child_cb_t *cb_last) { cfg_block_t* old_cfg; diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 18ffbc7..58cd810 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -122,7 +122,8 @@ typedef struct _cfg_block { atomic_t refcnt; /*!< reference counter, the block is automatically deleted when it reaches 0 */ - char **replaced; /*!< set of the strings that must be freed + void **replaced; /*!< set of the strings and other memory segments + that must be freed together with the block. The content depends on the block that replaces this one */ unsigned char vars[1]; /*!< blob that contains the values */ @@ -394,7 +395,7 @@ void cfg_install_child_cb(cfg_child_cb_t *cb_first, cfg_child_cb_t *cb_last); * cb_first and cb_last define a linked list of per-child process * callbacks. This list is added to the global linked list. */ -void cfg_install_global(cfg_block_t *block, char **replaced, +void cfg_install_global(cfg_block_t *block, void **replaced, cfg_child_cb_t *cb_first, cfg_child_cb_t *cb_last); /* creates a structure for a per-child process callback */

14 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010