More cleanups to marshalling logic.

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

diff --git a/rsm_client.h b/rsm_client.h
index 039bc26..b275974 100644 (file)
--- a/rsm_client.h
+++ b/rsm_client.h
@@ -24,34 +24,19 @@ class rsm_client {
         bool init_members();
     public:
         rsm_client(std::string dst);
         bool init_members();
     public:
         rsm_client(std::string dst);

-        rsm_protocol::status invoke(int proc, std::string req, std::string &rep);
+        rsm_protocol::status invoke(int proc, std::string &rep, const std::string &req);

 
 

-        template<class R, class A1>
-            int call(unsigned int proc, const A1 & a1, R &r);
-
-        template<class R, class A1, class A2>
-            int call(unsigned int proc, const A1 & a1, const A2 & a2, R &r);
-
-        template<class R, class A1, class A2, class A3>
-            int call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3,
-                    R &r);
-
-        template<class R, class A1, class A2, class A3, class A4>
-            int call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3,
-                    const A4 & a4, R &r);
-
-        template<class R, class A1, class A2, class A3, class A4, class A5>
-            int call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3,
-                    const A4 & a4, const A5 & a5, R &r);
+        template<class R, class ...Args>
+            int call(unsigned int proc, R & r, const Args & ...a1);

     private:
     private:

-        template<class R> int call_m(unsigned int proc, marshall &req, R &r);
+        template<class R> int call_m(unsigned int proc, R & r, const marshall & req);

 };
 
 template<class R>
 };
 
 template<class R>

-int rsm_client::call_m(unsigned int proc, marshall &req, R &r) {
+int rsm_client::call_m(unsigned int proc, R & r, const marshall & req) {

        std::string rep;
         std::string res;
        std::string rep;
         std::string res;

-       int intret = invoke(proc, req.str(), rep);
+       int intret = invoke(proc, rep, req.cstr());

         VERIFY( intret == rsm_client_protocol::OK );
         unmarshall u(rep);
        u >> intret;
         VERIFY( intret == rsm_client_protocol::OK );
         unmarshall u(rep);
        u >> intret;

@@ -77,55 +62,9 @@ int rsm_client::call_m(unsigned int proc, marshall &req, R &r) {
        return intret;
 }
 
        return intret;
 }
 

-template<class R, class A1>
-int rsm_client::call(unsigned int proc, const A1 & a1, R & r) {
-    marshall m;
-    m << a1;
-    return call_m(proc, m, r);
-}
-
-template<class R, class A1, class A2>
-int rsm_client::call(unsigned int proc, const A1 & a1, const A2 & a2, R & r) {
-    marshall m;
-    m << a1;
-    m << a2;
-    return call_m(proc, m, r);
-}
-
-template<class R, class A1, class A2, class A3>
-int rsm_client::call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3, R & r) {
-    marshall m;
-    std::string rep;
-    std::string res;
-    m << a1;
-    m << a2;
-    m << a3;
-    return call_m(proc, m, r);
-}
-
-template<class R, class A1, class A2, class A3, class A4>
-int rsm_client::call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3, const A4 & a4, R & r) {
-    marshall m;
-    std::string rep;
-    std::string res;
-    m << a1;
-    m << a2;
-    m << a3;
-    m << a4;
-    return call_m(proc, m, r);
-}
-
-template<class R, class A1, class A2, class A3, class A4, class A5>
-int rsm_client::call(unsigned int proc, const A1 & a1, const A2 & a2, const A3 & a3, const A4 & a4, const A5 & a5, R & r) {
-    marshall m;
-    std::string rep;
-    std::string res;
-    m << a1;
-    m << a2;
-    m << a3;
-    m << a4;
-    m << a5;
-    return call_m(proc, m, r);
+template<class R, class ...Args>
+int rsm_client::call(unsigned int proc, R & r, const Args & ...a1) {
+    return call_m(proc, r, marshall{a1...});

 }
 
 #endif
 }
 
 #endif