kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 03:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

more efficient (and understandable) ast_channel_walk_locked, and vastly more efficient ast_channel_by_name_locked (bug #4265)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-06 02:29:18 +00:00
parent bccc1171f0
commit 1bac31d6bd
14 changed files with 235 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app.c
View File

@@ -1013,22 +1013,20 @@ int ast_app_group_get_count(char *group, char *category)
int count = 0;
char *test;
char cat[80] = "";
char *s;
if (category && !ast_strlen_zero(category)) {
ast_copy_string(cat, category, sizeof(cat));
} else {
ast_copy_string(cat, GROUP_CATEGORY_PREFIX, sizeof(cat));
}
if (group == NULL || ast_strlen_zero(group))
return 0;
if (group && !ast_strlen_zero(group)) {
chan = ast_channel_walk_locked(NULL);
while(chan) {
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !strcasecmp(test, group))
count++;
ast_mutex_unlock(&chan->lock);
chan = ast_channel_walk_locked(chan);
}
s = (category && !ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
ast_copy_string(cat, s, sizeof(cat));
chan = NULL;
while ((chan = ast_channel_walk_locked(chan)) != NULL) {
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !strcasecmp(test, group))
count++;
ast_mutex_unlock(&chan->lock);
}
return count;
@@ -1041,6 +1039,7 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
int count = 0;
char *test;
char cat[80] = "";
char *s;
if (!groupmatch || ast_strlen_zero(groupmatch))
return 0;
@@ -1049,14 +1048,11 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
return 0;
if (category && !ast_strlen_zero(category)) {
ast_copy_string(cat, category, sizeof(cat));
} else {
ast_copy_string(cat, GROUP_CATEGORY_PREFIX, sizeof(cat));
}
s = (category && !ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
ast_copy_string(cat, s, sizeof(cat));
chan = ast_channel_walk_locked(NULL);
while(chan) {
chan = NULL;
while ((chan = ast_channel_walk_locked(chan)) != NULL) {
test = pbx_builtin_getvar_helper(chan, cat);
if (test && !regexec(&regexbuf, test, 0, NULL, 0))
count++;