[Freeswitch-svn] [commit] r9996 - freeswitch/trunk/src

[Freeswitch SVN]

Author: anthm
Date: Mon Oct 13 15:25:52 2008
New Revision: 9996

Modified:
   freeswitch/trunk/src/switch_xml.c

Log:
fix race in xml reloader

Modified: freeswitch/trunk/src/switch_xml.c
==============================================================================
--- freeswitch/trunk/src/switch_xml.c	(original)
+++ freeswitch/trunk/src/switch_xml.c	Mon Oct 13 15:25:52 2008
@@ -142,8 +142,7 @@
 static switch_thread_rwlock_t *RWLOCK = NULL;
 static switch_thread_rwlock_t *B_RWLOCK = NULL;
 static switch_mutex_t *XML_LOCK = NULL;
-static switch_mutex_t *XML_COUNT_LOCK = NULL;
-static uint32_t lock_count = 0;
+
 
 struct xml_section_t {
 	const char *name;
@@ -1524,9 +1523,6 @@
 
 SWITCH_DECLARE(switch_xml_t) switch_xml_root(void)
 {
-	switch_mutex_lock(XML_COUNT_LOCK);
-	lock_count++;
-	switch_mutex_unlock(XML_COUNT_LOCK);
 	switch_thread_rwlock_rdlock(RWLOCK);
 	return MAIN_XML_ROOT;
 }
@@ -1637,7 +1633,6 @@
 	*err = "Success";
 
 	switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
-	switch_mutex_init(&XML_COUNT_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
 	switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL);
 	switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL);
 
@@ -1926,19 +1921,12 @@
 	char **a, *s;
 
 
-	if (!xml)
+	if (!xml) {
 		return;
-
-	if (switch_test_flag(xml, SWITCH_XML_ROOT)) {
-		switch_mutex_lock(XML_COUNT_LOCK);
-		if (lock_count > 0) {
-			switch_thread_rwlock_unlock(RWLOCK);
-			lock_count--;
-		}
-		switch_mutex_unlock(XML_COUNT_LOCK);
 	}
 
 	if (xml == MAIN_XML_ROOT) {
+		switch_thread_rwlock_unlock(RWLOCK);
 		return;
 	}