Merged revisions 115735 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115735 | mmichelson | 2008-05-12 12:51:14 -0500 (Mon, 12 May 2008) | 7 lines

If a thread holds no locks, do not print any information on the thread when issuing
a core show locks command. This will help to de-clutter output somewhat.

Russell said it would be fine to place this improvement in the 1.4 branch, so that's
why it's going here too.

........

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

diff --git a/main/utils.c b/main/utils.c
index 65b0494ebcee37b633321ff4485817d2a3e22587..a34514b981183f1d35a380d569919f94e0c655e1 100644 (file)
--- a/main/utils.c
+++ b/main/utils.c
@@ -832,19 +832,21 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
        pthread_mutex_lock(&lock_infos_lock.mutex);
        AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
                int i;
-               ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
-                       lock_info->thread_name);
-               pthread_mutex_lock(&lock_info->lock);
-               for (i = 0; str && i < lock_info->num_locks; i++) {
-                       append_lock_information(&str, lock_info, i);
+               if (lock_info->num_locks) {
+                       ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
+                               lock_info->thread_name);
+                       pthread_mutex_lock(&lock_info->lock);
+                       for (i = 0; str && i < lock_info->num_locks; i++) {
+                               append_lock_information(&str, lock_info, i);
+                       }
+                       pthread_mutex_unlock(&lock_info->lock);
+                       if (!str)
+                               break;
+                       ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n"
+                                      "===\n");
+                       if (!str)
+                               break;
                }
-               pthread_mutex_unlock(&lock_info->lock);
-               if (!str)
-                       break;
-               ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n"
-                              "===\n");
-               if (!str)
-                       break;
        }
        pthread_mutex_unlock(&lock_infos_lock.mutex);