Merge branch 'master' of github.com:Determinant/hot-stuff

1 files changed, 42 insertions, 26 deletions

diff --git a/src/hotstuff_app.cpp b/src/hotstuff_app.cpp
index ead4e0b..768e81e 100644
--- a/src/hotstuff_app.cpp
+++ b/src/hotstuff_app.cpp
@@ -48,25 +48,22 @@ using hotstuff::promise_t;
 
 using HotStuff = hotstuff::HotStuffSecp256k1;
 
-#define LOG_INFO HOTSTUFF_LOG_INFO
-#define LOG_DEBUG HOTSTUFF_LOG_DEBUG
-#define LOG_WARN HOTSTUFF_LOG_WARN
-#define LOG_ERROR HOTSTUFF_LOG_ERROR
-
 class HotStuffApp: public HotStuff {
     double stat_period;
+    double impeach_timeout;
     EventContext ec;
     /** Network messaging between a replica and its client. */
     ClientNetwork<opcode_t> cn;
     /** Timer object to schedule a periodic printing of system statistics */
     Event ev_stat_timer;
+    /** Timer object to monitor the progress for simple impeachment */
+    Event impeach_timer;
     /** The listen address for client RPC */
     NetAddr clisten_addr;
 
     using Conn = ClientNetwork<opcode_t>::Conn;
 
     void client_request_cmd_handler(MsgReqCmd &&, Conn &);
-    void print_stat_cb(evutil_socket_t, short);
 
     command_t parse_cmd(DataStream &s) override {
         auto cmd = new CommandDummy();
@@ -74,15 +71,22 @@ class HotStuffApp: public HotStuff {
         return cmd;
     }
 
+    void reset_imp_timer() {
+        impeach_timer.del();
+        impeach_timer.add_with_timeout(impeach_timeout);
+    }
+
     void state_machine_execute(const Finality &fin) override {
+        reset_imp_timer();
 #ifndef HOTSTUFF_ENABLE_BENCHMARK
-        LOG_INFO("replicated %s", std::string(fin).c_str());
+        HOTSTUFF_LOG_INFO("replicated %s", std::string(fin).c_str());
 #endif
     }
 
     public:
     HotStuffApp(uint32_t blk_size,
                 double stat_period,
+                double impeach_timeout,
                 ReplicaID idx,
                 const bytearray_t &raw_privkey,
                 NetAddr plisten_addr,
@@ -124,15 +128,21 @@ int main(int argc, char **argv) {
     auto opt_privkey = Config::OptValStr::create();
     auto opt_help = Config::OptValFlag::create(false);
     auto opt_pace_maker = Config::OptValStr::create("dummy");
+    auto opt_fixed_proposer = Config::OptValInt::create(1);
+    auto opt_qc_timeout = Config::OptValDouble::create(0.5);
+    auto opt_imp_timeout = Config::OptValDouble::create(11);
 
     config.add_opt("block-size", opt_blk_size, Config::SET_VAL);
     config.add_opt("parent-limit", opt_parent_limit, Config::SET_VAL);
     config.add_opt("stat-period", opt_stat_period, Config::SET_VAL);
-    config.add_opt("replica", opt_replicas, Config::APPEND);
-    config.add_opt("idx", opt_idx, Config::SET_VAL);
-    config.add_opt("cport", opt_client_port, Config::SET_VAL);
+    config.add_opt("replica", opt_replicas, Config::APPEND, 'a', "add an replica to the list");
+    config.add_opt("idx", opt_idx, Config::SET_VAL, 'i', "specify the index in the replica list");
+    config.add_opt("cport", opt_client_port, Config::SET_VAL, 'c', "specify the port listening for clients");
     config.add_opt("privkey", opt_privkey, Config::SET_VAL);
     config.add_opt("pace-maker", opt_pace_maker, Config::SET_VAL, 'p', "specify pace maker (sticky, dummy)");
+    config.add_opt("proposer", opt_fixed_proposer, Config::SET_VAL, 'l', "set the fixed proposer (for dummy)");
+    config.add_opt("qc-timeout", opt_qc_timeout, Config::SET_VAL, 't', "set QC timeout (for sticky)");
+    config.add_opt("imp-timeout", opt_imp_timeout, Config::SET_VAL, 'u', "set impeachment timeout (for sticky)");
     config.add_opt("help", opt_help, Config::SWITCH_ON, 'h', "show this help info");
 
     EventContext ec;
@@ -175,12 +185,15 @@ int main(int argc, char **argv) {
         auto parent_limit = opt_parent_limit->get();
         hotstuff::pacemaker_bt pmaker;
         if (opt_pace_maker->get() == "sticky")
-            pmaker = new hotstuff::PaceMakerSticky(parent_limit, 0.5, ec);
+            pmaker = new hotstuff::PaceMakerSticky(parent_limit, opt_qc_timeout->get(), ec);
+        else if (opt_pace_maker->get() == "rr")
+            pmaker = new hotstuff::PaceMakerRR(parent_limit, opt_qc_timeout->get(), ec);
         else
-            pmaker = new hotstuff::PaceMakerDummyFixed(1, parent_limit);
+            pmaker = new hotstuff::PaceMakerDummyFixed(opt_fixed_proposer->get(), parent_limit);
 
         papp = new HotStuffApp(opt_blk_size->get(),
                             opt_stat_period->get(),
+                            opt_imp_timeout->get(),
                             idx,
                             hotstuff::from_hex(opt_privkey->get()),
                             plisten_addr,
@@ -205,6 +218,7 @@ int main(int argc, char **argv) {
 
 HotStuffApp::HotStuffApp(uint32_t blk_size,
                         double stat_period,
+                        double impeach_timeout,
                         ReplicaID idx,
                         const bytearray_t &raw_privkey,
                         NetAddr plisten_addr,
@@ -214,6 +228,7 @@ HotStuffApp::HotStuffApp(uint32_t blk_size,
     HotStuff(blk_size, idx, raw_privkey,
             plisten_addr, std::move(pmaker), ec),
     stat_period(stat_period),
+    impeach_timeout(impeach_timeout),
     ec(ec),
     cn(ec),
     clisten_addr(clisten_addr) {
@@ -227,28 +242,29 @@ void HotStuffApp::client_request_cmd_handler(MsgReqCmd &&msg, Conn &conn) {
     msg.postponed_parse(this);
     auto cmd = msg.cmd;
     std::vector<promise_t> pms;
-    LOG_DEBUG("processing %s", std::string(*cmd).c_str());
+    HOTSTUFF_LOG_DEBUG("processing %s", std::string(*cmd).c_str());
     exec_command(cmd).then([this, addr](Finality fin) {
         cn.send_msg(MsgRespCmd(fin), addr);
     });
 }
 
 void HotStuffApp::start() {
-    ev_stat_timer = Event(ec, -1, 0,
-            std::bind(&HotStuffApp::print_stat_cb, this, _1, _2));
+    ev_stat_timer = Event(ec, -1, 0, [this](int, short) {
+        HotStuff::print_stat();
+        //HotStuffCore::prune(100);
+        ev_stat_timer.add_with_timeout(stat_period);
+    });
     ev_stat_timer.add_with_timeout(stat_period);
-    LOG_INFO("** starting the system with parameters **");
-    LOG_INFO("blk_size = %lu", blk_size);
-    LOG_INFO("conns = %lu", HotStuff::size());
-    LOG_INFO("** starting the event loop...");
+    impeach_timer = Event(ec, -1, 0, [this](int, short) {
+        get_pace_maker().impeach();
+        reset_imp_timer();
+    });
+    impeach_timer.add_with_timeout(impeach_timeout);
+    HOTSTUFF_LOG_INFO("** starting the system with parameters **");
+    HOTSTUFF_LOG_INFO("blk_size = %lu", blk_size);
+    HOTSTUFF_LOG_INFO("conns = %lu", HotStuff::size());
+    HOTSTUFF_LOG_INFO("** starting the event loop...");
     HotStuff::start();
     /* enter the event main loop */
     ec.dispatch();
 }
-
-
-void HotStuffApp::print_stat_cb(evutil_socket_t, short) {
-    HotStuff::print_stat();
-    //HotStuffCore::prune(100);
-    ev_stat_timer.add_with_timeout(stat_period);
-}