mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-26 12:31:00 +01:00
Code Issues Projects Releases Wiki Activity

Revert by hand merge PR825 in favor PR755 more simple solution

Browse Source
This commit is contained in:
Mészáros Mihály 2021-09-22 13:32:34 +02:00
parent b5a597836b
commit a19bc7c464
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/relay/dbdrivers/dbd_sqlite.c
View File

@ -45,13 +45,11 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
static pthread_mutex_t rc_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t rc_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t rc_cond = PTHREAD_COND_INITIALIZER; static pthread_cond_t rc_cond = PTHREAD_COND_INITIALIZER;
static int read_threads = 0; static int read_threads = 0;
static int write_level = 0; static int write_level = 0;
static pthread_t write_thread = 0; static pthread_t write_thread = 0;
static int sqlite_initialized = 0;
static void sqlite_lock(int write) static void sqlite_lock(int write)
{ {
@ -97,11 +95,7 @@ static void sqlite_unlock(int write)
////////////////////////////////////////////////// //////////////////////////////////////////////////
static int sqlite_init_multithreaded(void) { static void sqlite_init_multithreaded(void) {
if (sqlite_initialized) {
return 0;
}
sqlite_initialized = 1;
#if defined(SQLITE_CONFIG_MULTITHREAD) #if defined(SQLITE_CONFIG_MULTITHREAD)
if (sqlite3_threadsafe() > 0) { if (sqlite3_threadsafe() > 0) {
@ -110,17 +104,17 @@ static int sqlite_init_multithreaded(void) {
retCode = sqlite3_config(SQLITE_CONFIG_SERIALIZED); retCode = sqlite3_config(SQLITE_CONFIG_SERIALIZED);
if (retCode != SQLITE_OK) { if (retCode != SQLITE_OK) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "setting sqlite thread safe mode to serialized failed!!! return code: %d\n", retCode); TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "setting sqlite thread safe mode to serialized failed!!! return code: %d\n", retCode);
return -1; return;
} }
} }
sqlite3_initialize(); sqlite3_initialize();
} else { } else {
TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Your SQLite database is not compiled to be threadsafe.\n"); TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Your SQLite database is not compiled to be threadsafe.\n");
return -1; return;
} }
#endif #endif
return 0; return;
} }
static int donot_print_connection_success = 0; static int donot_print_connection_success = 0;
@ -185,7 +179,6 @@ static sqlite3 * get_sqlite_connection(void) {
sqlite3 *sqliteconnection = (sqlite3 *)pthread_getspecific(connection_key); sqlite3 *sqliteconnection = (sqlite3 *)pthread_getspecific(connection_key);
if(!sqliteconnection) { if(!sqliteconnection) {
pthread_mutex_lock(&init_mutex);
fix_user_directory(pud->userdb); fix_user_directory(pud->userdb);
(void) pthread_once(&sqlite_init_once, sqlite_init_multithreaded); (void) pthread_once(&sqlite_init_once, sqlite_init_multithreaded);
@ -208,8 +201,6 @@ static sqlite3 * get_sqlite_connection(void) {
if(sqliteconnection) { if(sqliteconnection) {
(void) pthread_setspecific(connection_key, sqliteconnection); (void) pthread_setspecific(connection_key, sqliteconnection);
} }
pthread_mutex_unlock(&init_mutex);
} }
return sqliteconnection; return sqliteconnection;
} }