kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_config_sqlite3: Only join threads that we started

Browse Source 
ASTERISK-28477 #close
Reported by: Dennis

ASTERISK-28478 #close
Reported by: Dennis

Change-Id: I77347ad46a86dc5b35ed68270cee56acefb4f475
This commit is contained in:
Sean Bright
2019-07-23 13:58:31 -04:00
parent 7646f4196b
commit 2424ecaf66
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_config_sqlite3.c
View File

@@ -102,6 +102,7 @@ struct realtime_sqlite3_db {
unsigned int debug:1; unsigned int debug:1;
unsigned int exiting:1; unsigned int exiting:1;
unsigned int wakeup:1; unsigned int wakeup:1;
unsigned int has_batch_thread:1;
unsigned int batch; unsigned int batch;
int busy_timeout; int busy_timeout;
}; };
@@ -367,13 +368,14 @@ void db_start_batch(struct realtime_sqlite3_db *db)
if (db->batch) { if (db->batch) {
ast_cond_init(&db->cond, NULL); ast_cond_init(&db->cond, NULL);
ao2_ref(db, +1); ao2_ref(db, +1);
ast_pthread_create_background(&db->syncthread, NULL, db_sync_thread, db); db->has_batch_thread = !ast_pthread_create_background(&db->syncthread, NULL, db_sync_thread, db);
} }
} }
void db_stop_batch(struct realtime_sqlite3_db *db) void db_stop_batch(struct realtime_sqlite3_db *db)
{ {
if (db->batch) { if (db->has_batch_thread) {
db->has_batch_thread = 0;
db->exiting = 1; db->exiting = 1;
db_sync(db); db_sync(db);
pthread_join(db->syncthread, NULL); pthread_join(db->syncthread, NULL);