From: Kefu Chai <kchai@redhat.com>
Date: Fri, 4 Dec 2020 03:51:53 +0000 (+0800)
Subject: msg/async: drop "NetworkStack::type"
X-Git-Tag: v16.1.0~286^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f90b578e88daec0214454c78985b248b31b88c9;p=ceph.git

msg/async: drop "NetworkStack::type"

it is not used anywhere.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index c971546a10f7..a38e82cf39cc 100644
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -332,7 +332,7 @@ int PosixWorker::connect(const entity_addr_t &addr, const SocketOptions &opts, C
   return 0;
 }
 
-PosixNetworkStack::PosixNetworkStack(CephContext *c, const std::string &t)
-    : NetworkStack(c, t)
+PosixNetworkStack::PosixNetworkStack(CephContext *c)
+    : NetworkStack(c)
 {
 }
diff --git a/src/msg/async/PosixStack.h b/src/msg/async/PosixStack.h
index e1d85f1f4b72..a7e2f249cafe 100644
--- a/src/msg/async/PosixStack.h
+++ b/src/msg/async/PosixStack.h
@@ -45,7 +45,7 @@ class PosixNetworkStack : public NetworkStack {
   }
 
  public:
-  explicit PosixNetworkStack(CephContext *c, const std::string &t);
+  explicit PosixNetworkStack(CephContext *c);
 
   void spawn_worker(unsigned i, std::function<void ()> &&func) override {
     threads.resize(i+1);
diff --git a/src/msg/async/Stack.cc b/src/msg/async/Stack.cc
index bf1cd8203b6c..37e15634d79c 100644
--- a/src/msg/async/Stack.cc
+++ b/src/msg/async/Stack.cc
@@ -69,14 +69,14 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
   std::shared_ptr<NetworkStack> stack = nullptr;
 
   if (t == "posix")
-    stack.reset(new PosixNetworkStack(c, t));
+    stack.reset(new PosixNetworkStack(c));
 #ifdef HAVE_RDMA
   else if (t == "rdma")
-    stack.reset(new RDMAStack(c, t));
+    stack.reset(new RDMAStack(c));
 #endif
 #ifdef HAVE_DPDK
   else if (t == "dpdk")
-    stack.reset(new DPDKStack(c, t));
+    stack.reset(new DPDKStack(c));
 #endif
 
   if (stack == nullptr) {
@@ -98,7 +98,8 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
   return stack;
 }
 
-NetworkStack::NetworkStack(CephContext *c, const std:: string &t): type(t), started(false), cct(c)
+NetworkStack::NetworkStack(CephContext *c)
+  : cct(c)
 {
   ceph_assert(cct->_conf->ms_async_op_threads > 0);
 
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
index 1bf4baa519c7..6a2188b5a9c7 100644
--- a/src/msg/async/Stack.h
+++ b/src/msg/async/Stack.h
@@ -293,7 +293,6 @@ class Worker {
 };
 
 class NetworkStack {
-  std::string type;
   unsigned num_workers = 0;
   ceph::spinlock pool_spin;
   bool started = false;
@@ -306,7 +305,7 @@ class NetworkStack {
   CephContext *cct;
   std::vector<Worker*> workers;
 
-  explicit NetworkStack(CephContext *c, const std::string &t);
+  explicit NetworkStack(CephContext *c);
  public:
   NetworkStack(const NetworkStack &) = delete;
   NetworkStack& operator=(const NetworkStack &) = delete;
diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h
index 43ae8003c39c..926adaffcbb7 100644
--- a/src/msg/async/dpdk/DPDKStack.h
+++ b/src/msg/async/dpdk/DPDKStack.h
@@ -254,7 +254,7 @@ class DPDKStack : public NetworkStack {
   }
 
  public:
-  explicit DPDKStack(CephContext *cct, const string &t): NetworkStack(cct, t) {
+  explicit DPDKStack(CephContext *cct): NetworkStack(cct) {
     funcs.resize(cct->_conf->ms_async_max_op_threads);
   }
   virtual bool support_local_listen_table() const override { return true; }
diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
index c17150227bcd..49bafd0b4c38 100644
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -778,8 +778,8 @@ void RDMAWorker::handle_pending_message()
   dispatcher->notify_pending_workers();
 }
 
-RDMAStack::RDMAStack(CephContext *cct, const std::string &t)
-  : NetworkStack(cct, t), ib(std::make_shared<Infiniband>(cct)),
+RDMAStack::RDMAStack(CephContext *cct)
+  : NetworkStack(cct), ib(std::make_shared<Infiniband>(cct)),
     rdma_dispatcher(std::make_shared<RDMADispatcher>(cct, ib))
 {
   ldout(cct, 20) << __func__ << " constructing RDMAStack..." << dendl;
diff --git a/src/msg/async/rdma/RDMAStack.h b/src/msg/async/rdma/RDMAStack.h
index d2eafb74c14f..8389fee8c70f 100644
--- a/src/msg/async/rdma/RDMAStack.h
+++ b/src/msg/async/rdma/RDMAStack.h
@@ -331,7 +331,7 @@ class RDMAStack : public NetworkStack {
   }
 
  public:
-  explicit RDMAStack(CephContext *cct, const std::string &t);
+  explicit RDMAStack(CephContext *cct);
   virtual ~RDMAStack();
   virtual bool nonblock_connect_need_writable_event() const override { return false; }