msg: pass features explicitly into message encoders

Avoid using the connection reference; pass it in explicitly instead. This will make ceph-dencoder's life a bit easier. Signed-off-by: Sage Weil <[email protected]>
shishirng · Jan 30, 2012 · 7999876 · 7999876
1 parent de2ec7c
commit 7999876
Show file tree

Hide file tree

Showing 104 changed files with 164 additions and 111 deletions.
diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h
@@ -45,7 +45,7 @@ struct MAuth : public PaxosServiceMessage {
     else
       monmap_epoch = 0;
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(protocol, payload);
     ::encode(auth_payload, payload);

diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
@@ -53,7 +53,7 @@ struct MAuthReply : public Message {
     ::decode(result_bl, p);
     ::decode(result_msg, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(protocol, payload);
     ::encode(result, payload);
     ::encode(global_id, payload);

diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h
@@ -75,7 +75,7 @@ class MCacheExpire : public Message {
     ::decode(realms, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from, payload);
     ::encode(realms, payload);
   }

diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h
@@ -41,7 +41,7 @@ class MClientCapRelease : public Message {
     ::decode(head, p);
     ::decode_nohead(head.num, caps, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num = caps.size();
     ::encode(head, payload);
     ::encode_nohead(caps, payload);

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
@@ -147,7 +147,7 @@ class MClientCaps : public Message {
     if (header.version >= 2)
       ::decode(flockbl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.snap_trace_len = snapbl.length();
     head.xattr_len = xattrbl.length();
     ::encode(head, payload);

diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h
@@ -73,7 +73,7 @@ struct MClientLease : public Message {
     ::decode(h, p);
     ::decode(dname, p);
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(h, payload);
     ::encode(dname, payload);
   }

diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
@@ -49,8 +49,8 @@ class MClientReconnect : public Message {
     realms.push_back(r);
   }
 
-  void encode_payload(CephContext *cct) {
     if (connection->has_feature(CEPH_FEATURE_FLOCK)) {
+  void encode_payload(CephContext *cct, uint64_t features) {
       // new protocol
       header.version = 2;
       ::encode(caps, data);

diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h
@@ -238,7 +238,7 @@ class MClientReply : public Message {
     ::decode(snapbl, p);
     assert(p.end());
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(head, payload);
     ::encode(trace_bl, payload);
     ::encode(extra_bl, payload);

diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
@@ -149,7 +149,7 @@ class MClientRequest : public Message {
     ::decode_nohead(head.num_releases, releases, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num_releases = releases.size();
     ::encode(head, payload);
     ::encode(path, payload);

diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h
@@ -46,7 +46,7 @@ class MClientRequestForward : public Message {
       << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dest_mds, payload);
     ::encode(num_fwd, payload);
     ::encode(client_must_resend, payload);

diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
@@ -59,7 +59,7 @@ class MClientSession : public Message {
     bufferlist::iterator p = payload.begin();
     ::decode(head, p);
   }
-  void encode_payload(CephContext *cct) { 
+  void encode_payload(CephContext *cct, uint64_t features) { 
     ::encode(head, payload);
   }
 };

diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h
@@ -43,7 +43,7 @@ struct MClientSnap : public Message {
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     head.num_split_inos = split_inos.size();
     head.num_split_realms = split_realms.size();
     head.trace_len = bl.length();

diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
@@ -45,7 +45,7 @@ class MCommand : public Message {
     o << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(cmd, payload);
   }

diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
@@ -41,7 +41,7 @@ class MCommandReply : public Message {
     o << "command_reply(tid " << get_tid() << ": " << r << " " << rs << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(r, payload);
     ::encode(rs, payload);
   }

diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h
@@ -51,7 +51,7 @@ class MDentryLink : public Message {
     ::decode(is_primary, p);
     ::decode(bl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
     ::encode(is_primary, payload);

diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h
@@ -47,7 +47,7 @@ class MDentryUnlink : public Message {
     ::decode(dn, p);
     ::decode(straybl, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(dn, payload);
     ::encode(straybl, payload);

diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h
@@ -72,7 +72,7 @@ class MDirUpdate : public Message {
     ::decode(path, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from_mds, payload);
     ::encode(dirfrag, payload);
     ::encode(dir_rep, payload);

diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h
@@ -88,7 +88,7 @@ class MDiscover : public Message {
     ::decode(want_base_dir, p);
     ::decode(want_xlocked, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);
     ::encode(snapid, payload);

diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h
@@ -199,7 +199,7 @@ class MDiscoverReply : public Message {
     if (header.version >= 2)
       ::decode(wanted_ino, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     ::encode(base_ino, payload);
     ::encode(base_dir_frag, payload);

diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h
@@ -36,7 +36,7 @@ class MExportCaps : public Message {
     o << "export_caps(" << ino << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
     ::encode(cap_bl, payload);
     ::encode(client_map, payload);

diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h
@@ -36,7 +36,7 @@ class MExportCapsAck : public Message {
     o << "export_caps_ack(" << ino << ")";
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
   }
   virtual void decode_payload(CephContext *cct) {

diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h
@@ -44,7 +44,7 @@ class MExportDir : public Message {
     bounds.push_back(df); 
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(bounds, payload);
     ::encode(export_data, payload);

diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h
@@ -39,7 +39,7 @@ class MExportDirAck : public Message {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
 

diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h
@@ -37,7 +37,7 @@ class MExportDirCancel : public Message {
     o << "export_cancel(" << dirfrag << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {

diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h
@@ -57,7 +57,7 @@ class MExportDirDiscover : public Message {
     ::decode(path, p);
   }
 
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(from, payload);
     ::encode(dirfrag, payload);
     ::encode(path, payload);

diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h
@@ -50,7 +50,7 @@ class MExportDirDiscoverAck : public Message {
     ::decode(dirfrag, p);
     ::decode(success, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(success, payload);
   }

diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h
@@ -37,7 +37,7 @@ class MExportDirFinish : public Message {
     o << "export_finish(" << dirfrag << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {

diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h
@@ -59,7 +59,7 @@ class MExportDirNotify : public Message {
       bounds.push_back(*i);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(base, payload);
     ::encode(ack, payload);
     ::encode(old_auth, payload);

diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h
@@ -39,7 +39,7 @@ class MExportDirNotifyAck : public Message {
     o << "export_notify_ack(" << dirfrag << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
   void decode_payload(CephContext *cct) {

diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h
@@ -72,7 +72,7 @@ class MExportDirPrep : public Message {
     ::decode(bystanders, p);
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
     ::encode(basedir, payload);
     ::encode(bounds, payload);

diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h
@@ -41,7 +41,7 @@ class MExportDirPrepAck : public Message {
     bufferlist::iterator p = payload.begin();
     ::decode(dirfrag, p);
   }
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(dirfrag, payload);
   }
 };

diff --git a/src/messages/MForward.h b/src/messages/MForward.h
@@ -46,11 +46,11 @@ struct MForward : public Message {
   }
 
 public:
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(tid, payload);
     ::encode(client, payload);
     ::encode(client_caps, payload);
-    encode_message(cct, msg, payload);
+    encode_message(cct, msg, features, payload);
   }
 
   void decode_payload(CephContext *cct) {

diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h
@@ -33,7 +33,7 @@ class MGenericMessage : public Message {
   const char *get_type_name() { return tname; }
 
   void decode_payload(CephContext *cct) { }
-  void encode_payload(CephContext *cct) { }
+  void encode_payload(CephContext *cct, uint64_t features) { }
 };
 
 #endif
diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h
@@ -41,7 +41,7 @@ class MGetPoolStats : public PaxosServiceMessage {
     out << "getpoolstats(" << get_tid() << " " << pools << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pools, payload);

diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h
@@ -39,7 +39,7 @@ class MGetPoolStatsReply : public PaxosServiceMessage {
     out << "getpoolstatsreply(" << get_tid() << " v" << version <<  ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pool_stats, payload);

diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h
@@ -48,7 +48,7 @@ class MHeartbeat : public Message {
 public:
   const char *get_type_name() { return "HB"; }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(load, payload);
     ::encode(beat, payload);
     ::encode(import_map, payload);

diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h
@@ -39,7 +39,7 @@ class MInodeFileCaps : public Message {
     out << "inode_file_caps(" << ino << " " << ccap_string(caps) << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(ino, payload);
     ::encode(caps, payload);
   }

diff --git a/src/messages/MLock.h b/src/messages/MLock.h
@@ -81,7 +81,7 @@ class MLock : public Message {
     ::decode(object_info, p);
     ::decode(lockdata, p);
   }
-  virtual void encode_payload(CephContext *cct) {
+  virtual void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(asker, payload);
     ::encode(action, payload);
     ::encode(reqid, payload);

diff --git a/src/messages/MLog.h b/src/messages/MLog.h
@@ -42,7 +42,7 @@ class MLog : public PaxosServiceMessage {
     out << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(entries, payload);

diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h
@@ -33,7 +33,7 @@ class MLogAck : public Message {
     out << "log(last " << last << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(fsid, payload);
     ::encode(last, payload);
   }

diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h
@@ -67,7 +67,7 @@ class MMDSBeacon : public PaxosServiceMessage {
 	<< " seq " << seq << " v" << version << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);

diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h
@@ -271,7 +271,7 @@ class MMDSCacheRejoin : public Message {
   }
 
   // -- encoding --
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(op, payload);
     ::encode(strong_inodes, payload);
     ::encode(inode_base, payload);

diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h
@@ -30,7 +30,7 @@ struct MMDSFindIno : public Message {
     out << "findino(" << tid << " " << ino << ")";
   }
 
-  void encode_payload(CephContext *cct) {
+  void encode_payload(CephContext *cct, uint64_t features) {
     ::encode(tid, payload);
     ::encode(ino, payload);
   }