From 8d3a5cad4156e08d624ccc9a9e83d5e8458f05d4 Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Thu, 27 Jun 2024 14:15:01 +0200 Subject: [PATCH] fixup! show threads: displaying the same thread id's as in log --- sysdep/unix/io-loop.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c index 823167b2..16ffbb2b 100644 --- a/sysdep/unix/io-loop.c +++ b/sysdep/unix/io-loop.c @@ -1314,9 +1314,10 @@ bird_thread_show(struct bird_thread_syncer *sync) bird_thread_show_spent_time(tsd, "Idle ", &this_thread->idle); } else - tsd_append("Thread %04x %s working %t s overhead %t s", - THIS_THREAD_ID, this_thread->busy_active ? " [busy]" : "", - total_time_ns NS, this_thread->overhead.total_ns NS); + tsd_append("%04x%s % 9.3t s % 9.3t s % 9.3t s", + THIS_THREAD_ID, this_thread->busy_active ? " [busy]" : " ", + total_time_ns NS, this_thread->overhead.total_ns NS, + (ns_now() - this_thread->meta->last_transition_ns) NS); } static void @@ -1381,6 +1382,9 @@ cmd_show_threads(int show_loops) this_cli->cont = bird_thread_show_cli_cont; this_cli->cleanup = bird_thread_show_cli_cleanup; + if (!show_loops) + tsd_append("Thread ID Working Overhead Last Pickup/Drop"); + bird_thread_sync_all(&tsd->sync, bird_thread_show, cmd_show_threads_done, "Show Threads"); }