Partially fixed a bug in the test suite that led to test runs randomly failing.

[invirt/third/libt4.git] / rsm_protocol.h

diff --git a/rsm_protocol.h b/rsm_protocol.h
index 6b508d8..a2d13c2 100644 (file)
--- a/rsm_protocol.h
+++ b/rsm_protocol.h
@@ -1,6 +1,7 @@
 #ifndef rsm_protocol_h
 #define rsm_protocol_h
 
+#include "types.h"
 #include "rpc/rpc.h"
 
 class rsm_client_protocol {
@@ -13,67 +14,35 @@ class rsm_client_protocol {
 };
 
 struct viewstamp {
-    viewstamp (unsigned int _vid = 0, unsigned int _seqno = 0) : vid(_vid), seqno(_seqno) {}
     unsigned int vid;
     unsigned int seqno;
     inline void operator++(int) { seqno++; }
+
+    MEMBERS(vid, seqno)
+    LEXICOGRAPHIC_COMPARISON(viewstamp)
 };
 
+MARSHALLABLE(viewstamp)
+
 class rsm_protocol {
     public:
         enum status : status_t { OK, ERR, BUSY};
         enum rpc_numbers : proc_t {
-            invoke = 0x10001,
+            invoke = 0xa001,
             transferreq,
             transferdonereq,
             joinreq,
         };
 
         struct transferres {
-            std::string state;
+            string state;
             viewstamp last;
-        };
 
-        struct joinres {
-            std::string log;
+            MEMBERS(state, last)
         };
 };
 
-inline bool operator==(viewstamp a, viewstamp b) {
-    return a.vid == b.vid && a.seqno == b.seqno;
-}
-
-inline bool operator>(viewstamp a, viewstamp b) {
-    return (a.vid > b.vid) || ((a.vid == b.vid) && a.seqno > b.seqno);
-}
-
-inline bool operator!=(viewstamp a, viewstamp b) {
-    return a.vid != b.vid || a.seqno != b.seqno;
-}
-
-inline marshall& operator<<(marshall &m, viewstamp v) {
-    return m << v.vid << v.seqno;
-}
-
-inline unmarshall& operator>>(unmarshall &u, viewstamp &v) {
-    return u >> v.vid >> v.seqno;
-}
-
-inline marshall & operator<<(marshall &m, rsm_protocol::transferres r) {
-    return m << r.state << r.last;
-}
-
-inline unmarshall & operator>>(unmarshall &u, rsm_protocol::transferres &r) {
-    return u >> r.state >> r.last;
-}
-
-inline marshall & operator<<(marshall &m, rsm_protocol::joinres r) {
-    return m << r.log;
-}
-
-inline unmarshall & operator>>(unmarshall &u, rsm_protocol::joinres &r) {
-    return u >> r.log;
-}
+MARSHALLABLE(rsm_protocol::transferres)
 
 class rsm_test_protocol {
     public: