[asterisk-commits] mjordan: branch mjordan/1.8_instrumented r369700 - /team/mjordan/1.8_instrume...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Jul  6 09:18:37 2012
New Revision: 369700

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369700
Log:
It may be a module that holds up the load...

Modified:
    team/mjordan/1.8_instrumented/main/asterisk.c
    team/mjordan/1.8_instrumented/main/loader.c
    team/mjordan/1.8_instrumented/main/logger.c

Modified: team/mjordan/1.8_instrumented/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/asterisk.c?view=diff&rev=369700&r1=369699&r2=369700
==============================================================================
--- team/mjordan/1.8_instrumented/main/asterisk.c (original)
+++ team/mjordan/1.8_instrumented/main/asterisk.c Fri Jul  6 09:18:37 2012
@@ -4041,7 +4041,7 @@
 		printf("%s[%d]\n", __FILE__, __LINE__);
 		exit(1);
 	}
-
+	printf("*** LOADING MODULES ***\n");
 	if ((moduleresult = load_modules(0))) {		/* Load modules */
 		printf("%s", term_quit());
 		printf("%s[%d]\n", __FILE__, __LINE__);

Modified: team/mjordan/1.8_instrumented/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/loader.c?view=diff&rev=369700&r1=369699&r2=369700
==============================================================================
--- team/mjordan/1.8_instrumented/main/loader.c (original)
+++ team/mjordan/1.8_instrumented/main/loader.c Fri Jul  6 09:18:37 2012
@@ -958,6 +958,7 @@
 
 	/* first, add find and add modules to heap */
 	AST_LIST_TRAVERSE_SAFE_BEGIN(load_order, order, entry) {
+		ast_log(AST_LOG_NOTICE, "Loading %s\n", order->resource);
 		switch (load_resource(order->resource, global_symbols, resource_heap, order->required)) {
 		case AST_MODULE_LOAD_SUCCESS:
 		case AST_MODULE_LOAD_DECLINE:
@@ -1129,11 +1130,13 @@
 		ast_log(LOG_NOTICE, "%d modules will be loaded.\n", load_count);
 
 	/* first, load only modules that provide global symbols */
+	printf("Loading global symbol modules\n");
 	if ((res = load_resource_list(&load_order, 1, &modulecount)) < 0) {
 		goto done;
 	}
 
 	/* now load everything else */
+	printf("Loading other modules\n");
 	if ((res = load_resource_list(&load_order, 0, &modulecount)) < 0) {
 		goto done;
 	}

Modified: team/mjordan/1.8_instrumented/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/logger.c?view=diff&rev=369700&r1=369699&r2=369700
==============================================================================
--- team/mjordan/1.8_instrumented/main/logger.c (original)
+++ team/mjordan/1.8_instrumented/main/logger.c Fri Jul  6 09:18:37 2012
@@ -1201,7 +1201,7 @@
 	va_start(ap, fmt);
 	ast_str_set_va(&buf, BUFSIZ, fmt, ap);
 	va_end(ap);
-	printf(ast_str_buffer(buf));
+	printf("%s", ast_str_buffer(buf));
 	if (level != __LOG_VERBOSE && AST_RWLIST_EMPTY(&logchannels)) {
 		/*
 		 * we don't have the logger chain configured yet,