From dcd57ea21bab0f6834ec878fea1a623cc7ce11bd Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Wed, 24 Jan 2018 11:39:31 +0200 Subject: [PATCH] MXS-1623 Expose descriptor counts through maxadmin --- server/core/poll.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/core/poll.cc b/server/core/poll.cc index ddefc7de3..b40cae50a 100644 --- a/server/core/poll.cc +++ b/server/core/poll.cc @@ -240,8 +240,8 @@ dShowThreads(DCB *dcb) { dcb_printf(dcb, "Polling Threads.\n\n"); - dcb_printf(dcb, " ID | State \n"); - dcb_printf(dcb, "----+------------\n"); + dcb_printf(dcb, " ID | State | #descriptors (curr) | #descriptors (tot) |\n"); + dcb_printf(dcb, "----+------------+---------------------+---------------------+\n"); for (int i = 0; i < n_threads; i++) { Worker* worker = Worker::get(i); @@ -271,7 +271,12 @@ dShowThreads(DCB *dcb) ss_dassert(!true); } - dcb_printf(dcb, " %2d | %s\n", i, state); + uint32_t nCurrent; + uint64_t nTotal; + + worker->get_descriptor_counts(&nCurrent, &nTotal); + + dcb_printf(dcb, " %2d | %10s | %19" PRIu32 " | %19" PRIu64 " |\n", i, state, nCurrent, nTotal); } }