From: Kefu Chai <kchai@redhat.com>
Date: Tue, 16 May 2017 07:22:34 +0000 (+0800)
Subject: mon/MgrStatMonitor: add override specifier for virtual methods
X-Git-Tag: ses5-milestone6~8^2~19^2~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e16c68b67549b321af4cde2b3999385465c4d03;p=ceph.git

mon/MgrStatMonitor: add override specifier for virtual methods

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

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index 562e9191f893..54fdae178768 100644
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -16,40 +16,42 @@ public:
     ::encode(digest, bl, features);
   }
 
-  const pool_stat_t* get_pool_stat(int poolid) const {
+  const pool_stat_t* get_pool_stat(int poolid) const override {
     auto i = digest.pg_pool_sum.find(poolid);
     if (i != digest.pg_pool_sum.end()) {
       return &i->second;
     }
-    return NULL;
+    return nullptr;
   }
 
-  const pool_stat_t& get_pg_sum() const { return digest.pg_sum; }
-  const osd_stat_t& get_osd_sum() const { return digest.osd_sum; }
+  const pool_stat_t& get_pg_sum() const override { return digest.pg_sum; }
+  const osd_stat_t& get_osd_sum() const override { return digest.osd_sum; }
 
-  const osd_stat_t *get_osd_stat(int osd) const {
+  const osd_stat_t *get_osd_stat(int osd) const override {
     auto i = digest.osd_stat.find(osd);
     if (i == digest.osd_stat.end()) {
-      return NULL;
+      return nullptr;
     }
     return &i->second;
   }
-  const ceph::unordered_map<int32_t,osd_stat_t> *get_osd_stat() const {
-    return &digest.osd_stat;
+  const ceph::unordered_map<int32_t,osd_stat_t> &get_osd_stat() const override {
+    return digest.osd_stat;
   }
 
-  size_t get_num_pg_by_osd(int osd) const {
+  size_t get_num_pg_by_osd(int osd) const override {
     return digest.get_num_pg_by_osd(osd);
   }
 
-  void print_summary(Formatter *f, ostream *out) const {
+  void print_summary(Formatter *f, ostream *out) const override {
     digest.print_summary(f, out);
   }
-  void dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const {
+  void dump_fs_stats(stringstream *ss,
+		     Formatter *f,
+		     bool verbose) const override {
     digest.dump_fs_stats(ss, f, verbose);
   }
   void dump_pool_stats(const OSDMap& osdm, stringstream *ss, Formatter *f,
-		       bool verbose) const {
+		       bool verbose) const override {
     digest.dump_pool_stats_full(osdm, ss, f, verbose);
   }
 };
@@ -70,9 +72,7 @@ MgrStatMonitor::MgrStatMonitor(Monitor *mn, Paxos *p, const string& service_name
 {
 }
 
-MgrStatMonitor::~MgrStatMonitor()
-{
-}
+MgrStatMonitor::~MgrStatMonitor() = default;
 
 PGStatService *MgrStatMonitor::get_pg_stat_service()
 {
@@ -120,7 +120,7 @@ void MgrStatMonitor::print_summary(Formatter *f, std::ostream *ss) const
 
 bool MgrStatMonitor::preprocess_query(MonOpRequestRef op)
 {
-  PaxosServiceMessage *m = static_cast<PaxosServiceMessage*>(op->get_req());
+  auto m = static_cast<PaxosServiceMessage*>(op->get_req());
   switch (m->get_type()) {
   case MSG_MON_MGR_REPORT:
     return preprocess_report(op);
@@ -133,11 +133,10 @@ bool MgrStatMonitor::preprocess_query(MonOpRequestRef op)
 
 bool MgrStatMonitor::prepare_update(MonOpRequestRef op)
 {
-  PaxosServiceMessage *m = static_cast<PaxosServiceMessage*>(op->get_req());
+  auto m = static_cast<PaxosServiceMessage*>(op->get_req());
   switch (m->get_type()) {
   case MSG_MON_MGR_REPORT:
     return prepare_report(op);
-
   default:
     mon->no_reply(op);
     derr << "Unhandled message type " << m->get_type() << dendl;
@@ -152,7 +151,7 @@ bool MgrStatMonitor::preprocess_report(MonOpRequestRef op)
 
 bool MgrStatMonitor::prepare_report(MonOpRequestRef op)
 {
-  MMonMgrReport *m = static_cast<MMonMgrReport*>(op->get_req());
+  auto m = static_cast<MMonMgrReport*>(op->get_req());
   pgservice->decode_digest(m->get_data());
   return true;
 }