kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid iflock/chlock race

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-21 03:37:13 +00:00
parent 491e5d941c
commit ef4d9eb5b7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_zap.c
View File

@@ -5484,7 +5484,10 @@ static void *do_monitor(void *data)
} }
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Monitor doohicky got event %s on channel %d\n", event2str(res), i->channel); ast_log(LOG_DEBUG, "Monitor doohicky got event %s on channel %d\n", event2str(res), i->channel);
/* Don't hold iflock while handling init events -- race with chlock */
ast_mutex_unlock(&iflock);
handle_init_event(i, res); handle_init_event(i, res);
ast_mutex_lock(&iflock);
} }
#ifdef ZAPATA_R2 #ifdef ZAPATA_R2
if ((pollres & POLLPRI) || (i->r2 && !i->sigchecked)) if ((pollres & POLLPRI) || (i->r2 && !i->sigchecked))
@@ -5503,7 +5506,10 @@ static void *do_monitor(void *data)
res = zt_get_event(i->subs[SUB_REAL].zfd); res = zt_get_event(i->subs[SUB_REAL].zfd);
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Monitor doohicky got event %s on channel %d\n", event2str(res), i->channel); ast_log(LOG_DEBUG, "Monitor doohicky got event %s on channel %d\n", event2str(res), i->channel);
/* Don't hold iflock while handling init events */
ast_mutex_unlock(&iflock);
handle_init_event(i, res); handle_init_event(i, res);
ast_mutex_lock(&iflock);
} }
} }
i=i->next; i=i->next;