X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/2546a41ad36fdc9ef6471cb35a1d56930ae1b527..be7cf844f59fa483423724e8e4b5e663e5b88ddd:/rpc/rpc.h

diff --git a/rpc/rpc.h b/rpc/rpc.h
index d81a5dd..065cabc 100644
--- a/rpc/rpc.h
+++ b/rpc/rpc.h
@@ -1,20 +1,14 @@
 #ifndef rpc_h
 #define rpc_h
 
+#include "types.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <list>
-#include <map>
-#include <stdio.h>
 
 #include "thr_pool.h"
 #include "marshall.h"
+#include "marshall_wrap.h"
 #include "connection.h"
-#include "lock.h"
-
-using std::string;
-using std::map;
-using std::list;
 
 class rpc_const {
     public:
@@ -37,13 +31,12 @@ class rpcc : public chanmgr {
 
         //manages per rpc info
         struct caller {
-            caller(int xxid, unmarshall *un);
-            ~caller();
+            caller(int _xid, string *_rep) : xid(_xid), rep(_rep) {}
 
             int xid;
-            unmarshall *un;
+            string *rep;
             int intret;
-            bool done;
+            bool done = false;
             mutex m;
             cond c;
         };
@@ -103,10 +96,9 @@ class rpcc : public chanmgr {
 
         int islossy() { return lossytest_ > 0; }
 
-        int call1(proc_t proc, 
-                marshall &req, unmarshall &rep, TO to);
+        int call1(proc_t proc, marshall &req, string &rep, TO to);
 
-        bool got_pdu(connection *c, char *b, size_t sz);
+        bool got_pdu(connection *c, const string & b);
 
         template<class R>
             int call_m(proc_t proc, marshall &req, R & r, TO to);
@@ -121,14 +113,14 @@ class rpcc : public chanmgr {
 template<class R> int 
 rpcc::call_m(proc_t proc, marshall &req, R & r, TO to) 
 {
-    unmarshall u;
-    int intret = call1(proc, req, u, to);
+    string rep;
+    int intret = call1(proc, req, rep, to);
+    unmarshall u(rep, true);
     if (intret < 0) return intret;
     u >> r;
     if (u.okdone() != true) {
-        fprintf(stderr, "rpcc::call_m: failed to unmarshall the reply."
-                "You are probably calling RPC 0x%x with wrong return "
-                "type.\n", proc);
+        cerr << "rpcc::call_m: failed to unmarshall the reply.  You are probably " <<
+                "calling RPC 0x" << hex << proc << " with the wrong return type." << endl;
         VERIFY(0);
         return rpc_const::unmarshal_reply_failure;
     }
@@ -148,8 +140,6 @@ rpcc::call_timeout(proc_t proc, const rpcc::TO to, R & r, const Args&... args)
     return call_m(proc, m, r, to);
 }
 
-bool operator<(const sockaddr_in &a, const sockaddr_in &b);
-
 // rpc server endpoint.
 class rpcs : public chanmgr {
 
@@ -167,25 +157,14 @@ class rpcs : public chanmgr {
         // has been sent; in that case buf points to a copy of the reply,
         // and sz holds the size of the reply.
     struct reply_t {
-        reply_t (int _xid) {
-            xid = _xid;
-            cb_present = false;
-            buf = NULL;
-            sz = 0;
-        }
-        reply_t (int _xid, char *_buf, size_t _sz) {
-            xid = _xid;
-            cb_present = true;
-            buf = _buf;
-            sz = _sz;
-        }
+        reply_t (int _xid) : xid(_xid), cb_present(false) {}
+        reply_t (int _xid, const string & _buf) : xid(_xid), cb_present(true), buf(_buf) {}
         int xid;
         bool cb_present; // whether the reply buffer is valid
-        char *buf;      // the reply buffer
-        size_t sz;         // the size of reply buffer
+        string buf;      // the reply buffer
     };
 
-    unsigned int port_;
+    in_port_t port_;
     unsigned int nonce_;
 
     // provide at most once semantics by maintaining a window of replies
@@ -194,11 +173,10 @@ class rpcs : public chanmgr {
     map<unsigned int, list<reply_t> > reply_window_;
 
     void free_reply_window(void);
-    void add_reply(unsigned int clt_nonce, int xid, char *b, size_t sz);
+    void add_reply(unsigned int clt_nonce, int xid, const string & b);
 
     rpcstate_t checkduplicate_and_update(unsigned int clt_nonce, 
-            int xid, int rep_xid,
-            char **b, size_t *sz);
+            int xid, int rep_xid, string & b);
 
     void updatestat(proc_t proc);
 
@@ -210,7 +188,6 @@ class rpcs : public chanmgr {
     size_t curr_counts_;
     map<proc_t, size_t> counts_;
 
-    int lossytest_; 
     bool reachable_;
 
     // map proc # to function
@@ -225,10 +202,8 @@ class rpcs : public chanmgr {
     protected:
 
     struct djob_t {
-        djob_t (connection *c, char *b, size_t bsz):buf(b),sz(bsz),conn(c) {}
-        char *buf;
-        size_t sz;
         connection *conn;
+        string buf;
     };
     void dispatch(djob_t *);
 
@@ -236,18 +211,18 @@ class rpcs : public chanmgr {
     void reg1(proc_t proc, handler *);
 
     ThrPool* dispatchpool_;
-    tcpsconn* listener_;
+    tcpsconn *listener_;
 
     public:
-    rpcs(unsigned int port, size_t counts=0);
+    rpcs(in_port_t port, size_t counts=0);
     ~rpcs();
-    inline unsigned int port() { return listener_->port(); }
+    inline in_port_t port() { return listener_->port(); }
     //RPC handler for clients binding
     int rpcbind(unsigned int &r, int a);
 
     void set_reachable(bool r) { reachable_ = r; }
 
-    bool got_pdu(connection *c, char *b, size_t sz);
+    bool got_pdu(connection *c, const string & b);
 
     template<class F, class C=void> void reg(proc_t proc, F f, C *c=nullptr);
 };
@@ -262,7 +237,4 @@ template<class F, class C> void rpcs::reg(proc_t proc, F f, C *c) {
     reg1(proc, marshalled_func<F, ReturnOnFailure>::wrap(f, c));
 }
 
-sockaddr_in make_sockaddr(const string &hostandport);
-sockaddr_in make_sockaddr(const string &host, const string &port);
-
 #endif