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

55
manager.c
View File

@@ -574,14 +574,7 @@ static int action_hangup(struct mansession *s, struct message *m)
astman_send_error(s, m, "No channel specified");
return 0;
}
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
c = ast_get_channel_by_name_locked(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
@@ -615,14 +608,7 @@ static int action_setvar(struct mansession *s, struct message *m)
return 0;
}
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
c = ast_get_channel_by_name_locked(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
@@ -660,14 +646,7 @@ static int action_getvar(struct mansession *s, struct message *m)
return 0;
}
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
c = ast_get_channel_by_name_locked(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
@@ -702,25 +681,22 @@ static int action_status(struct mansession *s, struct message *m)
char bridge[256];
struct timeval now;
long elapsed_seconds=0;
int all = !name || ast_strlen_zero(name); /* set if we want all channels */
gettimeofday(&now, NULL);
astman_send_ack(s, m, "Channel status will follow");
c = ast_channel_walk_locked(NULL);
if (id && !ast_strlen_zero(id))
snprintf(idText,256,"ActionID: %s\r\n",id);
if (name && !ast_strlen_zero(name)) {
while (c) {
if (!strcasecmp(c->name, name)) {
break;
}
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
if (all)
c = ast_channel_walk_locked(NULL);
else {
c = ast_get_channel_by_name_locked(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;
}
}
/* if we look by name, we break after the first iteration */
while(c) {
if (c->_bridge)
snprintf(bridge, sizeof(bridge), "Link: %s\r\n", c->_bridge->name);
@@ -773,10 +749,8 @@ static int action_status(struct mansession *s, struct message *m)
ast_state2str(c->_state), bridge, c->uniqueid, idText);
}
ast_mutex_unlock(&s->lock);
ast_mutex_unlock(&c->lock);
if (name && !ast_strlen_zero(name)) {
if (!all)
break;
}
c = ast_channel_walk_locked(c);
}
ast_mutex_lock(&s->lock);
@@ -1175,14 +1149,7 @@ static int action_timeout(struct mansession *s, struct message *m)
astman_send_error(s, m, "No timeout specified");
return 0;
}
c = ast_channel_walk_locked(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
c = ast_get_channel_by_name_locked(name);
if (!c) {
astman_send_error(s, m, "No such channel");
return 0;