kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1264 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-04-26 19:11:49 +00:00
parent b81e4d6c97
commit 76b63d3a38
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/switch_core.c
View File

@@ -2361,10 +2361,10 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread *thread, vo
switch_time_t last_commit = switch_time_now();
uint32_t work = 0, freq = 1000, target = 500, diff = 0;
if (!runtime.event_db) {
runtime.event_db = switch_core_db_handle();
}
runtime.event_db = switch_core_db_handle();
switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool);
for(;;) {
if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) {
char *sql = (char *) pop;
@@ -2565,18 +2565,15 @@ SWITCH_DECLARE(switch_status) switch_core_init(char *console)
/* INIT APR and Create the pool context */
if (apr_initialize() != SWITCH_STATUS_SUCCESS) {
apr_terminate();
fprintf(stderr, "FATAL ERROR! Could not initilize APR\n");
return SWITCH_STATUS_MEMERR;
}
if (apr_pool_create(&runtime.memory_pool, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n");
fprintf(stderr, "FATAL ERROR! Could not allocate memory pool\n");
switch_core_destroy();
return SWITCH_STATUS_MEMERR;
}
assert(runtime.memory_pool != NULL);
switch_log_init(runtime.memory_pool);
switch_core_sql_thread_launch();
if(console) {
if (*console != '/') {
@@ -2589,9 +2586,9 @@ SWITCH_DECLARE(switch_status) switch_core_init(char *console)
runtime.console = stdout;
}
switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool);
assert(runtime.memory_pool != NULL);
switch_log_init(runtime.memory_pool);
switch_core_sql_thread_launch();
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Allocated memory pool. Sessions are %u bytes\n", sizeof(struct switch_core_session));
switch_event_init(runtime.memory_pool);