Make private raft methods 'static'.

kvap · kvap · commit d29857c91f52 · 2015-10-29T16:22:45.000+03:00
diff --git a/contrib/pg_dtm/dtmd/src/raft.c b/contrib/pg_dtm/dtmd/src/raft.c
@@ -15,7 +15,7 @@ static void raft_server_init(raft_server_t *s) {
 	s->port = DEFAULT_LISTENPORT;
 }
 
-void raft_reset_timer(raft_t *r) {
+static void raft_reset_timer(raft_t *r) {
 	if (r->role == ROLE_LEADER) {
 		r->timer = HEARTBEAT_TIMEOUT_MS;
 	} else {
@@ -186,7 +186,7 @@ static void raft_send(raft_t *r, int dst, void *m, int mlen) {
 	}
 }
 
-void raft_beat(raft_t *r, int dst) {
+static void raft_beat(raft_t *r, int dst) {
 	if (dst == NOBODY) {
 		// send a beat/update to everybody
 		int i;
@@ -235,7 +235,7 @@ void raft_beat(raft_t *r, int dst) {
 	raft_send(r, dst, &m, sizeof(m));
 }
 
-void raft_claim(raft_t *r) {
+static void raft_claim(raft_t *r) {
 	assert(r->role == ROLE_CANDIDATE);
 	assert(r->leader == NOBODY);
 
@@ -414,7 +414,7 @@ static bool log_append(raft_log_t *l, int previndex, int prevterm, raft_entry_t
 	return true;
 }
 
-void raft_handle_update(raft_t *r, raft_msg_update_t *m) {
+static void raft_handle_update(raft_t *r, raft_msg_update_t *m) {
 	int sender = m->msg.from;
 
 	raft_msg_done_t reply;
@@ -492,7 +492,7 @@ static void raft_refresh_acked(raft_t *r) {
 	}
 }
 
-void raft_handle_done(raft_t *r, raft_msg_done_t *m) {
+static void raft_handle_done(raft_t *r, raft_msg_done_t *m) {
 	if (r->role != ROLE_LEADER) {
 		return;
 	}
@@ -539,7 +539,7 @@ static void raft_set_term(raft_t *r, int term) {
 	r->votes = 0;
 }
 
-void raft_handle_claim(raft_t *r, raft_msg_claim_t *m) {
+static void raft_handle_claim(raft_t *r, raft_msg_claim_t *m) {
 	int candidate = m->msg.from;
 
 	if (m->msg.term >= r->term) {
@@ -579,7 +579,7 @@ void raft_handle_claim(raft_t *r, raft_msg_claim_t *m) {
 	raft_send(r, candidate, &reply, sizeof(reply));
 }
 
-void raft_handle_vote(raft_t *r, raft_msg_vote_t *m) {
+static void raft_handle_vote(raft_t *r, raft_msg_vote_t *m) {
 	int sender = m->msg.from;
 	raft_server_t *server = r->servers + sender;
 	if (m->msg.seqno != server->seqno) return;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ static void raft_server_init(raft_server_t *s) {`
`15`	`15`	`s->port = DEFAULT_LISTENPORT;`
`16`	`16`	`}`
`17`	`17`
`18`		`-void raft_reset_timer(raft_t *r) {`
	`18`	`+static void raft_reset_timer(raft_t *r) {`
`19`	`19`	`if (r->role == ROLE_LEADER) {`
`20`	`20`	`r->timer = HEARTBEAT_TIMEOUT_MS;`
`21`	`21`	`} else {`
`@@ -186,7 +186,7 @@ static void raft_send(raft_t r, int dst, void m, int mlen) {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`-void raft_beat(raft_t *r, int dst) {`
	`189`	`+static void raft_beat(raft_t *r, int dst) {`
`190`	`190`	`if (dst == NOBODY) {`
`191`	`191`	`// send a beat/update to everybody`
`192`	`192`	`int i;`
`@@ -235,7 +235,7 @@ void raft_beat(raft_t *r, int dst) {`
`235`	`235`	`raft_send(r, dst, &m, sizeof(m));`
`236`	`236`	`}`
`237`	`237`
`238`		`-void raft_claim(raft_t *r) {`
	`238`	`+static void raft_claim(raft_t *r) {`
`239`	`239`	`assert(r->role == ROLE_CANDIDATE);`
`240`	`240`	`assert(r->leader == NOBODY);`
`241`	`241`
`@@ -414,7 +414,7 @@ static bool log_append(raft_log_t *l, int previndex, int prevterm, raft_entry_t`
`414`	`414`	`return true;`
`415`	`415`	`}`
`416`	`416`
`417`		`-void raft_handle_update(raft_t r, raft_msg_update_t m) {`
	`417`	`+static void raft_handle_update(raft_t r, raft_msg_update_t m) {`
`418`	`418`	`int sender = m->msg.from;`
`419`	`419`
`420`	`420`	`raft_msg_done_t reply;`
`@@ -492,7 +492,7 @@ static void raft_refresh_acked(raft_t *r) {`
`492`	`492`	`}`
`493`	`493`	`}`
`494`	`494`
`495`		`-void raft_handle_done(raft_t r, raft_msg_done_t m) {`
	`495`	`+static void raft_handle_done(raft_t r, raft_msg_done_t m) {`
`496`	`496`	`if (r->role != ROLE_LEADER) {`
`497`	`497`	`return;`
`498`	`498`	`}`
`@@ -539,7 +539,7 @@ static void raft_set_term(raft_t *r, int term) {`
`539`	`539`	`r->votes = 0;`
`540`	`540`	`}`
`541`	`541`
`542`		`-void raft_handle_claim(raft_t r, raft_msg_claim_t m) {`
	`542`	`+static void raft_handle_claim(raft_t r, raft_msg_claim_t m) {`
`543`	`543`	`int candidate = m->msg.from;`
`544`	`544`
`545`	`545`	`if (m->msg.term >= r->term) {`
`@@ -579,7 +579,7 @@ void raft_handle_claim(raft_t r, raft_msg_claim_t m) {`
`579`	`579`	`raft_send(r, candidate, &reply, sizeof(reply));`
`580`	`580`	`}`
`581`	`581`
`582`		`-void raft_handle_vote(raft_t r, raft_msg_vote_t m) {`
	`582`	`+static void raft_handle_vote(raft_t r, raft_msg_vote_t m) {`
`583`	`583`	`int sender = m->msg.from;`
`584`	`584`	`raft_server_t *server = r->servers + sender;`
`585`	`585`	`if (m->msg.seqno != server->seqno) return;`