#include "rpc.h"
#include <arpa/inet.h>
#include <getopt.h>
-#include <sys/types.h>
#include <unistd.h>
+#include <string.h>
#define NUM_CL 2
char log_thread_prefix = 'r';
-rpcs *server; // server rpc object
-rpcc *clients[NUM_CL]; // client rpc object
-string dst; //server's ip address
-int port;
+static rpcs *server; // server rpc object
+static rpcc *clients[NUM_CL]; // client rpc object
+static string dst; //server's ip address
+static in_port_t port;
// server-side handlers. they must be methods of some class
// to simplify rpcs::reg(). a server process can have handlers
int handle_bigrep(string &r, const size_t a);
};
+namespace srv_protocol {
+ using status = rpc_protocol::status;
+ REMOTE_PROCEDURE_BASE(0);
+ REMOTE_PROCEDURE(22, _22, (string &, string, string));
+ REMOTE_PROCEDURE(23, fast, (int &, int));
+ REMOTE_PROCEDURE(24, slow, (int &, int));
+ REMOTE_PROCEDURE(25, bigrep, (string &, size_t));
+};
+
// a handler. a and b are arguments, r is the result.
// there can be multiple arguments but only one result.
// the caller also gets to see the int return value
// rpcs::reg() decides how to unmarshall by looking
// at these argument types, so this function definition
// does what a .x file does in SunRPC.
-int
-srv::handle_22(string &r, const string a, string b)
-{
+int srv::handle_22(string &r, const string a, string b) {
r = a + b;
return 0;
}
-int
-srv::handle_fast(int &r, const int a)
-{
+int srv::handle_fast(int &r, const int a) {
r = a + 1;
return 0;
}
-int
-srv::handle_slow(int &r, const int a)
-{
- usleep(random() % 5000);
+int srv::handle_slow(int &r, const int a) {
+ usleep(random() % 500);
r = a + 2;
return 0;
}
-int
-srv::handle_bigrep(string &r, const size_t len)
-{
- r = string((size_t)len, 'x');
+int srv::handle_bigrep(string &r, const size_t len) {
+ r = string(len, 'x');
return 0;
}
-srv service;
+static srv service;
-void startserver()
-{
- server = new rpcs((unsigned int)port);
- server->reg(22, &srv::handle_22, &service);
- server->reg(23, &srv::handle_fast, &service);
- server->reg(24, &srv::handle_slow, &service);
- server->reg(25, &srv::handle_bigrep, &service);
+void startserver() {
+ server = new rpcs(port);
+ server->reg(srv_protocol::_22, &srv::handle_22, &service);
+ server->reg(srv_protocol::fast, &srv::handle_fast, &service);
+ server->reg(srv_protocol::slow, &srv::handle_slow, &service);
+ server->reg(srv_protocol::bigrep, &srv::handle_bigrep, &service);
+ server->start();
}
-void
-testmarshall()
-{
+void testmarshall() {
marshall m;
- request_header rh{1,2,3,4,5};
- m.pack_req_header(rh);
- VERIFY(m.size()==RPC_HEADER_SZ);
+ rpc_protocol::request_header rh{1,2,3,4,5};
+ m.pack_header(rh);
+ VERIFY(((string)m).size()==rpc_protocol::RPC_HEADER_SZ);
int i = 12345;
unsigned long long l = 1223344455L;
+ size_t sz = 101010101;
string s = "hallo....";
m << i;
m << l;
m << s;
+ m << sz;
- char *b;
- size_t sz;
- m.take_buf(&b,&sz);
- VERIFY(sz == RPC_HEADER_SZ+sizeof(i)+sizeof(l)+s.size()+sizeof(int));
+ string b = m;
+ VERIFY(b.size() == rpc_protocol::RPC_HEADER_SZ+sizeof(i)+sizeof(l)+s.size()+sizeof(int)+sizeof(uint32_t));
- unmarshall un(b,sz);
- request_header rh1;
- un.unpack_req_header(&rh1);
+ unmarshall un(b, true);
+ rpc_protocol::request_header rh1;
+ un.unpack_header(rh1);
VERIFY(memcmp(&rh,&rh1,sizeof(rh))==0);
int i1;
unsigned long long l1;
string s1;
+ size_t sz1;
un >> i1;
un >> l1;
un >> s1;
+ un >> sz1;
VERIFY(un.okdone());
- VERIFY(i1==i && l1==l && s1==s);
+ VERIFY(i1==i && l1==l && s1==s && sz1==sz);
}
-void
-client1(size_t cl)
-{
+void client1(size_t cl) {
// test concurrency.
size_t which_cl = cl % NUM_CL;
for(int i = 0; i < 100; i++){
- int arg = (random() % 2000);
+ unsigned long arg = (random() % 2000);
string rep;
- int ret = clients[which_cl]->call(25, rep, arg);
+ int ret = clients[which_cl]->call(srv_protocol::bigrep, rep, arg);
VERIFY(ret == 0);
- if ((int)rep.size()!=arg)
+ if ((unsigned long)rep.size()!=arg)
cout << "repsize wrong " << rep.size() << "!=" << arg << endl;
- VERIFY((int)rep.size() == arg);
+ VERIFY((unsigned long)rep.size() == arg);
}
// test rpc replies coming back not in the order of
int arg = (random() % 1000);
int rep;
- auto start = std::chrono::steady_clock::now();
+ auto start = steady_clock::now();
- int ret = clients[which_cl]->call(which ? 23 : 24, rep, arg);
- auto end = std::chrono::steady_clock::now();
- auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+ int ret = clients[which_cl]->call(which ? srv_protocol::fast : srv_protocol::slow, rep, arg);
+ auto end = steady_clock::now();
+ auto diff = duration_cast<milliseconds>(end - start).count();
if (ret != 0)
cout << diff << " ms have elapsed!!!" << endl;
VERIFY(ret == 0);
}
}
-void
-client2(size_t cl)
-{
+void client2(size_t cl) {
size_t which_cl = cl % NUM_CL;
time_t t1;
time(&t1);
while(time(0) - t1 < 10){
- int arg = (random() % 2000);
+ unsigned long arg = (random() % 2000);
string rep;
- int ret = clients[which_cl]->call(25, rep, arg);
- if ((int)rep.size()!=arg)
+ int ret = clients[which_cl]->call(srv_protocol::bigrep, rep, arg);
+ if ((unsigned long)rep.size()!=arg)
cout << "ask for " << arg << " reply got " << rep.size() << " ret " << ret << endl;
- VERIFY((int)rep.size() == arg);
+ VERIFY((unsigned long)rep.size() == arg);
}
}
-void
-client3(void *xx)
-{
+void client3(void *xx) {
rpcc *c = (rpcc *) xx;
for(int i = 0; i < 4; i++){
int rep = 0;
- int ret = c->call_timeout(24, rpcc::to(3000), rep, i);
- VERIFY(ret == rpc_const::timeout_failure || rep == i+2);
+ int ret = c->call_timeout(srv_protocol::slow, milliseconds(300), rep, i);
+ VERIFY(ret == rpc_protocol::timeout_failure || rep == i+2);
}
}
-
-void
-simple_tests(rpcc *c)
-{
+void simple_tests(rpcc *c) {
cout << "simple_tests" << endl;
// an RPC call to procedure #22.
// rpcc::call() looks at the argument types to decide how
// to marshall the RPC call packet, and how to unmarshall
// the reply packet.
string rep;
- int intret = c->call(22, rep, (string)"hello", (string)" goodbye");
+ int intret = c->call(srv_protocol::_22, rep, (string)"hello", (string)" goodbye");
VERIFY(intret == 0); // this is what handle_22 returns
VERIFY(rep == "hello goodbye");
cout << " -- string concat RPC .. ok" << endl;
// small request, big reply (perhaps req via UDP, reply via TCP)
- intret = c->call_timeout(25, rpcc::to(200000), rep, 70000);
+ intret = c->call_timeout(srv_protocol::bigrep, milliseconds(20000), rep, 70000ul);
VERIFY(intret == 0);
VERIFY(rep.size() == 70000);
cout << " -- small request, big reply .. ok" << endl;
// specify a timeout value to an RPC that should succeed (udp)
int xx = 0;
- intret = c->call_timeout(23, rpcc::to(3000), xx, 77);
+ intret = c->call_timeout(srv_protocol::fast, milliseconds(300), xx, 77);
VERIFY(intret == 0 && xx == 78);
cout << " -- no spurious timeout .. ok" << endl;
{
string arg(1000, 'x');
string rep2;
- c->call_timeout(22, rpcc::to(3000), rep2, arg, (string)"x");
+ c->call_timeout(srv_protocol::_22, milliseconds(300), rep2, arg, (string)"x");
VERIFY(rep2.size() == 1001);
cout << " -- no spurious timeout .. ok" << endl;
}
// huge RPC
string big(1000000, 'x');
- intret = c->call(22, rep, big, (string)"z");
+ intret = c->call(srv_protocol::_22, rep, big, (string)"z");
+ VERIFY(intret == 0);
VERIFY(rep.size() == 1000001);
cout << " -- huge 1M rpc request .. ok" << endl;
string non_existent = "127.0.0.1:7661";
rpcc *c1 = new rpcc(non_existent);
time_t t0 = time(0);
- intret = c1->bind(rpcc::to(3000));
+ intret = c1->bind(milliseconds(300));
time_t t1 = time(0);
VERIFY(intret < 0 && (t1 - t0) <= 4);
cout << " -- rpc timeout .. ok" << endl;
cout << "simple_tests OK" << endl;
}
-void
-concurrent_test(size_t nt)
-{
+void concurrent_test(size_t nt) {
// create threads that make lots of calls in parallel,
// to test thread synchronization for concurrent calls
// and dispatches.
cout << " OK" << endl;
}
-void
-lossy_test()
-{
+void lossy_test() {
cout << "start lossy_test ...";
VERIFY(setenv("RPC_LOSSY", "5", 1) == 0);
VERIFY(setenv("RPC_LOSSY", "0", 1) == 0);
}
-void
-failure_test()
-{
+void failure_test() {
rpcc *client1;
rpcc *client = clients[0];
delete server;
client1 = new rpcc(dst);
- VERIFY (client1->bind(rpcc::to(3000)) < 0);
+ VERIFY (client1->bind(milliseconds(3000)) < 0);
cout << " -- create new client and try to bind to failed server .. failed ok" << endl;
delete client1;
startserver();
string rep;
- int intret = client->call(22, rep, (string)"hello", (string)" goodbye");
- VERIFY(intret == rpc_const::oldsrv_failure);
+ int intret = client->call(srv_protocol::_22, rep, (string)"hello", (string)" goodbye");
+ VERIFY(intret == rpc_protocol::oldsrv_failure);
cout << " -- call recovered server with old client .. failed ok" << endl;
delete client;
VERIFY (client->bind() >= 0);
VERIFY (client->bind() < 0);
- intret = client->call(22, rep, (string)"hello", (string)" goodbye");
+ intret = client->call(srv_protocol::_22, rep, (string)"hello", (string)" goodbye");
VERIFY(intret == 0);
VERIFY(rep == "hello goodbye");
cout << "failure_test OK" << endl;
}
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0);
debug_level = atoi(optarg);
break;
case 'p':
- port = atoi(optarg);
+ port = (in_port_t)atoi(optarg);
break;
case 'l':
VERIFY(setenv("RPC_LOSSY", "5", 1) == 0);
testmarshall();
if (isserver) {
- cout << "starting server on port " << port << " RPC_HEADER_SZ " << (int)RPC_HEADER_SZ << endl;
+ cout << "starting server on port " << port << " RPC_HEADER_SZ " << (int)rpc_protocol::RPC_HEADER_SZ << endl;
startserver();
}
if (isclient) {
// server's address.
- dst = "127.0.0.1:" + std::to_string(port);
+ dst = "127.0.0.1:" + to_string(port);
// start the client. bind it to the server.
exit(0);
}
- while (1) {
- sleep(1);
- }
+ while (1)
+ usleep(100000);
}