From: Kefu Chai <kchai@redhat.com>
Date: Mon, 15 Apr 2019 06:02:33 +0000 (+0800)
Subject: mgr/DaemonState: pass const by reference
X-Git-Tag: v15.1.0~2896^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b6aa95ff4013e3f09f92f5dae5b6ca85403ffc8;p=ceph-ci.git

mgr/DaemonState: pass const by reference

DaemonPerfCounters::update() does not change the `MMgrReport` message,
neither does it expect a nullptr. so pass by const reference.

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

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index c8db6652e61..e6976cb3891 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -593,7 +593,7 @@ bool DaemonServer::handle_report(const ref_t<MMgrReport>& m)
   {
     std::lock_guard l(daemon->lock);
     auto &daemon_counters = daemon->perf_counters;
-    daemon_counters.update(m);
+    daemon_counters.update(*m.get());
 
     auto p = m->config_bl.cbegin();
     if (p != m->config_bl.end()) {
diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index b13685a1561..e0cc9f2e0b9 100644
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -264,31 +264,31 @@ void DaemonStateIndex::cull(const std::string& svc_name,
   }
 }
 
-void DaemonPerfCounters::update(MMgrReport *report)
+void DaemonPerfCounters::update(const MMgrReport& report)
 {
-  dout(20) << "loading " << report->declare_types.size() << " new types, "
-	   << report->undeclare_types.size() << " old types, had "
+  dout(20) << "loading " << report.declare_types.size() << " new types, "
+	   << report.undeclare_types.size() << " old types, had "
 	   << types.size() << " types, got "
-           << report->packed.length() << " bytes of data" << dendl;
+           << report.packed.length() << " bytes of data" << dendl;
 
   // Retrieve session state
-  auto priv = report->get_connection()->get_priv();
+  auto priv = report.get_connection()->get_priv();
   auto session = static_cast<MgrSession*>(priv.get());
 
   // Load any newly declared types
-  for (const auto &t : report->declare_types) {
+  for (const auto &t : report.declare_types) {
     types.insert(std::make_pair(t.path, t));
     session->declared_types.insert(t.path);
   }
   // Remove any old types
-  for (const auto &t : report->undeclare_types) {
+  for (const auto &t : report.undeclare_types) {
     session->declared_types.erase(t);
   }
 
   const auto now = ceph_clock_now();
 
   // Parse packed data according to declared set of types
-  auto p = report->packed.cbegin();
+  auto p = report.packed.cbegin();
   DECODE_START(1, p);
   for (const auto &t_path : session->declared_types) {
     const auto &t = types.at(t_path);
diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h
index 680d4a0cc2c..ce29e9cd903 100644
--- a/src/mgr/DaemonState.h
+++ b/src/mgr/DaemonState.h
@@ -114,7 +114,7 @@ class DaemonPerfCounters
 
   std::map<std::string, PerfCounterInstance> instances;
 
-  void update(MMgrReport *report);
+  void update(const MMgrReport& report);
 
   void clear()
   {