diff options
author | Mark Michelson <mmichelson@digium.com> | 2009-02-16 18:25:57 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2009-02-16 18:25:57 +0000 |
commit | e32921415f2379ece4e10bce83f9e1d8da961f0d (patch) | |
tree | e3f4671de6bbede01ef41b1f719905f7bc3d7fb6 /main/logger.c | |
parent | 6cc10eb3513d9bd9cd9f73aa92afea7937e08a22 (diff) |
Assist proper thread synchronization when stopping the logger thread.
I was finding that on my dev box, occasionally attempting to "stop now" in
trunk would cause Asterisk to hang. I traced this to the fact that the logger
thread was waiting on a condition which had already been signalled. The logger
thread also need to be sure to check the value of the close_logger_thread variable.
The close_logger_thread variable is only checked when the list of logmessages is empty.
This allows for the logger thread to print and free any pending messages before exiting.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@176174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/logger.c')
-rw-r--r-- | main/logger.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/logger.c b/main/logger.c index 23b823e3f..163548908 100644 --- a/main/logger.c +++ b/main/logger.c @@ -973,8 +973,13 @@ static void *logger_thread(void *data) for (;;) { /* We lock the message list, and see if any message exists... if not we wait on the condition to be signalled */ AST_LIST_LOCK(&logmsgs); - if (AST_LIST_EMPTY(&logmsgs)) - ast_cond_wait(&logcond, &logmsgs.lock); + if (AST_LIST_EMPTY(&logmsgs)) { + if (close_logger_thread) { + break; + } else { + ast_cond_wait(&logcond, &logmsgs.lock); + } + } next = AST_LIST_FIRST(&logmsgs); AST_LIST_HEAD_INIT_NOLOCK(&logmsgs); AST_LIST_UNLOCK(&logmsgs); |