diff options
| author | Determinant <[email protected]> | 2018-08-07 17:27:57 -0400 |
|---|---|---|
| committer | Determinant <[email protected]> | 2018-08-07 17:27:57 -0400 |
| commit | 062a1368abaa44585dcc4ea9b11e46708dbb418c (patch) | |
| tree | 6ea1955ed1c81c93ee725c650fb4335454971afb /include/hotstuff | |
| parent | 086e37788e16ddf62c0676a223002a3ea1b6d2e0 (diff) | |
sticky pace maker seems to work
Diffstat (limited to 'include/hotstuff')
| -rw-r--r-- | include/hotstuff/liveness.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/include/hotstuff/liveness.h b/include/hotstuff/liveness.h index 3d3137a..3d5a457 100644 --- a/include/hotstuff/liveness.h +++ b/include/hotstuff/liveness.h @@ -209,8 +209,8 @@ class PMStickyProposer: virtual public PaceMaker { void reg_follower_receive_proposal() { pm_wait_receive_proposal.reject(); - pm_wait_receive_proposal = - hsc->async_wait_receive_proposal().then( + (pm_wait_receive_proposal = hsc->async_wait_receive_proposal()) + .then( salticidae::generic_bind( &PMStickyProposer::follower_receive_proposal, this, _1)); } @@ -251,7 +251,7 @@ class PMStickyProposer: virtual public PaceMaker { void reg_proposer_propose() { pm_wait_propose.reject(); - pm_wait_propose = hsc->async_wait_propose().then( + (pm_wait_propose = hsc->async_wait_propose()).then( salticidae::generic_bind( &PMStickyProposer::proposer_propose, this, _1)); } @@ -263,27 +263,34 @@ class PMStickyProposer: virtual public PaceMaker { reg_proposer_propose(); } + void gen() { + DataStream s; + /* FIXME: should extra data be the voter's id? */ + s << hsc->get_id(); + hsc->on_propose(std::vector<command_t>{}, + get_parents(), std::move(s)); + } + void candidate_qc_timeout() { pm_qc_finish.reject(); - hsc->async_wait_propose().then([this](const block_t &blk) { + pm_wait_propose.reject(); + (pm_wait_propose = hsc->async_wait_propose()).then([this](const block_t &blk) { pm_qc_finish.reject(); - pm_qc_finish = hsc->async_qc_finish(blk).then([this]() { + pm_qc_finish = hsc->async_qc_finish(blk).then([this, blk]() { + HOTSTUFF_LOG_INFO("collected QC for %s", std::string(*blk).c_str()); /* managed to collect a QC */ to_proposer(); + gen(); }); }); reset_qc_timer(); - DataStream s; - /* FIXME: should extra data be the voter's id? */ - s << hsc->get_id(); - hsc->on_propose(std::vector<command_t>{}, - get_parents(), std::move(s)); + gen(); } void reg_candidate_receive_proposal() { pm_wait_receive_proposal.reject(); - pm_wait_receive_proposal = - hsc->async_wait_receive_proposal().then( + (pm_wait_receive_proposal = hsc->async_wait_receive_proposal()) + .then( salticidae::generic_bind( &PMStickyProposer::candidate_receive_proposal, this, _1)); } |