[asterisk-commits] mjordan: branch mjordan/1.8_instrumented r369702 - in /team/mjordan/1.8_instr...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jul 6 09:29:47 CDT 2012
Author: mjordan
Date: Fri Jul 6 09:29:44 2012
New Revision: 369702
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369702
Log:
Starting to suspiciously look like the TPS
Modified:
team/mjordan/1.8_instrumented/apps/app_queue.c
team/mjordan/1.8_instrumented/apps/app_voicemail.c
team/mjordan/1.8_instrumented/channels/chan_iax2.c
team/mjordan/1.8_instrumented/main/asterisk.c
team/mjordan/1.8_instrumented/main/ccss.c
team/mjordan/1.8_instrumented/main/event.c
team/mjordan/1.8_instrumented/main/pbx.c
Modified: team/mjordan/1.8_instrumented/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/apps/app_queue.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/apps/app_queue.c (original)
+++ team/mjordan/1.8_instrumented/apps/app_queue.c Fri Jul 6 09:29:44 2012
@@ -8363,11 +8363,11 @@
res |= ast_custom_function_register(&queuememberlist_function);
res |= ast_custom_function_register(&queuewaitingcount_function);
res |= ast_custom_function_register(&queuememberpenalty_function);
-
+ printf("TPS: Getting app_queue\n");
if (!(devicestate_tps = ast_taskprocessor_get("app_queue", 0))) {
ast_log(LOG_WARNING, "devicestate taskprocessor reference failed - devicestate notifications will not occur\n");
}
-
+ printf("TPS: Got app_queue\n");
/* in the following subscribe call, do I use DEVICE_STATE, or DEVICE_STATE_CHANGE? */
if (!(device_state_sub = ast_event_subscribe(AST_EVENT_DEVICE_STATE, device_state_cb, "AppQueue Device state", NULL, AST_EVENT_IE_END))) {
res = -1;
Modified: team/mjordan/1.8_instrumented/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/apps/app_voicemail.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/apps/app_voicemail.c (original)
+++ team/mjordan/1.8_instrumented/apps/app_voicemail.c Fri Jul 6 09:29:44 2012
@@ -13065,11 +13065,11 @@
/* compute the location of the voicemail spool directory */
snprintf(VM_SPOOL_DIR, sizeof(VM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR);
-
+ printf("TPS: Getting app_voicemail\n");
if (!(mwi_subscription_tps = ast_taskprocessor_get("app_voicemail", 0))) {
ast_log(AST_LOG_WARNING, "failed to reference mwi subscription taskprocessor. MWI will not work\n");
}
-
+ printf("TPS: Got app_voicemail\n");
if ((res = load_config(0)))
return res;
Modified: team/mjordan/1.8_instrumented/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/channels/chan_iax2.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/channels/chan_iax2.c (original)
+++ team/mjordan/1.8_instrumented/channels/chan_iax2.c Fri Jul 6 09:29:44 2012
@@ -14446,7 +14446,7 @@
{
peers = users = iax_peercallno_pvts = iax_transfercallno_pvts = NULL;
peercnts = callno_limits = calltoken_ignores = callno_pool = callno_pool_trunk = NULL;
-
+ printf("TPS: Getting iax2_transmit with TPS_REF_DEFAULT\n");
if (!(peers = ao2_container_alloc(MAX_PEER_BUCKETS, peer_hash_cb, peer_cmp_cb))) {
goto container_fail;
} else if (!(users = ao2_container_alloc(MAX_USER_BUCKETS, user_hash_cb, user_cmp_cb))) {
@@ -14466,7 +14466,7 @@
} else if (!(transmit_processor = ast_taskprocessor_get("iax2_transmit", TPS_REF_DEFAULT))) {
goto container_fail;
}
-
+ printf("TPS: Got iax2_transmit with TPS_REF_DEFAULT\n");
return 0;
container_fail:
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=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/main/asterisk.c (original)
+++ team/mjordan/1.8_instrumented/main/asterisk.c Fri Jul 6 09:29:44 2012
@@ -4047,13 +4047,14 @@
printf("%s[%d]\n", __FILE__, __LINE__);
exit(moduleresult == -2 ? 2 : 1);
}
-
+ printf("*** DONE LOADING MODULES ****\n");
/* loads the cli_permissoins.conf file needed to implement cli restrictions. */
ast_cli_perms_init(0);
-
+ printf("%s[%d]\n", __FILE__, __LINE__);
ast_stun_init();
-
+ printf("%s[%d]\n", __FILE__, __LINE__);
dnsmgr_start_refresh();
+ printf("%s[%d]\n", __FILE__, __LINE__);
/* We might have the option of showing a console, but for now just
do nothing... */
@@ -4063,25 +4064,32 @@
ast_verbose("%s", term_color(tmp, "Asterisk Ready.\n", COLOR_BRWHITE, COLOR_BLACK, sizeof(tmp)));
if (ast_opt_no_fork)
consolethread = pthread_self();
+ printf("%s[%d]\n", __FILE__, __LINE__);
if (pipe(sig_alert_pipe))
sig_alert_pipe[0] = sig_alert_pipe[1] = -1;
+ printf("%s[%d]\n", __FILE__, __LINE__);
ast_set_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED);
manager_event(EVENT_FLAG_SYSTEM, "FullyBooted", "Status: Fully Booted\r\n");
+ printf("%s[%d]\n", __FILE__, __LINE__);
ast_process_pending_reloads();
+ printf("%s[%d]\n", __FILE__, __LINE__);
pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
#ifdef __AST_DEBUG_MALLOC
__ast_mm_init();
#endif
+ printf("%s[%d]\n", __FILE__, __LINE__);
ast_lastreloadtime = ast_startuptime = ast_tvnow();
ast_cli_register_multiple(cli_asterisk, ARRAY_LEN(cli_asterisk));
+ printf("%s[%d]\n", __FILE__, __LINE__);
run_startup_commands();
+ printf("%s[%d]\n", __FILE__, __LINE__);
if (ast_opt_console) {
/* Console stuff now... */
Modified: team/mjordan/1.8_instrumented/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/ccss.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/main/ccss.c (original)
+++ team/mjordan/1.8_instrumented/main/ccss.c Fri Jul 6 09:29:44 2012
@@ -4315,9 +4315,11 @@
"Create generic monitor container"))) {
return -1;
}
+ printf("TPS: Getting CCSS core with TPS_REF_DEFAULT\n");
if (!(cc_core_taskprocessor = ast_taskprocessor_get("CCSS core", TPS_REF_DEFAULT))) {
return -1;
}
+ printf("TPS: Got CCSS core with TPS_REF_DEFAULT\n");
if (!(cc_sched_thread = ast_sched_thread_create())) {
return -1;
}
Modified: team/mjordan/1.8_instrumented/main/event.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/event.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/main/event.c (original)
+++ team/mjordan/1.8_instrumented/main/event.c Fri Jul 6 09:29:44 2012
@@ -1791,11 +1791,11 @@
return -1;
}
}
-
+ printf("TPS: Getting core_event_dispatcher\n");
if (!(event_dispatcher = ast_taskprocessor_get("core_event_dispatcher", 0))) {
return -1;
}
-
+ printf("TPS: Got core_event_dispatcher\n");
ast_cli_register_multiple(event_cli, ARRAY_LEN(event_cli));
return 0;
Modified: team/mjordan/1.8_instrumented/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/1.8_instrumented/main/pbx.c?view=diff&rev=369702&r1=369701&r2=369702
==============================================================================
--- team/mjordan/1.8_instrumented/main/pbx.c (original)
+++ team/mjordan/1.8_instrumented/main/pbx.c Fri Jul 6 09:29:44 2012
@@ -10282,10 +10282,11 @@
/* Initialize the PBX */
ast_verb(1, "Asterisk PBX Core Initializing\n");
+ printf("TPS: Getting pbx-core\n");
if (!(device_state_tps = ast_taskprocessor_get("pbx-core", 0))) {
ast_log(LOG_WARNING, "failed to create pbx-core taskprocessor\n");
}
-
+ printf("TPS: Got pbx-core\n");
ast_verb(1, "Registering builtin applications:\n");
ast_cli_register_multiple(pbx_cli, ARRAY_LEN(pbx_cli));
ast_data_register_multiple_core(pbx_data_providers, ARRAY_LEN(pbx_data_providers));
More information about the asterisk-commits
mailing list