[svn-commits] tilghman: branch 1.4 r278981 - /branches/1.4/main/asterisk.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 23 11:42:25 2010
New Revision: 278981

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278981
Log:
Avoid race with consolethread on shutdown (on parallel processors).

(closes issue #17080)
 Reported by: sybasesql
 Patches: 
       20100721__issue17080.diff.txt uploaded by tilghman (license 14)
 Tested by: sybasesql

Modified:
    branches/1.4/main/asterisk.c

Modified: branches/1.4/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/asterisk.c?view=diff&rev=278981&r1=278980&r2=278981
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Fri Jul 23 11:42:25 2010
@@ -1320,14 +1320,21 @@
 			ast_module_shutdown();
 	}
 	if (ast_opt_console || ast_opt_remote) {
-		if (getenv("HOME")) 
+		if (getenv("HOME")) {
 			snprintf(filename, sizeof(filename), "%s/.asterisk_history", getenv("HOME"));
-		if (!ast_strlen_zero(filename))
+		}
+		if (!ast_strlen_zero(filename)) {
 			ast_el_write_history(filename);
-		if (el != NULL)
-			el_end(el);
-		if (el_hist != NULL)
-			history_end(el_hist);
+		}
+		if (consolethread == AST_PTHREADT_NULL || consolethread == pthread_self()) {
+			/* Only end if we are the consolethread, otherwise there's a race with that thread. */
+			if (el != NULL) {
+				el_end(el);
+			}
+			if (el_hist != NULL) {
+				history_end(el_hist);
+			}
+		}
 	}
 	if (option_verbose)
 		ast_verbose("Executing last minute cleanups\n");