From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Tue, 15 Mar 2011 00:31:56 +0000 (+0000)
Subject: Merged revisions 310779 via svnmerge from
X-Git-Tag: 1.6.2.19-rc1~3^2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22540b3198aea81d611862d483d05bc6317f1f73;p=thirdparty%2Fasterisk.git

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

........
  r310779 | alecdavis | 2011-03-15 13:26:09 +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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@310780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/utils.c b/main/utils.c
index cdf07451d3..b687b8e6eb 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -875,7 +875,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
 	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++) {