From 1d1a672bcac7b36ff35e48fb9633d56c8e733343 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Mon, 9 Jun 2014 15:15:58 +0200
Subject: ddb: print task names if available

* ddb/db_print.c (db_print_task): Print task name if available.
* i386/i386/db_interface.c (db_task_name): Likewise.
* i386/i386/db_machdep.h (DB_GNUMACH_TASK_NAME): Remove unused definition.
---
 ddb/db_print.c           | 7 ++++++-
 i386/i386/db_interface.c | 4 ++--
 i386/i386/db_machdep.h   | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ddb/db_print.c b/ddb/db_print.c
index c015d84..1cbff64 100644
--- a/ddb/db_print.c
+++ b/ddb/db_print.c
@@ -258,7 +258,12 @@ db_print_task(
 	} else {
 	    if (flag & OPTION_TASK_TITLE)
 		db_printf("    TASK        THREADS\n");
-	    db_printf("%3d (%0*X): ", task_id, 2*sizeof(vm_offset_t), task);
+	    if (task->name[0])
+		db_printf("%3d %s (%0*X): ", task_id, task->name,
+			  2*sizeof(vm_offset_t), task);
+	    else
+		db_printf("%3d (%0*X): ", task_id,
+			  2*sizeof(vm_offset_t), task);
 	    if (task->thread_count == 0) {
 		db_printf("no threads\n");
 	    } else {
diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c
index 1337685..b442b86 100644
--- a/i386/i386/db_interface.c
+++ b/i386/i386/db_interface.c
@@ -730,8 +730,8 @@ db_task_name(
 	vm_offset_t vaddr, kaddr;
 	unsigned sp;
 
-	if (task->map->pmap == kernel_pmap) {
-		db_printf(DB_GNUMACH_TASK_NAME);
+	if (task->name[0]) {
+		db_printf("%s", task->name);
 		return;
 	}
 
diff --git a/i386/i386/db_machdep.h b/i386/i386/db_machdep.h
index c6ea3ca..ae1f9c0 100644
--- a/i386/i386/db_machdep.h
+++ b/i386/i386/db_machdep.h
@@ -93,7 +93,6 @@ db_regs_t	ddb_regs;	/* register state */
 #define DB_TASK_NAME_TITLE	"COMMAND                "
 #define DB_TASK_NAME_LEN	23
 #define DB_NULL_TASK_NAME	"?                      "
-#define DB_GNUMACH_TASK_NAME	"gnumach                "
 
 /* macro for checking if a thread has used floating-point */
 
-- 
cgit v1.2.3