messages: do not use MessageSubType anymore

so we can drop it in future commit

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

diff --git a/src/messages/MMonQuorumService.h b/src/messages/MMonQuorumService.h
index 7ad1eeb50c83b38fb4bd62c5d8b991111fcdf5d0..a2cf527b5ecd4398bfef335304c18d7c3a9db309 100644 (file)
--- a/src/messages/MMonQuorumService.h
+++ b/src/messages/MMonQuorumService.h
@@ -16,19 +16,18 @@
 
 #include "msg/Message.h"
 
-class MMonQuorumService : public MessageSubType<MMonQuorumService> {
+class MMonQuorumService : public Message {
 public:
   epoch_t epoch = 0;
   version_t round = 0;
 
 protected:
-template<typename... Args>
-  MMonQuorumService(Args&&... args) : MessageSubType(std::forward<Args>(args)...) {}
-
+  MMonQuorumService(int type, int head)
+    : Message{type, head, 1}
+  {}
   ~MMonQuorumService() override { }
 
 public:
-
   void set_epoch(epoch_t e) {
     epoch = e;
   }

diff --git a/src/messages/MOSDFastDispatchOp.h b/src/messages/MOSDFastDispatchOp.h
index 1f5f7abe22305a6cfe786c8c500158323f4dbc6a..d1103fb8810f764e1bbd954c45f0853910eabcc4 100644 (file)
--- a/src/messages/MOSDFastDispatchOp.h
+++ b/src/messages/MOSDFastDispatchOp.h
@@ -7,12 +7,11 @@
 #include "msg/Message.h"
 #include "osd/osd_types.h"
 
-class MOSDFastDispatchOp : public MessageSubType<MOSDFastDispatchOp> {
+class MOSDFastDispatchOp : public Message {
 public:
-
-template<typename... Args>
-  MOSDFastDispatchOp(Args&&... args) : MessageSubType(std::forward<Args>(args)...) {}
-
+  MOSDFastDispatchOp(int t, int version, int compat_version)
+    : Message{t, version, compat_version}
+  {}
   virtual epoch_t get_map_epoch() const = 0;
   virtual epoch_t get_min_epoch() const {
     return get_map_epoch();

diff --git a/src/messages/MOSDPeeringOp.h b/src/messages/MOSDPeeringOp.h
index b6ea078eac38d8661ae178f7fba6dd46bb459440..f2fdcf12936e211082896db47f44a73dccaa407c 100644 (file)
--- a/src/messages/MOSDPeeringOp.h
+++ b/src/messages/MOSDPeeringOp.h
@@ -7,11 +7,10 @@
 #include "osd/osd_types.h"
 #include "osd/PGPeeringEvent.h"
 
-class MOSDPeeringOp : public MessageSubType<MOSDPeeringOp> {
+class MOSDPeeringOp : public Message {
 public:
-
-template<typename... Args>
-  MOSDPeeringOp(Args&&... args) : MessageSubType(std::forward<Args>(args)...) {}
+  MOSDPeeringOp(int t, int version, int compat_version)
+    : Message{t, version, compat_version} {}
 
   void print(std::ostream& out) const override final {
     out << get_type_name() << "("

diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h
index 1cdb7a3c01b0e66d0c92567968e86b99074f99b9..8bdad564dfa5ace36d7aaf3ee3d983599707819d 100644 (file)
--- a/src/messages/PaxosServiceMessage.h
+++ b/src/messages/PaxosServiceMessage.h
@@ -4,10 +4,9 @@
 #define CEPH_PAXOSSERVICEMESSAGE_H
 
 #include "msg/Message.h"
-#include "msg/MessageRef.h"
 #include "mon/Session.h"
 
-class PaxosServiceMessage : public MessageSubType<PaxosServiceMessage> {
+class PaxosServiceMessage : public Message {
 public:
   version_t version;
   __s16 deprecated_session_mon;
@@ -18,11 +17,11 @@ public:
   epoch_t rx_election_epoch;
 
   PaxosServiceMessage()
-    : MessageSubType(MSG_PAXOS),
+    : Message{MSG_PAXOS},
       version(0), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0) { }
   PaxosServiceMessage(int type, version_t v, int enc_version=1, int compat_enc_version=0)
-    : MessageSubType(type, enc_version, compat_enc_version),
+    : Message{type, enc_version, compat_enc_version},
       version(v), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0)  { }
  protected: