Merged revisions 176174 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r176174 | mmichelson | 2009-02-16 12:25:57 -0600 (Mon, 16 Feb 2009) | 11 lines
  
  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: http://svn.digium.com/svn/asterisk/branches/1.6.0@176175 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 2 deletions

diff --git a/main/logger.c b/main/logger.c
index 55da65f22..0be68a9db 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -881,8 +881,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);