ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-03 02:35:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

update -> note, and call it

Browse Source
This commit is contained in:
Steven Dee 2014-03-06 16:04:52 -08:00
parent 7c7c044525
commit 53fafd25fd
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
v/raft.c
View File

@ -181,10 +181,10 @@ _raft_demote(u2_raft* raf_u)
}
}
/* _raft_update_term(): note an updated term.
/* _raft_note_term(): note a term from the network, demoting if it is newer.
*/
static void
_raft_update_term(u2_raft* raf_u, c3_w tem_w)
_raft_note_term(u2_raft* raf_u, c3_w tem_w)
{
if ( raf_u->tem_w < tem_w ) {
uL(fprintf(uH, "raft: got term from network: %d\n", tem_w));
@ -243,21 +243,19 @@ static void
_raft_do_rest(u2_rcon* ron_u, const u2_rmsg* msg_u)
{
u2_raft* raf_u = ron_u->raf_u;
c3_i sas_i;
sas_i = uv_timer_stop(&raf_u->tim_u);
c3_assert(0 == sas_i);
sas_i = uv_timer_start(&raf_u->tim_u, &_raft_time_cb,
150 + _raft_election_rand(), 0);
c3_assert(0 == sas_i);
if ( u2_raty_cand == raf_u->typ_e || u2_raty_foll == raf_u->typ_e ) {
c3_i sas_i;
if ( msg_u->tem_w > raf_u->tem_w ) {
uL(fprintf(uH, "raft: got term %d from network\n", msg_u->tem_w));
raf_u->tem_w = msg_u->tem_w;
raf_u->vog_c = 0;
raf_u->vot_w = 0;
sas_i = uv_timer_stop(&raf_u->tim_u);
c3_assert(0 == sas_i);
sas_i = uv_timer_start(&raf_u->tim_u, &_raft_time_cb,
150 + _raft_election_rand(), 0);
c3_assert(0 == sas_i);
}
_raft_rest_name(ron_u, msg_u->rest.nam_c);
_raft_note_term(raf_u, msg_u->tem_w);
}
/* _raft_do_apen(): Handle incoming AppendEntries.
@ -358,7 +356,7 @@ _raft_do_rasp(u2_rcon* ron_u, u2_rmsg* msg_u)
}
}
_raft_update_term(raf_u, msg_u->tem_w);
_raft_note_term(raf_u, msg_u->tem_w);
ron_u->out_u = req_u->nex_u;
if ( 0 == req_u->nex_u ) {