[asterisk-commits] mmichelson: branch 1.6.1 r176176 - in /branches/1.6.1: ./ main/logger.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Feb 16 12:38:00 2009
New Revision: 176176

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176176
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/logger.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/logger.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/logger.c?view=diff&rev=176176&r1=176175&r2=176176
==============================================================================
--- branches/1.6.1/main/logger.c (original)
+++ branches/1.6.1/main/logger.c Mon Feb 16 12:38:00 2009
@@ -969,8 +969,13 @@
 	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);