Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
RedisLabs Raft
Commits
862de6ab
Commit
862de6ab
authored
Jul 26, 2015
by
Willem Thiart
Browse files
Removed func_send_entries_f as it is unused
parent
dce1c9f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/raft.h
View file @
862de6ab
...
@@ -76,9 +76,9 @@ typedef struct
...
@@ -76,9 +76,9 @@ typedef struct
int
leader_id
;
int
leader_id
;
int
prev_log_idx
;
int
prev_log_idx
;
int
prev_log_term
;
int
prev_log_term
;
int
leader_commit
;
int
n_entries
;
int
n_entries
;
msg_entry_t
*
entries
;
msg_entry_t
*
entries
;
int
leader_commit
;
}
msg_appendentries_t
;
}
msg_appendentries_t
;
typedef
struct
typedef
struct
...
@@ -140,20 +140,6 @@ typedef int (
...
@@ -140,20 +140,6 @@ typedef int (
msg_appendentries_t
*
msg
msg_appendentries_t
*
msg
);
);
/**
* @param raft The Raft server making this callback
* @param udata User data that is passed from Raft server
* @param node The peer's ID that we are sending this message to
* @return 0 on success */
typedef
int
(
*
func_send_entries_f
)
(
raft_server_t
*
raft
,
void
*
udata
,
int
node
,
msg_entry_t
*
msg
);
#ifndef HAVE_FUNC_LOG
#ifndef HAVE_FUNC_LOG
#define HAVE_FUNC_LOG
#define HAVE_FUNC_LOG
typedef
void
(
typedef
void
(
...
@@ -186,7 +172,6 @@ typedef struct
...
@@ -186,7 +172,6 @@ typedef struct
{
{
func_send_requestvote_f
send_requestvote
;
func_send_requestvote_f
send_requestvote
;
func_send_appendentries_f
send_appendentries
;
func_send_appendentries_f
send_appendentries
;
func_send_entries_f
send_entries
;
func_log_f
log
;
func_log_f
log
;
func_applylog_f
applylog
;
func_applylog_f
applylog
;
}
raft_cbs_t
;
}
raft_cbs_t
;
...
@@ -254,7 +239,7 @@ int raft_periodic(raft_server_t* me, int msec_elapsed);
...
@@ -254,7 +239,7 @@ int raft_periodic(raft_server_t* me, int msec_elapsed);
/**
/**
* Receive an appendentries message
* Receive an appendentries message
* This function
should
block if it needs to append the message.
* This function
will
block if it needs to append the message.
* @param node Index of the node who sent us this message
* @param node Index of the node who sent us this message
* @param ae The appendentries message
* @param ae The appendentries message
* @param[out] r The resulting response
* @param[out] r The resulting response
...
@@ -293,7 +278,7 @@ int raft_recv_requestvote_response(raft_server_t* me, int node,
...
@@ -293,7 +278,7 @@ int raft_recv_requestvote_response(raft_server_t* me, int node,
* Receive an entry message from client.
* Receive an entry message from client.
* Append the entry to the log
* Append the entry to the log
* Send appendentries to followers
* Send appendentries to followers
* This function
should
block if it needs to append the message.
* This function
will
block if it needs to append the message.
* @param node Index of the node who sent us this message
* @param node Index of the node who sent us this message
* @param[out] r The resulting response
* @param[out] r The resulting response
* @param e The entry message
* @param e The entry message
...
...
tests/mock_send_functions.c
View file @
862de6ab
...
@@ -96,12 +96,6 @@ int sender_appendentries_response(raft_server_t* raft,
...
@@ -96,12 +96,6 @@ int sender_appendentries_response(raft_server_t* raft,
sizeof
(
*
msg
),
peer
,
raft
);
sizeof
(
*
msg
),
peer
,
raft
);
}
}
int
sender_entries
(
raft_server_t
*
raft
,
void
*
udata
,
int
peer
,
msg_entry_t
*
msg
)
{
return
__append_msg
(
udata
,
msg
,
RAFT_MSG_ENTRY
,
sizeof
(
*
msg
),
peer
,
raft
);
}
int
sender_entries_response
(
raft_server_t
*
raft
,
int
sender_entries_response
(
raft_server_t
*
raft
,
void
*
udata
,
int
peer
,
msg_entry_response_t
*
msg
)
void
*
udata
,
int
peer
,
msg_entry_response_t
*
msg
)
{
{
...
...
tests/test_scenario.c
View file @
862de6ab
...
@@ -36,7 +36,6 @@ void TestRaft_scenario_leader_appears(CuTest * tc)
...
@@ -36,7 +36,6 @@ void TestRaft_scenario_leader_appears(CuTest * tc)
&
((
raft_cbs_t
)
{
&
((
raft_cbs_t
)
{
.
send_requestvote
=
sender_requestvote
,
.
send_requestvote
=
sender_requestvote
,
.
send_appendentries
=
sender_appendentries
,
.
send_appendentries
=
sender_appendentries
,
.
send_entries
=
sender_entries
,
.
log
=
NULL
.
log
=
NULL
}),
sender
[
j
]);
}),
sender
[
j
]);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment