From: Kefu Chai <kchai@redhat.com>
Date: Wed, 24 Feb 2021 04:44:47 +0000 (+0800)
Subject: msg/async: do not pass worker id to Stack::spawn_worker()
X-Git-Tag: v16.2.15~8^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e71091d87ce78cc6120e704f2faa617bbbea7ceb;p=ceph.git

msg/async: do not pass worker id to Stack::spawn_worker()

this parameter is not used anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2ecaa16673f018b3472d640b16a66500c7d3012f)
---

diff --git a/src/msg/async/PosixStack.h b/src/msg/async/PosixStack.h
index fba45c06bd6f..a4ff65b28f46 100644
--- a/src/msg/async/PosixStack.h
+++ b/src/msg/async/PosixStack.h
@@ -47,7 +47,7 @@ class PosixNetworkStack : public NetworkStack {
  public:
   explicit PosixNetworkStack(CephContext *c);
 
-  void spawn_worker(unsigned i, std::function<void ()> &&func) override {
+  void spawn_worker(std::function<void ()> &&func) override {
     threads.emplace_back(std::move(func));
   }
   void join_worker(unsigned i) override {
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
index c5114ce37d0e..855527bfdb8d 100644
--- a/src/msg/async/Stack.h
+++ b/src/msg/async/Stack.h
@@ -338,7 +338,7 @@ class NetworkStack {
   }
 
   // direct is used in tests only
-  virtual void spawn_worker(unsigned i, std::function<void ()> &&) = 0;
+  virtual void spawn_worker(std::function<void ()> &&) = 0;
   virtual void join_worker(unsigned i) = 0;
 
   virtual bool is_ready() { return true; };
diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc
index f17767394260..2bfe45e9b44c 100644
--- a/src/msg/async/dpdk/DPDKStack.cc
+++ b/src/msg/async/dpdk/DPDKStack.cc
@@ -242,7 +242,7 @@ int DPDKWorker::connect(const entity_addr_t &addr, const SocketOptions &opts, Co
   return r;
 }
 
-void DPDKStack::spawn_worker(unsigned i, std::function<void ()> &&func)
+void DPDKStack::spawn_worker(std::function<void ()> &&func)
 {
   // create a extra master thread
   //
diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h
index 8a1f0089978c..ad264a8495b8 100644
--- a/src/msg/async/dpdk/DPDKStack.h
+++ b/src/msg/async/dpdk/DPDKStack.h
@@ -258,7 +258,7 @@ class DPDKStack : public NetworkStack {
   {}
   virtual bool support_local_listen_table() const override { return true; }
 
-  virtual void spawn_worker(unsigned i, std::function<void ()> &&func) override;
+  virtual void spawn_worker(std::function<void ()> &&func) override;
   virtual void join_worker(unsigned i) override;
 };
 
diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
index f6f0a65f650e..ef246a6e1a3e 100644
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -801,7 +801,7 @@ Worker* RDMAStack::create_worker(CephContext *c, unsigned worker_id)
   return w;
 }
 
-void RDMAStack::spawn_worker(unsigned i, std::function<void ()> &&func)
+void RDMAStack::spawn_worker(std::function<void ()> &&func)
 {
   threads.emplace_back(std::move(func));
 }
diff --git a/src/msg/async/rdma/RDMAStack.h b/src/msg/async/rdma/RDMAStack.h
index 39e8d3d8c1aa..aa64ca57e6fa 100644
--- a/src/msg/async/rdma/RDMAStack.h
+++ b/src/msg/async/rdma/RDMAStack.h
@@ -333,7 +333,7 @@ class RDMAStack : public NetworkStack {
   virtual ~RDMAStack();
   virtual bool nonblock_connect_need_writable_event() const override { return false; }
 
-  virtual void spawn_worker(unsigned i, std::function<void ()> &&func) override;
+  virtual void spawn_worker(std::function<void ()> &&func) override;
   virtual void join_worker(unsigned i) override;
   virtual bool is_ready() override { return fork_finished.load(); };
   virtual void ready() override { fork_finished = true; };