kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-12 20:27:19 +00:00
Code Issues Projects Releases Wiki Activity

fix race cond

Browse Source
This commit is contained in:
Anthony Minessale 2012-10-29 15:16:55 -05:00
parent de5f0c5144
commit 8626978201
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/switch_core_sqldb.c
View File

@ -1202,6 +1202,7 @@ struct switch_sql_queue_manager {
const char *name; const char *name;
switch_cache_db_handle_t *event_db; switch_cache_db_handle_t *event_db;
switch_queue_t **sql_queue; switch_queue_t **sql_queue;
uint32_t *pre_written;
uint32_t *written; uint32_t *written;
uint32_t numq; uint32_t numq;
char *dsn; char *dsn;
@ -1439,6 +1440,7 @@ SWITCH_DECLARE(switch_status_t) switch_sql_queue_manager_init_name(const char *n
qm->sql_queue = switch_core_alloc(qm->pool, sizeof(switch_queue_t *) * numq); qm->sql_queue = switch_core_alloc(qm->pool, sizeof(switch_queue_t *) * numq);
qm->written = switch_core_alloc(qm->pool, sizeof(uint32_t) * numq); qm->written = switch_core_alloc(qm->pool, sizeof(uint32_t) * numq);
qm->pre_written = switch_core_alloc(qm->pool, sizeof(uint32_t) * numq);
for (i = 0; i < qm->numq; i++) { for (i = 0; i < qm->numq; i++) {
switch_queue_create(&qm->sql_queue[i], SWITCH_SQL_QUEUE_LEN, qm->pool); switch_queue_create(&qm->sql_queue[i], SWITCH_SQL_QUEUE_LEN, qm->pool);
@ -1468,6 +1470,12 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
if (io_mutex) switch_mutex_lock(io_mutex); if (io_mutex) switch_mutex_lock(io_mutex);
switch_mutex_lock(qm->mutex);
for (i = 0; i < qm->numq; i++) {
qm->pre_written[i] = 0;
}
switch_mutex_unlock(qm->mutex);
if (!zstr(qm->pre_trans_execute)) { if (!zstr(qm->pre_trans_execute)) {
switch_cache_db_execute_sql_real(qm->event_db, qm->pre_trans_execute, &errmsg); switch_cache_db_execute_sql_real(qm->event_db, qm->pre_trans_execute, &errmsg);
if (errmsg) { if (errmsg) {
@ -1534,9 +1542,7 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
if (pop) { if (pop) {
if ((status = switch_cache_db_execute_sql(qm->event_db, (char *) pop, NULL)) == SWITCH_STATUS_SUCCESS) { if ((status = switch_cache_db_execute_sql(qm->event_db, (char *) pop, NULL)) == SWITCH_STATUS_SUCCESS) {
switch_mutex_lock(qm->mutex); qm->pre_written[i]++;
qm->written[i]++;
switch_mutex_unlock(qm->mutex);
ttl++; ttl++;
} }
free(pop); free(pop);
@ -1588,6 +1594,14 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
} }
} }
switch_mutex_lock(qm->mutex);
for (i = 0; i < qm->numq; i++) {
qm->written[i] += qm->pre_written[i];
}
switch_mutex_unlock(qm->mutex);
if (io_mutex) switch_mutex_unlock(io_mutex); if (io_mutex) switch_mutex_unlock(io_mutex);
return ttl; return ttl;