From: Chunsong Feng <fengchunsong@huawei.com>
Date: Fri, 10 Dec 2021 10:18:36 +0000 (+0000)
Subject: msg/async: refactory rename_thread for DPDKStack
X-Git-Tag: v17.1.0~166^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8015cb8bb4eb2fd37f5fe0dbf12323e6ea2c17cd;p=ceph.git

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 <fengchunsong@huawei.com>
Reviewed-by: luo rixin <luorixin@huawei.com>
Reviewed-by: Han Fengzhe  <hanfengzhe@hisilicon.com>
---

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<void ()> 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<void ()> 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) {