[asterisk-commits] mjordan: branch mjordan/trunk-deadlock r376372 - in /team/mjordan/trunk-deadl...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Nov 15 18:53:15 2012
New Revision: 376372

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376372
Log:
initialize automerge, merge some asterisk.c changes

Modified:
    team/mjordan/trunk-deadlock/   (props changed)
    team/mjordan/trunk-deadlock/main/asterisk.c

Propchange: team/mjordan/trunk-deadlock/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mjordan/trunk-deadlock/
------------------------------------------------------------------------------
    automerge-email = mjordan at digium.com

Modified: team/mjordan/trunk-deadlock/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/trunk-deadlock/main/asterisk.c?view=diff&rev=376372&r1=376371&r2=376372
==============================================================================
--- team/mjordan/trunk-deadlock/main/asterisk.c (original)
+++ team/mjordan/trunk-deadlock/main/asterisk.c Thu Nov 15 18:53:15 2012
@@ -3545,6 +3545,10 @@
 	int moduleresult;         /*!< Result from the module load subsystem */
 	struct rlimit l;
 
+#if defined(__AST_DEBUG_MALLOC)
+	__ast_mm_init_phase_1();
+#endif	/* defined(__AST_DEBUG_MALLOC) */
+
 	/* Remember original args for restart */
 	if (argc > ARRAY_LEN(_argv) - 1) {
 		fprintf(stderr, "Truncating argument size to %d\n", (int)ARRAY_LEN(_argv) - 1);
@@ -4251,7 +4255,7 @@
 	pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
 
 #ifdef __AST_DEBUG_MALLOC
-	__ast_mm_init();
+	__ast_mm_init_phase_2();
 #endif
 
 	ast_lastreloadtime = ast_startuptime = ast_tvnow();