Clean-ups and fixes to compile with more warnings enabled and with g++.

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

diff --git a/rsm_protocol.h b/rsm_protocol.h
index 6b508d8..9e53430 100644 (file)
--- a/rsm_protocol.h
+++ b/rsm_protocol.h
@@ -1,87 +1,51 @@
 #ifndef rsm_protocol_h
 #define rsm_protocol_h
 
 #ifndef rsm_protocol_h
 #define rsm_protocol_h
 

+#include "types.h"

 #include "rpc/rpc.h"
 
 #include "rpc/rpc.h"
 

-class rsm_client_protocol {
-    public:
-        enum status : status_t {OK, ERR, NOTPRIMARY, BUSY};
-        enum rpc_numbers : proc_t {
-            invoke = 0x9001,
-            members,
-        };
-};
+namespace rsm_client_protocol {
+    enum status : rpc_protocol::status {OK, ERR, NOTPRIMARY, BUSY};
+    REMOTE_PROCEDURE_BASE(0x9000);
+    REMOTE_PROCEDURE(1, invoke, (string &, rpc_protocol::proc_id_t, string));
+    REMOTE_PROCEDURE(2, members, (vector<string> &, int));
+}

 
 struct viewstamp {
 
 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++; }
     unsigned int vid;
     unsigned int seqno;
     inline void operator++(int) { seqno++; }

-};
-
-class rsm_protocol {
-    public:
-        enum status : status_t { OK, ERR, BUSY};
-        enum rpc_numbers : proc_t {
-            invoke = 0x10001,
-            transferreq,
-            transferdonereq,
-            joinreq,
-        };

 
 

-        struct transferres {
-            std::string state;
-            viewstamp last;
-        };
-
-        struct joinres {
-            std::string log;
-        };
+    MEMBERS(vid, seqno)
+    LEXICOGRAPHIC_COMPARISON(viewstamp)

 };
 
 };
 

-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;
-}
+MARSHALLABLE_STRUCT(viewstamp)

 
 

-inline marshall& operator<<(marshall &m, viewstamp v) {
-    return m << v.vid << v.seqno;
-}
+namespace rsm_protocol {
+    enum status : rpc_protocol::status { OK, ERR, BUSY};

 
 

-inline unmarshall& operator>>(unmarshall &u, viewstamp &v) {
-    return u >> v.vid >> v.seqno;
-}
+    struct transferres {
+        string state;
+        viewstamp last;

 
 

-inline marshall & operator<<(marshall &m, rsm_protocol::transferres r) {
-    return m << r.state << r.last;
-}
+        MEMBERS(state, last)
+    };

 
 

-inline unmarshall & operator>>(unmarshall &u, rsm_protocol::transferres &r) {
-    return u >> r.state >> r.last;
+    REMOTE_PROCEDURE_BASE(0xa000);
+    REMOTE_PROCEDURE(1, invoke, (int &, rpc_protocol::proc_id_t, viewstamp, string));
+    REMOTE_PROCEDURE(2, transferreq, (transferres &, string, viewstamp, unsigned));
+    REMOTE_PROCEDURE(3, transferdonereq, (int &, string, unsigned));
+    REMOTE_PROCEDURE(4, joinreq, (string &, string, viewstamp));

 }
 
 }
 

-inline marshall & operator<<(marshall &m, rsm_protocol::joinres r) {
-    return m << r.log;
-}
+MARSHALLABLE_STRUCT(rsm_protocol::transferres)

 
 

-inline unmarshall & operator>>(unmarshall &u, rsm_protocol::joinres &r) {
-    return u >> r.log;
+namespace rsm_test_protocol {
+    enum status : rpc_protocol::status {OK, ERR};
+    REMOTE_PROCEDURE_BASE(0x12000);
+    REMOTE_PROCEDURE(1, net_repair, (status &, int));
+    REMOTE_PROCEDURE(2, breakpoint, (status &, int));

 }
 
 }
 

-class rsm_test_protocol {
-    public:
-        enum status : status_t {OK, ERR};
-        enum rpc_numbers : proc_t {
-            net_repair = 0x12001,
-            breakpoint = 0x12002,
-        };
-};
-

 #endif 
 #endif