update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / messages / MHeartbeat.h

diff --git a/ceph/src/messages/MHeartbeat.h b/ceph/src/messages/MHeartbeat.h
index ad0d8f8e4818a915b3d3986a10a1ca587d12a7b8..50259619e908c988737ed0b9239cdae2c6631b0f 100644 (file)
--- a/ceph/src/messages/MHeartbeat.h
+++ b/ceph/src/messages/MHeartbeat.h
@@ -18,44 +18,46 @@
 
 #include "include/types.h"
 #include "msg/Message.h"
+#include "common/DecayCounter.h"
 
-class MHeartbeat : public Message {
+class MHeartbeat : public MessageInstance<MHeartbeat> {
+public:
+  friend factory;
+private:
   mds_load_t load;
   __s32        beat = 0;
   map<mds_rank_t, float> import_map;
 
  public:
-  mds_load_t& get_load() { return load; }
-  int get_beat() { return beat; }
+  const mds_load_t& get_load() const { return load; }
+  int get_beat() const { return beat; }
 
-  map<mds_rank_t, float>& get_import_map() {
-    return import_map;
-  }
+  const map<mds_rank_t, float>& get_import_map() const { return import_map; }
+  map<mds_rank_t, float>& get_import_map() { return import_map; }
 
-  MHeartbeat()
-    : Message(MSG_MDS_HEARTBEAT), load(utime_t()) { }
+protected:
+  MHeartbeat() : MessageInstance(MSG_MDS_HEARTBEAT), load(DecayRate()) {}
   MHeartbeat(mds_load_t& load, int beat)
-    : Message(MSG_MDS_HEARTBEAT),
+    : MessageInstance(MSG_MDS_HEARTBEAT),
       load(load) {
     this->beat = beat;
   }
-private:
   ~MHeartbeat() override {}
 
 public:
-  const char *get_type_name() const override { return "HB"; }
+  std::string_view get_type_name() const override { return "HB"; }
 
   void encode_payload(uint64_t features) override {
-    ::encode(load, payload);
-    ::encode(beat, payload);
-    ::encode(import_map, payload);
+    using ceph::encode;
+    encode(load, payload);
+    encode(beat, payload);
+    encode(import_map, payload);
   }
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    utime_t now(ceph_clock_now());
-    ::decode(load, now, p);
-    ::decode(beat, p);
-    ::decode(import_map, p);
+    auto p = payload.cbegin();
+    decode(load, p);
+    decode(beat, p);
+    decode(import_map, p);
   }
 
 };