diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-29 20:37:01 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-29 20:37:01 +0000 |
commit | 5360fe7571fe151b9b9b5db5449b48688fad17c4 (patch) | |
tree | 5fbd972cffbfb204bbbff48b655e8a53065c80fe /manager.c | |
parent | 5aac76d81ab4f292b8b88eb5c015bfebb3ba70ad (diff) |
Fix manager bug (can't destroy a session while a thread is using it!)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6698 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'manager.c')
-rwxr-xr-x | manager.c | 25 |
1 files changed, 9 insertions, 16 deletions
@@ -1326,8 +1326,11 @@ static int get_input(struct mansession *s, char *output) do { res = poll(fds, 1, -1); if (res < 0) { - if (errno == EINTR) + if (errno == EINTR) { + if (s->dead) + return -1; continue; + } ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno)); return -1; } else if (res > 0) { @@ -1435,7 +1438,7 @@ static void *accept_thread(void *ignore) s->next = sessions; sessions = s; ast_mutex_unlock(&sessionlock); - if (ast_pthread_create(&t, &attr, session_do, s)) + if (ast_pthread_create(&s->t, &attr, session_do, s)) destroy_session(s); } pthread_attr_destroy(&attr); @@ -1468,13 +1471,11 @@ int manager_event(int category, char *event, char *fmt, ...) struct mansession *s; char tmp[4096]; va_list ap; - struct mansession *next, *prev = NULL; ast_mutex_lock(&sessionlock); s = sessions; while(s) { - next = s->next; - if (((s->readperm & category) == category) && ((s->send_events & category) == category) ) { + if (((s->readperm & category) == category) && ((s->send_events & category) == category)) { ast_mutex_lock(&s->__lock); ast_cli(s->fd, "Event: %s\r\n", event); ast_cli(s->fd, "Privilege: %s\r\n", authority_to_str(category, tmp, sizeof(tmp))); @@ -1486,20 +1487,12 @@ int manager_event(int category, char *event, char *fmt, ...) append_event(s, tmp); } else if (ast_carefulwrite(s->fd,tmp,strlen(tmp),100) < 0) { ast_log(LOG_WARNING, "Disconnecting slow manager session!\n"); - /* Unlink from list */ - if (prev) - prev->next = next; - else - sessions = next; - ast_mutex_unlock(&s->__lock); - free_session(s); - s = next; - continue; + s->dead = 1; + pthread_kill(s->t, SIGURG); } ast_mutex_unlock(&s->__lock); } - prev = s; - s = next; + s = s->next; } ast_mutex_unlock(&sessionlock); return 0; |