diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hotstuff.cpp | 4 | ||||
| -rw-r--r-- | src/hotstuff_app.cpp | 39 |
2 files changed, 27 insertions, 16 deletions
diff --git a/src/hotstuff.cpp b/src/hotstuff.cpp index 557a81e..f174559 100644 --- a/src/hotstuff.cpp +++ b/src/hotstuff.cpp @@ -362,13 +362,13 @@ HotStuffBase::HotStuffBase(uint32_t blk_size, pacemaker_bt pmaker, EventContext ec, size_t nworker, - const Net::Config &config): + const Net::Config &netconfig): HotStuffCore(rid, std::move(priv_key)), listen_addr(listen_addr), blk_size(blk_size), ec(ec), vpool(ec, nworker), - pn(ec, config), + pn(ec, netconfig), pmaker(std::move(pmaker)), fetched(0), delivered(0), diff --git a/src/hotstuff_app.cpp b/src/hotstuff_app.cpp index dab0298..e9a97e3 100644 --- a/src/hotstuff_app.cpp +++ b/src/hotstuff_app.cpp @@ -121,7 +121,8 @@ class HotStuffApp: public HotStuff { hotstuff::pacemaker_bt pmaker, const EventContext &ec, size_t nworker, - const Net::Config &config); + const Net::Config &repnet_config, + const ClientNetwork<opcode_t>::Config &clinet_config); void start(); }; @@ -153,9 +154,11 @@ int main(int argc, char **argv) { 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); - auto opt_nworker = Config::OptValInt::create(4); - auto opt_netnworker = Config::OptValInt::create(4); - auto opt_netburst = Config::OptValInt::create(100); + auto opt_nworker = Config::OptValInt::create(1); + auto opt_repnworker = Config::OptValInt::create(1); + auto opt_repburst = Config::OptValInt::create(100); + auto opt_clinworker = Config::OptValInt::create(8); + auto opt_cliburst = Config::OptValInt::create(1000); config.add_opt("block-size", opt_blk_size, Config::SET_VAL); config.add_opt("parent-limit", opt_parent_limit, Config::SET_VAL); @@ -169,8 +172,10 @@ int main(int argc, char **argv) { 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("nworker", opt_nworker, Config::SET_VAL, 'n', "the number of threads for verification"); - config.add_opt("netnworker", opt_netnworker, Config::SET_VAL, 'm', "the number of threads for network"); - config.add_opt("netburst", opt_netburst, Config::SET_VAL, 'm', "salticidae burst rate"); + config.add_opt("repnworker", opt_repnworker, Config::SET_VAL, 'm', "the number of threads for replica network"); + config.add_opt("repburst", opt_repburst, Config::SET_VAL, 'b', ""); + config.add_opt("clinworker", opt_clinworker, Config::SET_VAL, 'M', "the number of threads for client network"); + config.add_opt("cliburst", opt_cliburst, Config::SET_VAL, 'B', ""); config.add_opt("help", opt_help, Config::SWITCH_ON, 'h', "show this help info"); EventContext ec; @@ -216,10 +221,14 @@ int main(int argc, char **argv) { else pmaker = new hotstuff::PaceMakerDummyFixed(opt_fixed_proposer->get(), parent_limit); - HotStuffApp::Net::Config netconfig; - netconfig - .burst_size(opt_netburst->get()) - .nworker(opt_netnworker->get()); + HotStuffApp::Net::Config repnet_config; + ClientNetwork<opcode_t>::Config clinet_config; + repnet_config + .burst_size(opt_repburst->get()) + .nworker(opt_repnworker->get()); + clinet_config + .burst_size(opt_cliburst->get()) + .nworker(opt_clinworker->get()); papp = new HotStuffApp(opt_blk_size->get(), opt_stat_period->get(), opt_imp_timeout->get(), @@ -230,7 +239,8 @@ int main(int argc, char **argv) { std::move(pmaker), ec, opt_nworker->get(), - netconfig); + repnet_config, + clinet_config); for (size_t i = 0; i < replicas.size(); i++) { auto p = split_ip_port_cport(replicas[i].first); @@ -258,13 +268,14 @@ HotStuffApp::HotStuffApp(uint32_t blk_size, hotstuff::pacemaker_bt pmaker, const EventContext &ec, size_t nworker, - const Net::Config &config): + const Net::Config &repnet_config, + const ClientNetwork<opcode_t>::Config &clinet_config): HotStuff(blk_size, idx, raw_privkey, - plisten_addr, std::move(pmaker), ec, nworker, config), + plisten_addr, std::move(pmaker), ec, nworker, repnet_config), stat_period(stat_period), impeach_timeout(impeach_timeout), ec(ec), - cn(ec, ClientNetwork<opcode_t>::Config().burst_size(1)), + cn(ec, clinet_config), clisten_addr(clisten_addr) { /* register the handlers for msg from clients */ cn.reg_handler(salticidae::generic_bind(&HotStuffApp::client_request_cmd_handler, this, _1, _2)); |