kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-22 17:42:39 +00:00
Code Issues Projects Releases Wiki Activity

[Core] sqldb: Fix wrong lock order in switch_cache_db_release_db_handle()

Browse Source
This commit is contained in:
Andrey Volk 2021-04-17 01:47:05 +03:00
parent 5169e58aca
commit 1607214fd0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_core_sqldb.c
View File

@ -106,6 +106,7 @@ static void add_handle(switch_cache_db_handle_t *dbh, const char *db_str, const
switch_ssize_t hlen = -1; switch_ssize_t hlen = -1;
switch_mutex_lock(sql_manager.dbh_mutex); switch_mutex_lock(sql_manager.dbh_mutex);
switch_mutex_lock(dbh->mutex);
switch_set_string(dbh->creator, db_callsite_str); switch_set_string(dbh->creator, db_callsite_str);
@ -115,12 +116,11 @@ static void add_handle(switch_cache_db_handle_t *dbh, const char *db_str, const
dbh->use_count++; dbh->use_count++;
dbh->total_used_count++; dbh->total_used_count++;
sql_manager.total_used_handles++;
dbh->next = sql_manager.handle_pool; dbh->next = sql_manager.handle_pool;
sql_manager.handle_pool = dbh; sql_manager.handle_pool = dbh;
sql_manager.total_handles++; sql_manager.total_handles++;
switch_mutex_lock(dbh->mutex); sql_manager.total_used_handles++;
switch_mutex_unlock(sql_manager.dbh_mutex); switch_mutex_unlock(sql_manager.dbh_mutex);
} }
@ -359,15 +359,16 @@ SWITCH_DECLARE(void) switch_cache_db_release_db_handle(switch_cache_db_handle_t
break; break;
} }
switch_mutex_lock(sql_manager.dbh_mutex);
(*dbh)->last_used = switch_epoch_time_now(NULL); (*dbh)->last_used = switch_epoch_time_now(NULL);
if ((*dbh)->use_count) { if ((*dbh)->use_count) {
--(*dbh)->use_count; --(*dbh)->use_count;
} }
switch_mutex_unlock((*dbh)->mutex); switch_mutex_unlock((*dbh)->mutex);
sql_manager.total_used_handles--;
*dbh = NULL; *dbh = NULL;
switch_mutex_lock(sql_manager.dbh_mutex);
sql_manager.total_used_handles--;
switch_mutex_unlock(sql_manager.dbh_mutex); switch_mutex_unlock(sql_manager.dbh_mutex);
} }
} }