[asterisk-commits] russell: branch 1.4 r52904 - in /branches/1.4: ./ main/asterisk.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan 30 11:19:39 2007
New Revision: 52904

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52904
Log:
Merged revisions 52903 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52903 | russell | 2007-01-30 11:12:04 -0600 (Tue, 30 Jan 2007) | 9 lines

The SIGHUP handler was implemented to allow admins to send SIGHUP to a running
Asterisk process to reload the configuration.  However, doing the actual reload
in the signal handler itself is a very bad thing to do, because the reload
process includes calling non-reentrant functions such as malloc/calloc/etc.
If Asterisk is running in the background, then the reload will happen
immediately.  However, if running in console mode, the reload doesn't work
until something is typed at the console.  That sort of defeats the purpose,
but I don't see an easy way to get around it at this point.

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/main/asterisk.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/asterisk.c?view=diff&rev=52904&r1=52903&r2=52904
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Tue Jan 30 11:19:39 2007
@@ -232,6 +232,8 @@
 static pthread_t consolethread = AST_PTHREADT_NULL;
 
 static char randompool[256];
+
+static unsigned int need_reload;
 
 #if !defined(LOW_MEMORY)
 struct file_version {
@@ -1040,8 +1042,7 @@
 		printf("Received HUP signal -- Reloading configs\n");
 	if (restartnow)
 		execvp(_argv[0], _argv);
-	/* XXX This could deadlock XXX */
-	ast_module_reload(NULL);
+	need_reload = 1;
 	signal(num, hup_handler);
 }
 
@@ -2201,6 +2202,11 @@
 				}
 			}
 		}
+
+		if (need_reload) {
+			need_reload = 0;
+			ast_module_reload(NULL);
+		}
 	}
 	printf("\nDisconnected from Asterisk server\n");
 }
@@ -2850,14 +2856,21 @@
 					ast_log(LOG_WARNING, "Failed to open /dev/null to recover from dead console. Bad things will happen!\n");
 				break;
 			}
-		}
-
+			if (need_reload) {
+				need_reload = 0;
+				ast_module_reload(NULL);
+			}
+		}
 	}
 	/* Do nothing */
 	for (;;) {	/* apparently needed for Mac OS X */
 		struct pollfd p = { -1 /* no descriptor */, 0, 0 };
-
 		poll(&p, 0, -1);
+ 		/* SIGHUP will cause this to break out of poll() */
+ 		if (need_reload) {
+ 			need_reload = 0;
+ 			ast_module_reload(NULL);
+ 		}
 	}
 
 	return 0;