X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/2546a41ad36fdc9ef6471cb35a1d56930ae1b527..c9be386a30dc7145ac757fae66c255b21da26d5d:/config.cc diff --git a/config.cc b/config.cc index 7bac4a9..038a100 100644 --- a/config.cc +++ b/config.cc @@ -1,10 +1,5 @@ -#include -#include #include "config.h" -#include "paxos.h" #include "handle.h" -#include "threaded_log.h" -#include "lang/verify.h" // The config module maintains views. As a node joins or leaves a // view, the next view will be the same as previous view, except with @@ -40,8 +35,7 @@ config::config(const string &_first, const string &_me, config_view_change *_vc) : my_view_id(0), first(_first), me(_me), vc(_vc), - paxos_acceptor(this, me == _first, me, me), - paxos_proposer(this, &paxos_acceptor, me) + paxos(this, me == _first, me, me) { get_rpcs()->reg(paxos_protocol::heartbeat, &config::heartbeat, this); lock cfg_mutex_lock(cfg_mutex); @@ -51,7 +45,7 @@ config::config(const string &_first, const string &_me, config_view_change *_vc) void config::restore(const string &s) { lock cfg_mutex_lock(cfg_mutex); - paxos_acceptor.restore(s); + paxos.restore(s); reconstruct(cfg_mutex_lock); } @@ -61,29 +55,25 @@ void config::get_view(unsigned instance, vector &m) { } void config::get_view(unsigned instance, vector &m, lock &) { - string value = paxos_acceptor.value(instance); + string value = paxos.value(instance); LOG("get_view(" << instance << "): returns " << value); m = members(value); } vector config::members(const string &value) const { - istringstream ist(value); - using it = istream_iterator; - return {it(ist), it()}; + return explode(value); } -string config::value(const vector &m) const { - ostringstream ost; - copy(m.begin(), m.end(), ostream_iterator(ost, " ")); - return ost.str(); +string config::value(const vector &members) const { + return implode(members); } void config::reconstruct(lock &cfg_mutex_lock) { VERIFY(cfg_mutex_lock); - if (paxos_acceptor.instance() > 0) { - my_view_id = paxos_acceptor.instance(); + my_view_id = paxos.instance(); + if (my_view_id > 0) { get_view(my_view_id, mems, cfg_mutex_lock); - LOG("config::reconstruct: " << my_view_id << " " << print_members(mems)); + LOG("config::reconstruct: " << my_view_id << " " << mems); } } @@ -92,7 +82,7 @@ void config::paxos_commit(unsigned instance, const string &value) { lock cfg_mutex_lock(cfg_mutex); vector newmem = members(value); - LOG("config::paxos_commit: " << instance << ": " << print_members(newmem)); + LOG("config::paxos_commit: " << instance << ": " << newmem); for (auto mem : mems) { LOG("config::paxos_commit: is " << mem << " still a member?"); @@ -120,17 +110,20 @@ bool config::ismember(const string &m, unsigned vid) { bool config::add(const string &new_m, unsigned vid) { lock cfg_mutex_lock(cfg_mutex); - if (vid != my_view_id) + LOG("adding " << new_m << " to " << vid); + if (vid != my_view_id) { + LOG("that's not my view id, " << my_view_id << "!"); return false; - LOG("config::add " << new_m); + } vector m = mems; m.push_back(new_m); vector cmems = mems; unsigned nextvid = my_view_id + 1; + LOG("calling down to paxos layer"); cfg_mutex_lock.unlock(); - bool r = paxos_proposer.run(nextvid, cmems, value(m)); + bool r = paxos.run(nextvid, cmems, value(m)); cfg_mutex_lock.lock(); - LOG("config::add: proposer returned " << (r ? "success" : "failure")); + LOG("paxos proposer returned " << (r ? "success" : "failure")); return r; } @@ -145,7 +138,7 @@ bool config::remove(const string &m, lock &cfg_mutex_lock) { vector cmems = mems; unsigned nextvid = my_view_id + 1; cfg_mutex_lock.unlock(); - bool r = paxos_proposer.run(nextvid, cmems, value(n)); + bool r = paxos.run(nextvid, cmems, value(n)); cfg_mutex_lock.lock(); LOG("config::remove: proposer returned " << (r ? "success" : "failure")); return r; @@ -162,7 +155,7 @@ void config::heartbeater() [[noreturn]] { unsigned vid = my_view_id; vector cmems; get_view(vid, cmems, cfg_mutex_lock); - LOG("heartbeater: current membership " << print_members(cmems)); + LOG("heartbeater: current membership " << cmems); if (!isamember(me, cmems)) { LOG("heartbeater: not member yet; skip hearbeat"); @@ -195,7 +188,7 @@ paxos_protocol::status config::heartbeat(int &r, string m, unsigned vid) { LOG("heartbeat from " << m << "(" << vid << ") my_view_id " << my_view_id); if (vid == my_view_id) return paxos_protocol::OK; - else if (paxos_proposer.isrunning()) { + else if (paxos.isrunning()) { VERIFY (vid == my_view_id + 1 || vid + 1 == my_view_id); return paxos_protocol::OK; }