From 380bc2b68ccdef89f98c09c516b385f6ae5a47e4 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 26 Apr 2006 19:29:56 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1265 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core.c | 5 +++-- src/switch_event.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/switch_core.c b/src/switch_core.c index 81e0a5355b..dc25e69f3f 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -2359,13 +2359,14 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread *thread, vo uint32_t itterations = 0; uint8_t trans = 0; switch_time_t last_commit = switch_time_now(); - uint32_t work = 0, freq = 1000, target = 500, diff = 0; + uint32_t freq = 1000, target = 500, diff = 0; - runtime.event_db = switch_core_db_handle(); switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool); for(;;) { + uint32_t work = 0; + if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { char *sql = (char *) pop; diff --git a/src/switch_event.c b/src/switch_event.c index e169c5456d..7cb50e675e 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -172,10 +172,10 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void any = len[1] + len[2] + len[0]; if (!any) { - switch_yield(1000); if (THREAD_RUNNING != 1) { break; } + switch_yield(1000); continue; } @@ -197,6 +197,8 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void THREAD_RUNNING--; } } + + THREAD_RUNNING = 0; return NULL; }