update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MWatchNotify.h b/ceph/src/messages/MWatchNotify.h
index 15325abf61cb7648e1874c013d35dad6add3bc51..b3a46d3e54b2fb6966657daaa9f6904df782bbe6 100644 (file)
--- a/ceph/src/messages/MWatchNotify.h
+++ b/ceph/src/messages/MWatchNotify.h
@@ -19,9 +19,12 @@
 #include "msg/Message.h"
 
 
-class MWatchNotify : public Message {
-  static const int HEAD_VERSION = 3;
-  static const int COMPAT_VERSION = 1;
+class MWatchNotify : public MessageInstance<MWatchNotify> {
+public:
+  friend factory;
+private:
+  static constexpr int HEAD_VERSION = 3;
+  static constexpr int COMPAT_VERSION = 1;
 
  public:
   uint64_t cookie;     ///< client unique id for this watch or notify
@@ -33,9 +36,9 @@ class MWatchNotify : public Message {
   uint64_t notifier_gid; ///< who sent the notify
 
   MWatchNotify()
-    : Message(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION) { }
+    : MessageInstance(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION) { }
   MWatchNotify(uint64_t c, uint64_t v, uint64_t i, uint8_t o, bufferlist b)
-    : Message(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION),
+    : MessageInstance(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION),
       cookie(c),
       ver(v),
       notify_id(i),
@@ -49,36 +52,37 @@ private:
 public:
   void decode_payload() override {
     uint8_t msg_ver;
-    bufferlist::iterator p = payload.begin();
-    ::decode(msg_ver, p);
-    ::decode(opcode, p);
-    ::decode(cookie, p);
-    ::decode(ver, p);
-    ::decode(notify_id, p);
+    auto p = payload.cbegin();
+    decode(msg_ver, p);
+    decode(opcode, p);
+    decode(cookie, p);
+    decode(ver, p);
+    decode(notify_id, p);
     if (msg_ver >= 1)
-      ::decode(bl, p);
+      decode(bl, p);
     if (header.version >= 2)
-      ::decode(return_code, p);
+      decode(return_code, p);
     else
       return_code = 0;
     if (header.version >= 3)
-      ::decode(notifier_gid, p);
+      decode(notifier_gid, p);
     else
       notifier_gid = 0;
   }
   void encode_payload(uint64_t features) override {
+    using ceph::encode;
     uint8_t msg_ver = 1;
-    ::encode(msg_ver, payload);
-    ::encode(opcode, payload);
-    ::encode(cookie, payload);
-    ::encode(ver, payload);
-    ::encode(notify_id, payload);
-    ::encode(bl, payload);
-    ::encode(return_code, payload);
-    ::encode(notifier_gid, payload);
+    encode(msg_ver, payload);
+    encode(opcode, payload);
+    encode(cookie, payload);
+    encode(ver, payload);
+    encode(notify_id, payload);
+    encode(bl, payload);
+    encode(return_code, payload);
+    encode(notifier_gid, payload);
   }
 
-  const char *get_type_name() const override { return "watch-notify"; }
+  std::string_view get_type_name() const override { return "watch-notify"; }
   void print(ostream& out) const override {
     out << "watch-notify("
        << ceph_watch_event_name(opcode) << " (" << (int)opcode << ")"