kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_config_sqlite3: Only join threads that we started" into 13

Browse Source
This commit is contained in:
George Joseph
2019-07-25 06:59:24 -05:00
committed by Gerrit Code Review
parent 8e09fbb4e9 202fdc88dd
commit 16fe80d8da
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

@@ -104,6 +104,7 @@ struct realtime_sqlite3_db {
unsigned int debug:1;
unsigned int exiting:1;
unsigned int wakeup:1;
unsigned int has_batch_thread:1;
unsigned int batch;
};
@@ -368,13 +369,14 @@ void db_start_batch(struct realtime_sqlite3_db *db)
if (db->batch) {
ast_cond_init(&db->cond, NULL);
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)
{
if (db->batch) {
if (db->has_batch_thread) {
db->has_batch_thread = 0;
db->exiting = 1;
db_sync(db);
pthread_join(db->syncthread, NULL);