From 2f56ece505d00561a8e49c794fd370b6227bca1c Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 11 Dec 2008 17:11:50 +0000 Subject: [PATCH] Merged revisions 163094 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r163094 | russell | 2008-12-11 11:06:16 -0600 (Thu, 11 Dec 2008) | 19 lines Merged revisions 163092 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r163092 | russell | 2008-12-11 10:54:51 -0600 (Thu, 11 Dec 2008) | 11 lines Fix an issue that made it so you could only have a single caller executing a custom feature at a time. This was especially problematic when custom features ran for any appreciable amount of time. The fix turned out to be quite simple. The dynamic features are now stored in a read/write list instead of a list using a mutex. (closes issue #13478) Reported by: neutrino88 Fix suggested by file ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@163095 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 72 ++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/main/features.c b/main/features.c index e9f8a42757..a0e557e1f7 100644 --- a/main/features.c +++ b/main/features.c @@ -1277,7 +1277,7 @@ static struct ast_call_feature builtin_features[] = }; -static AST_LIST_HEAD_STATIC(feature_list,ast_call_feature); +static AST_RWLIST_HEAD_STATIC(feature_list, ast_call_feature); /*! \brief register new feature into feature_list*/ void ast_register_feature(struct ast_call_feature *feature) @@ -1287,9 +1287,9 @@ void ast_register_feature(struct ast_call_feature *feature) return; } - AST_LIST_LOCK(&feature_list); - AST_LIST_INSERT_HEAD(&feature_list,feature,feature_entry); - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_WRLOCK(&feature_list); + AST_RWLIST_INSERT_HEAD(&feature_list,feature,feature_entry); + AST_RWLIST_UNLOCK(&feature_list); ast_verb(2, "Registered Feature '%s'\n",feature->sname); } @@ -1370,12 +1370,14 @@ static void register_group_feature(struct feature_group *fg, const char *exten, void ast_unregister_feature(struct ast_call_feature *feature) { - if (!feature) + if (!feature) { return; + } + + AST_RWLIST_WRLOCK(&feature_list); + AST_RWLIST_REMOVE(&feature_list, feature, feature_entry); + AST_RWLIST_UNLOCK(&feature_list); - AST_LIST_LOCK(&feature_list); - AST_LIST_REMOVE(&feature_list,feature,feature_entry); - AST_LIST_UNLOCK(&feature_list); ast_free(feature); } @@ -1384,10 +1386,11 @@ static void ast_unregister_features(void) { struct ast_call_feature *feature; - AST_LIST_LOCK(&feature_list); - while ((feature = AST_LIST_REMOVE_HEAD(&feature_list,feature_entry))) + AST_RWLIST_WRLOCK(&feature_list); + while ((feature = AST_RWLIST_REMOVE_HEAD(&feature_list, feature_entry))) { ast_free(feature); - AST_LIST_UNLOCK(&feature_list); + } + AST_RWLIST_UNLOCK(&feature_list); } /*! \brief find a call feature by name */ @@ -1395,9 +1398,10 @@ static struct ast_call_feature *find_dynamic_feature(const char *name) { struct ast_call_feature *tmp; - AST_LIST_TRAVERSE(&feature_list, tmp, feature_entry) { - if (!strcasecmp(tmp->sname, name)) + AST_RWLIST_TRAVERSE(&feature_list, tmp, feature_entry) { + if (!strcasecmp(tmp->sname, name)) { break; + } } return tmp; @@ -1636,10 +1640,11 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p } AST_RWLIST_UNLOCK(&feature_groups); - AST_LIST_LOCK(&feature_list); - if(!(feature = find_dynamic_feature(tok))) { - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_RDLOCK(&feature_list); + + if (!(feature = find_dynamic_feature(tok))) { + AST_RWLIST_UNLOCK(&feature_list); continue; } @@ -1648,14 +1653,14 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p ast_verb(3, " Feature Found: %s exten: %s\n",feature->sname, tok); res = feature->operation(chan, peer, config, code, sense, feature); if (res != FEATURE_RETURN_KEEPTRYING) { - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); break; } res = FEATURE_RETURN_PASSDIGITS; } else if (!strncmp(feature->exten, code, strlen(code))) res = FEATURE_RETURN_STOREDIGITS; - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); } return res; @@ -1690,14 +1695,14 @@ static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, /* while we have a feature */ while ((tok = strsep(&tmp, "#"))) { - AST_LIST_LOCK(&feature_list); + AST_RWLIST_RDLOCK(&feature_list); if ((feature = find_dynamic_feature(tok)) && ast_test_flag(feature, AST_FEATURE_FLAG_NEEDSDTMF)) { if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLER)) ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_0); if (ast_test_flag(feature, AST_FEATURE_FLAG_BYCALLEE)) ast_set_flag(config, AST_BRIDGE_DTMF_CHANNEL_1); } - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); } } } @@ -2873,13 +2878,13 @@ static int load_config(void) continue; } - AST_LIST_LOCK(&feature_list); + AST_RWLIST_RDLOCK(&feature_list); if ((feature = find_dynamic_feature(var->name))) { - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); ast_log(LOG_WARNING, "Dynamic Feature '%s' specified more than once!\n", var->name); continue; } - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); if (!(feature = ast_calloc(1, sizeof(*feature)))) continue; @@ -2947,14 +2952,14 @@ static int load_config(void) for (var = ast_variable_browse(cfg, ctg); var; var = var->next) { struct ast_call_feature *feature; - AST_LIST_LOCK(&feature_list); - if(!(feature = find_dynamic_feature(var->name)) && - !(feature = ast_find_call_feature(var->name))) { - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_RDLOCK(&feature_list); + if (!(feature = find_dynamic_feature(var->name)) && + !(feature = ast_find_call_feature(var->name))) { + AST_RWLIST_UNLOCK(&feature_list); ast_log(LOG_WARNING, "Feature '%s' was not found.\n", var->name); continue; } - AST_LIST_UNLOCK(&feature_list); + AST_RWLIST_UNLOCK(&feature_list); register_group_feature(fg, var->value, feature); } @@ -3024,13 +3029,14 @@ static char *handle_feature_show(struct ast_cli_entry *e, int cmd, struct ast_cl ast_cli(a->fd, "\n"); ast_cli(a->fd, HFS_FORMAT, "Dynamic Feature", "Default", "Current"); ast_cli(a->fd, HFS_FORMAT, "---------------", "-------", "-------"); - if (AST_LIST_EMPTY(&feature_list)) + if (AST_RWLIST_EMPTY(&feature_list)) { ast_cli(a->fd, "(none)\n"); - else { - AST_LIST_LOCK(&feature_list); - AST_LIST_TRAVERSE(&feature_list, feature, feature_entry) + } else { + AST_RWLIST_RDLOCK(&feature_list); + AST_RWLIST_TRAVERSE(&feature_list, feature, feature_entry) { ast_cli(a->fd, HFS_FORMAT, feature->sname, "no def", feature->exten); - AST_LIST_UNLOCK(&feature_list); + } + AST_RWLIST_UNLOCK(&feature_list); } ast_cli(a->fd, "\nCall parking\n"); ast_cli(a->fd, "------------\n");