From 8015cb8bb4eb2fd37f5fe0dbf12323e6ea2c17cd Mon Sep 17 00:00:00 2001 From: Chunsong Feng Date: Fri, 10 Dec 2021 10:18:36 +0000 Subject: [PATCH] msg/async: refactory rename_thread for DPDKStack The thread_name of the DPDK thread has been set during DPDK initialization. Signed-off-by: Chunsong Feng Reviewed-by: luo rixin Reviewed-by: Han Fengzhe --- src/msg/async/Stack.cc | 4 +--- src/msg/async/Stack.h | 6 ++++++ src/msg/async/dpdk/DPDKStack.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/msg/async/Stack.cc b/src/msg/async/Stack.cc index 55c25f60f5e..94a1bba5363 100644 --- a/src/msg/async/Stack.cc +++ b/src/msg/async/Stack.cc @@ -37,9 +37,7 @@ std::function NetworkStack::add_thread(Worker* w) { return [this, w]() { - char tp_name[16]; - sprintf(tp_name, "msgr-worker-%u", w->id); - ceph_pthread_setname(pthread_self(), tp_name); + rename_thread(w->id); const unsigned EventMaxWaitUs = 30000000; w->center.set_owner(); ldout(cct, 10) << __func__ << " starting" << dendl; diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h index 3ce87975bf5..97201787c73 100644 --- a/src/msg/async/Stack.h +++ b/src/msg/async/Stack.h @@ -299,6 +299,12 @@ class NetworkStack { std::function add_thread(Worker* w); virtual Worker* create_worker(CephContext *c, unsigned i) = 0; + virtual void rename_thread(unsigned id) { + static constexpr int TASK_COMM_LEN = 16; + char tp_name[TASK_COMM_LEN]; + sprintf(tp_name, "msgr-worker-%u", id); + ceph_pthread_setname(pthread_self(), tp_name); + } protected: CephContext *cct; diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h index e46bb6f5103..f05873572a3 100644 --- a/src/msg/async/dpdk/DPDKStack.h +++ b/src/msg/async/dpdk/DPDKStack.h @@ -254,6 +254,7 @@ class DPDKStack : public NetworkStack { virtual Worker* create_worker(CephContext *c, unsigned worker_id) override { return new DPDKWorker(c, worker_id); } + virtual void rename_thread(unsigned id) override {} public: explicit DPDKStack(CephContext *cct): NetworkStack(cct), eal(cct) { -- 2.39.5