X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/26ade07ab0e62b98b452fbbd18edba0450035e35..03b35a9a1bd1f583e32b27d260b223a0989d6c75:/rsm.cc diff --git a/rsm.cc b/rsm.cc index 5812b33..cb986fe 100644 --- a/rsm.cc +++ b/rsm.cc @@ -83,6 +83,8 @@ #include "rsm_client.h" #include +using std::vector; + rsm_state_transfer::~rsm_state_transfer() {} rsm::rsm(const string & _first, const string & _me) : primary(_first) @@ -103,7 +105,7 @@ rsm::rsm(const string & _first, const string & _me) : primary(_first) rsmrpc->reg(rsm_protocol::joinreq, &rsm::joinreq, this); // tester must be on different port, otherwise it may partition itself - testsvr.reset(new rpcs((in_port_t)stoi(_me) + 1)); + testsvr.reset(new rpcs((in_port_t)std::stoi(_me) + 1)); testsvr->reg(rsm_test_protocol::net_repair, &rsm::test_net_repairreq, this); testsvr->reg(rsm_test_protocol::breakpoint, &rsm::breakpointreq, this); } @@ -129,7 +131,7 @@ void rsm::recovery() { commit_change(cfg->view_id(), ml); } else { ml.unlock(); - this_thread::sleep_for(seconds(3)); // XXX make another node in cfg primary? + std::this_thread::sleep_for(milliseconds(3000)); // XXX make another node in cfg primary? ml.lock(); } }