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

take back in some elements from the reverted patch that still make sense based on code review by Moc, thanks

Browse Source
This commit is contained in:
Anthony Minessale 2011-03-31 16:28:12 -05:00
parent 913ec9861e
commit 3ed59f1d1f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/switch_xml.c
View File

@ -137,6 +137,7 @@ static switch_memory_pool_t *XML_MEMORY_POOL = NULL;
static switch_thread_rwlock_t *B_RWLOCK = NULL; static switch_thread_rwlock_t *B_RWLOCK = NULL;
static switch_mutex_t *XML_LOCK = NULL; static switch_mutex_t *XML_LOCK = NULL;
static switch_mutex_t *REFLOCK = NULL; static switch_mutex_t *REFLOCK = NULL;
static switch_mutex_t *FILE_LOCK = NULL;
static switch_mutex_t *XML_GEN_LOCK = NULL; static switch_mutex_t *XML_GEN_LOCK = NULL;
@ -1527,8 +1528,10 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
abs = file; abs = file;
} }
switch_mutex_lock(FILE_LOCK);
if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) {
return NULL; goto done;
} }
if ((write_fd = open(new_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { if ((write_fd = open(new_file, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) {
@ -1549,13 +1552,19 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file)
} }
done: done:
switch_mutex_unlock(FILE_LOCK);
if (write_fd > -1) { if (write_fd > -1) {
close(write_fd); close(write_fd);
} }
if (fd > -1) { if (fd > -1) {
close(fd); close(fd);
} }
switch_safe_free(new_file); switch_safe_free(new_file);
return xml; return xml;
} }
@ -2054,6 +2063,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, cons
switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
switch_mutex_init(&REFLOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&REFLOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
switch_mutex_init(&FILE_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL);
@ -2071,7 +2081,9 @@ SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, cons
SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void) SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void)
{ {
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
switch_mutex_lock(XML_LOCK); switch_mutex_lock(XML_LOCK);
switch_mutex_lock(REFLOCK);
if (MAIN_XML_ROOT) { if (MAIN_XML_ROOT) {
switch_xml_t xml = MAIN_XML_ROOT; switch_xml_t xml = MAIN_XML_ROOT;
@ -2081,6 +2093,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void)
} }
switch_mutex_unlock(XML_LOCK); switch_mutex_unlock(XML_LOCK);
switch_mutex_unlock(REFLOCK);
return status; return status;
} }