[asterisk-commits] russell: branch 1.6.1 r163100 - in /branches/1.6.1: ./ main/features.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Dec 11 11:16:27 CST 2008
Author: russell
Date: Thu Dec 11 11:16:26 2008
New Revision: 163100
URL: http://svn.digium.com/view/asterisk?view=rev&rev=163100
Log:
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
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/main/features.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=163100&r1=163099&r2=163100
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Dec 11 11:16:26 2008
@@ -1489,7 +1489,7 @@
};
-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)
@@ -1499,9 +1499,9 @@
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);
}
@@ -1582,12 +1582,14 @@
void ast_unregister_feature(struct ast_call_feature *feature)
{
- if (!feature)
+ if (!feature) {
return;
-
- AST_LIST_LOCK(&feature_list);
- AST_LIST_REMOVE(&feature_list,feature,feature_entry);
- AST_LIST_UNLOCK(&feature_list);
+ }
+
+ AST_RWLIST_WRLOCK(&feature_list);
+ AST_RWLIST_REMOVE(&feature_list, feature, feature_entry);
+ AST_RWLIST_UNLOCK(&feature_list);
+
ast_free(feature);
}
@@ -1596,10 +1598,11 @@
{
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 */
@@ -1607,9 +1610,10 @@
{
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;
@@ -1850,10 +1854,11 @@
}
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;
}
@@ -1862,14 +1867,14 @@
ast_verb(3, " Feature Found: %s exten: %s\n",feature->sname, tok);
res = feature->operation(chan, peer, config, code, sense, feature);
if (res != AST_FEATURE_RETURN_KEEPTRYING) {
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
break;
}
res = AST_FEATURE_RETURN_PASSDIGITS;
} else if (!strncmp(feature->exten, code, strlen(code)))
res = AST_FEATURE_RETURN_STOREDIGITS;
- AST_LIST_UNLOCK(&feature_list);
+ AST_RWLIST_UNLOCK(&feature_list);
}
return res;
@@ -1904,14 +1909,14 @@
/* 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);
}
}
}
@@ -3384,13 +3389,13 @@
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;
@@ -3468,14 +3473,14 @@
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);
}
@@ -3547,13 +3552,14 @@
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);
}
// loop through all the parking lots
More information about the asterisk-commits
mailing list