retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-9691: don't call sql code inside hash_mutex due to circular mutex contention between hash_mutex and profile->dbh_mutex

This commit is contained in:
Mike Jerris 2016-11-03 14:52:56 -05:00
parent 04f5d30a9a
commit f34cbb9368
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -3897,6 +3897,8 @@ SWITCH_STANDARD_API(sofia_contact_function)
sofia_glue_release_profile(profile);
} else if (!zstr(domain)) {
sofia_profile_t *profiles[1024] = {0};
uint8_t i = 0, j;
switch_mutex_lock(mod_sofia_globals.hash_mutex);
if (mod_sofia_globals.profile_hash) {
switch_hash_index_t *hi;
@ -3906,12 +3908,19 @@ SWITCH_STANDARD_API(sofia_contact_function)
for (hi = switch_core_hash_first(mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(&hi)) {
switch_core_hash_this(hi, &var, NULL, &val);
if ((profile = (sofia_profile_t *) val) && !strcmp((char *)var, profile->name)) {
select_from_profile(profile, user, domain, concat, exclude_contact, &mystream, SWITCH_TRUE);
sofia_glue_profile_rdlock(profile);
profiles[i++] = profile;
profile = NULL;
}
}
}
switch_mutex_unlock(mod_sofia_globals.hash_mutex);
if (i) {
for (j = 0; j < i; j++) {
select_from_profile(profiles[j], user, domain, concat, exclude_contact, &mystream, SWITCH_TRUE);
sofia_glue_release_profile(profiles[j]);
}
}
}
reply = (char *) mystream.data;