import quincy beta 17.1.0

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

diff --git a/ceph/src/messages/MClientLease.h b/ceph/src/messages/MClientLease.h
index 4af79716cef31cc06946fdbe62901ef7655cc9be..e0c1d13c80b82e4f428889614c4b974a1c16df58 100644 (file)
--- a/ceph/src/messages/MClientLease.h
+++ b/ceph/src/messages/MClientLease.h
@@ -16,11 +16,12 @@
 #ifndef CEPH_MCLIENTLEASE_H
 #define CEPH_MCLIENTLEASE_H
 
-#include <boost/utility/string_view.hpp>
+#include <string_view>
 
 #include "msg/Message.h"
 
-struct MClientLease : public Message {
+class MClientLease final : public SafeMessage {
+public:
   struct ceph_mds_lease h;
   std::string dname;
   
@@ -31,9 +32,14 @@ struct MClientLease : public Message {
   snapid_t get_first() const { return snapid_t(h.first); }
   snapid_t get_last() const { return snapid_t(h.last); }
 
-  MClientLease() : Message(CEPH_MSG_CLIENT_LEASE) {}
+protected:
+  MClientLease() : SafeMessage(CEPH_MSG_CLIENT_LEASE) {}
+  MClientLease(const MClientLease& m) :
+    SafeMessage(CEPH_MSG_CLIENT_LEASE),
+    h(m.h),
+    dname(m.dname) {}
   MClientLease(int ac, ceph_seq_t seq, int m, uint64_t i, uint64_t sf, uint64_t sl) :
-    Message(CEPH_MSG_CLIENT_LEASE) {
+    SafeMessage(CEPH_MSG_CLIENT_LEASE) {
     h.action = ac;
     h.seq = seq;
     h.mask = m;
@@ -42,8 +48,8 @@ struct MClientLease : public Message {
     h.last = sl;
     h.duration_ms = 0;
   }
-  MClientLease(int ac, ceph_seq_t seq, int m, uint64_t i, uint64_t sf, uint64_t sl, boost::string_view d) :
-    Message(CEPH_MSG_CLIENT_LEASE),
+  MClientLease(int ac, ceph_seq_t seq, int m, uint64_t i, uint64_t sf, uint64_t sl, std::string_view d) :
+    SafeMessage(CEPH_MSG_CLIENT_LEASE),
     dname(d) {
     h.action = ac;
     h.seq = seq;
@@ -53,12 +59,11 @@ struct MClientLease : public Message {
     h.last = sl;
     h.duration_ms = 0;
   }
-private:
-  ~MClientLease() override {}
+  ~MClientLease() final {}
 
 public:
-  const char *get_type_name() const override { return "client_lease"; }
-  void print(ostream& out) const override {
+  std::string_view get_type_name() const override { return "client_lease"; }
+  void print(std::ostream& out) const override {
     out << "client_lease(a=" << ceph_lease_op_name(get_action())
        << " seq " << get_seq()
        << " mask " << get_mask();
@@ -69,17 +74,24 @@ public:
       out << "/" << dname;
     out << ")";
   }
-  
+
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    ::decode(h, p);
-    ::decode(dname, p);
+    using ceph::decode;
+    auto p = payload.cbegin();
+    decode(h, p);
+    decode(dname, p);
   }
   void encode_payload(uint64_t features) override {
-    ::encode(h, payload);
-    ::encode(dname, payload);
+    using ceph::encode;
+    encode(h, payload);
+    encode(dname, payload);
   }
 
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::make_message(Args&&... args);
 };
 
 #endif