[asterisk-commits] mvanbaak: branch 1.4 r216435 - in /branches/1.4: include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Fri Sep  4 08:56:10 2009
New Revision: 216435

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216435
Log:
make asterisk compile under devmode with DEBUG_THREADS enabled on OpenBSD

Modified:
    branches/1.4/include/asterisk/lock.h
    branches/1.4/main/utils.c

Modified: branches/1.4/include/asterisk/lock.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/include/asterisk/lock.h?view=diff&rev=216435&r1=216434&r2=216435
==============================================================================
--- branches/1.4/include/asterisk/lock.h (original)
+++ branches/1.4/include/asterisk/lock.h Fri Sep  4 08:56:10 2009
@@ -1027,7 +1027,7 @@
 	do {
 		struct timeval _start = ast_tvnow(), _diff;
 		for (;;) {
-			if (!(res = pthread_rwlock_tryrdlock(&t->lock))) {
+			if (!(res = pthread_rwlock_tryrdlock(lock))) {
 				break;
 			}
 			_diff = ast_tvsub(ast_tvnow(), _start);
@@ -1076,7 +1076,7 @@
 	do {
 		struct timeval _start = ast_tvnow(), _diff;
 		for (;;) {
-			if (!(res = pthread_rwlock_trywrlock(&t->lock))) {
+			if (!(res = pthread_rwlock_trywrlock(lock))) {
 				break;
 			}
 			_diff = ast_tvsub(ast_tvnow(), _start);

Modified: branches/1.4/main/utils.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/main/utils.c?view=diff&rev=216435&r1=216434&r2=216435
==============================================================================
--- branches/1.4/main/utils.c (original)
+++ branches/1.4/main/utils.c Fri Sep  4 08:56:10 2009
@@ -726,7 +726,7 @@
 	AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
 		int i;
 		if (lock_info->num_locks) {
-			ast_dynamic_str_append(&str, 0, "=== Thread ID: %u (%s)\n", (int) lock_info->thread_id,
+			ast_dynamic_str_append(&str, 0, "=== Thread ID: %ld (%s)\n", (long) lock_info->thread_id,
 				lock_info->thread_name);
 			pthread_mutex_lock(&lock_info->lock);
 			for (i = 0; str && i < lock_info->num_locks; i++) {