[svn-commits] alecdavis: trunk r310833 - in /trunk: ./ main/utils.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Mon Mar 14 20:36:26 2011
New Revision: 310833

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310833
Log:
Merged revisions 310781 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r310781 | alecdavis | 2011-03-15 14:00:55 +1300 (Tue, 15 Mar 2011) | 10 lines
  
  core show locks: display ThreadID in hexadecimal
  
  Allow easier cross referencing of thread ID's with GDB backtraces
  
  (closes issue #18968)
  Reported by: alecdavis
  Patches: 
        bug18968.diff.txt uploaded by alecdavis (license 585)
........

Modified:
    trunk/   (props changed)
    trunk/main/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/utils.c?view=diff&rev=310833&r1=310832&r2=310833
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Mon Mar 14 20:36:26 2011
@@ -915,7 +915,7 @@
 	AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
 		int i;
 		if (lock_info->num_locks) {
-			ast_str_append(&str, 0, "=== Thread ID: %ld (%s)\n", (long) lock_info->thread_id,
+			ast_str_append(&str, 0, "=== Thread ID: 0x%lx (%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++) {