[svn-commits] russell: branch 1.6.1 r162416 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  9 16:34:55 2008
New Revision: 162416

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162416
Log:
Merged revisions 162414 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r162414 | russell | 2008-12-09 16:25:06 -0600 (Tue, 09 Dec 2008) | 16 lines

Merged revisions 162413 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162413 | russell | 2008-12-09 16:17:39 -0600 (Tue, 09 Dec 2008) | 8 lines

Remove the test_for_thread_safety() function completely.

The test is not valid.  Besides, if we actually suspected that recursive
mutexes were not working, we would get a ton of LOG_ERROR messages when
DEBUG_THREADS is turned on.

(inspired by a discussion on the asterisk-dev list)

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/utils.h
    branches/1.6.1/main/asterisk.c
    branches/1.6.1/main/utils.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/utils.h?view=diff&rev=162416&r1=162415&r2=162416
==============================================================================
--- branches/1.6.1/include/asterisk/utils.h (original)
+++ branches/1.6.1/include/asterisk/utils.h Tue Dec  9 16:34:55 2008
@@ -306,8 +306,6 @@
 {
 	*input /= *value;
 }
-
-int test_for_thread_safety(void);
 
 #ifdef localtime_r
 #undef localtime_r

Modified: branches/1.6.1/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/asterisk.c?view=diff&rev=162416&r1=162415&r2=162416
==============================================================================
--- branches/1.6.1/main/asterisk.c (original)
+++ branches/1.6.1/main/asterisk.c Tue Dec  9 16:34:55 2008
@@ -3290,10 +3290,6 @@
 	}
 #endif
 
-	/* Test recursive mutex locking. */
-	if (test_for_thread_safety())
-		ast_verbose("Warning! Asterisk is not thread safe.\n");
-
 	ast_event_init();
 
 	ast_makesocket();

Modified: branches/1.6.1/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/utils.c?view=diff&rev=162416&r1=162415&r2=162416
==============================================================================
--- branches/1.6.1/main/utils.c (original)
+++ branches/1.6.1/main/utils.c Tue Dec  9 16:34:55 2008
@@ -224,68 +224,6 @@
 		return NULL;
 #endif
 	return &hp->hp;
-}
-
-
-
-AST_MUTEX_DEFINE_STATIC(test_lock);
-AST_MUTEX_DEFINE_STATIC(test_lock2);
-static pthread_t test_thread; 
-static int lock_count = 0;
-static int test_errors = 0;
-
-/*! \brief This is a regression test for recursive mutexes.
-   test_for_thread_safety() will return 0 if recursive mutex locks are
-   working properly, and non-zero if they are not working properly. */
-static void *test_thread_body(void *data) 
-{ 
-	ast_mutex_lock(&test_lock);
-	lock_count += 10;
-	if (lock_count != 10) 
-		test_errors++;
-	ast_mutex_lock(&test_lock);
-	lock_count += 10;
-	if (lock_count != 20) 
-		test_errors++;
-	ast_mutex_lock(&test_lock2);
-	ast_mutex_unlock(&test_lock);
-	lock_count -= 10;
-	if (lock_count != 10) 
-		test_errors++;
-	ast_mutex_unlock(&test_lock);
-	lock_count -= 10;
-	ast_mutex_unlock(&test_lock2);
-	if (lock_count != 0) 
-		test_errors++;
-	return NULL;
-} 
-
-int test_for_thread_safety(void)
-{ 
-	ast_mutex_lock(&test_lock2);
-	ast_mutex_lock(&test_lock);
-	lock_count += 1;
-	ast_mutex_lock(&test_lock);
-	lock_count += 1;
-	ast_pthread_create(&test_thread, NULL, test_thread_body, NULL); 
-	usleep(100);
-	if (lock_count != 2) 
-		test_errors++;
-	ast_mutex_unlock(&test_lock);
-	lock_count -= 1;
-	usleep(100); 
-	if (lock_count != 1) 
-		test_errors++;
-	ast_mutex_unlock(&test_lock);
-	lock_count -= 1;
-	if (lock_count != 0) 
-		test_errors++;
-	ast_mutex_unlock(&test_lock2);
-	usleep(100);
-	if (lock_count != 0) 
-		test_errors++;
-	pthread_join(test_thread, NULL);
-	return(test_errors);          /* return 0 on success. */
 }
 
 /*! \brief Produce 32 char MD5 hash of value. */