kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Might as well go crazy here too and make the autoservice list read/write.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-23 00:16:55 +00:00
parent 21b53af31d
commit b86d65958f
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/autoservice.c
View File

@@ -57,7 +57,7 @@ struct asent {
AST_LIST_ENTRY(asent) list; AST_LIST_ENTRY(asent) list;
}; };
static AST_LIST_HEAD_STATIC(aslist, asent); static AST_RWLIST_HEAD_STATIC(aslist, asent);
static pthread_t asthread = AST_PTHREADT_NULL; static pthread_t asthread = AST_PTHREADT_NULL;
@@ -70,8 +70,8 @@ static void *autoservice_run(void *ign)
struct asent *as; struct asent *as;
int x = 0, ms = 500; int x = 0, ms = 500;
AST_LIST_LOCK(&aslist); AST_RWLIST_RDLOCK(&aslist);
AST_LIST_TRAVERSE(&aslist, as, list) { AST_RWLIST_TRAVERSE(&aslist, as, list) {
if (!as->chan->_softhangup) { if (!as->chan->_softhangup) {
if (x < MAX_AUTOMONS) if (x < MAX_AUTOMONS)
mons[x++] = as->chan; mons[x++] = as->chan;
@@ -79,7 +79,7 @@ static void *autoservice_run(void *ign)
ast_log(LOG_WARNING, "Exceeded maximum number of automatic monitoring events. Fix autoservice.c\n"); ast_log(LOG_WARNING, "Exceeded maximum number of automatic monitoring events. Fix autoservice.c\n");
} }
} }
AST_LIST_UNLOCK(&aslist); AST_RWLIST_UNLOCK(&aslist);
chan = ast_waitfor_n(mons, x, &ms); chan = ast_waitfor_n(mons, x, &ms);
if (chan) { if (chan) {
@@ -97,10 +97,11 @@ int ast_autoservice_start(struct ast_channel *chan)
{ {
int res = -1; int res = -1;
struct asent *as; struct asent *as;
AST_LIST_LOCK(&aslist);
AST_RWLIST_WRLOCK(&aslist);
/* Check if the channel already has autoservice */ /* Check if the channel already has autoservice */
AST_LIST_TRAVERSE(&aslist, as, list) { AST_RWLIST_TRAVERSE(&aslist, as, list) {
if (as->chan == chan) if (as->chan == chan)
break; break;
} }
@@ -108,21 +109,21 @@ int ast_autoservice_start(struct ast_channel *chan)
/* If not, start autoservice on channel */ /* If not, start autoservice on channel */
if (!as && (as = ast_calloc(1, sizeof(*as)))) { if (!as && (as = ast_calloc(1, sizeof(*as)))) {
as->chan = chan; as->chan = chan;
AST_LIST_INSERT_HEAD(&aslist, as, list); AST_RWLIST_INSERT_HEAD(&aslist, as, list);
res = 0; res = 0;
if (asthread == AST_PTHREADT_NULL) { /* need start the thread */ if (asthread == AST_PTHREADT_NULL) { /* need start the thread */
if (ast_pthread_create_background(&asthread, NULL, autoservice_run, NULL)) { if (ast_pthread_create_background(&asthread, NULL, autoservice_run, NULL)) {
ast_log(LOG_WARNING, "Unable to create autoservice thread :(\n"); ast_log(LOG_WARNING, "Unable to create autoservice thread :(\n");
/* There will only be a single member in the list at this point, /* There will only be a single member in the list at this point,
the one we just added. */ the one we just added. */
AST_LIST_REMOVE(&aslist, as, list); AST_RWLIST_REMOVE(&aslist, as, list);
free(as); free(as);
res = -1; res = -1;
} else } else
pthread_kill(asthread, SIGURG); pthread_kill(asthread, SIGURG);
} }
} }
AST_LIST_UNLOCK(&aslist); AST_RWLIST_UNLOCK(&aslist);
return res; return res;
} }
@@ -131,21 +132,21 @@ int ast_autoservice_stop(struct ast_channel *chan)
int res = -1; int res = -1;
struct asent *as; struct asent *as;
AST_LIST_LOCK(&aslist); AST_RWLIST_WRLOCK(&aslist);
AST_LIST_TRAVERSE_SAFE_BEGIN(&aslist, as, list) { AST_RWLIST_TRAVERSE_SAFE_BEGIN(&aslist, as, list) {
if (as->chan == chan) { if (as->chan == chan) {
AST_LIST_REMOVE_CURRENT(&aslist, list); AST_RWLIST_REMOVE_CURRENT(&aslist, list);
free(as); free(as);
if (!chan->_softhangup) if (!chan->_softhangup)
res = 0; res = 0;
break; break;
} }
} }
AST_LIST_TRAVERSE_SAFE_END AST_RWLIST_TRAVERSE_SAFE_END
if (asthread != AST_PTHREADT_NULL) if (asthread != AST_PTHREADT_NULL)
pthread_kill(asthread, SIGURG); pthread_kill(asthread, SIGURG);
AST_LIST_UNLOCK(&aslist); AST_RWLIST_UNLOCK(&aslist);
/* Wait for it to un-block */ /* Wait for it to un-block */
while (ast_test_flag(chan, AST_FLAG_BLOCKING)) while (ast_test_flag(chan, AST_FLAG_BLOCKING))