fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 03:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Multi-call client in RaftCore

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-17 17:18:14 +03:00
parent e5fddfdb66
commit cd41840f59
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
+12 -24
View File
@@ -138,9 +138,8 @@ class RaftCore : private TimerBase
ServiceClient<AppendEntries, AppendEntriesResponseCallback> append_entries_client_; ServiceClient<AppendEntries, AppendEntriesResponseCallback> append_entries_client_;
ServiceServer<RequestVote, RequestVoteCallback> request_vote_srv_; ServiceServer<RequestVote, RequestVoteCallback> request_vote_srv_;
enum { NumRequestVoteClients = ClusterManager::MaxClusterSize - 1 }; enum { NumRequestVoteCalls = ClusterManager::MaxClusterSize - 1 };
LazyConstructor<ServiceClient<RequestVote, RequestVoteResponseCallback> > ServiceClient<RequestVote, RequestVoteResponseCallback, NumRequestVoteCalls> request_vote_client_;
request_vote_clients_[NumRequestVoteClients];
/* /*
* Methods * Methods
@@ -218,7 +217,7 @@ class RaftCore : private TimerBase
req.last_log_term = persistent_state_.getLog().getEntryAtIndex(req.last_log_index)->term; req.last_log_term = persistent_state_.getLog().getEntryAtIndex(req.last_log_index)->term;
req.term = persistent_state_.getCurrentTerm(); req.term = persistent_state_.getCurrentTerm();
for (uint8_t i = 0; i < NumRequestVoteClients; i++) for (uint8_t i = 0; i < NumRequestVoteCalls; i++)
{ {
const NodeID node_id = cluster_.getRemoteServerNodeIDAtIndex(i); const NodeID node_id = cluster_.getRemoteServerNodeIDAtIndex(i);
if (!node_id.isUnicast()) if (!node_id.isUnicast())
@@ -230,7 +229,7 @@ class RaftCore : private TimerBase
"Requesting vote from %d", int(node_id.get())); "Requesting vote from %d", int(node_id.get()));
trace(TraceRaftVoteRequestInitiation, node_id.get()); trace(TraceRaftVoteRequestInitiation, node_id.get());
res = request_vote_clients_[i]->call(node_id, req); res = request_vote_client_.call(node_id, req);
if (res < 0) if (res < 0)
{ {
trace(TraceError, res); trace(TraceError, res);
@@ -325,10 +324,7 @@ class RaftCore : private TimerBase
next_server_index_ = 0; next_server_index_ = 0;
num_votes_received_in_this_campaign_ = 0; num_votes_received_in_this_campaign_ = 0;
for (uint8_t i = 0; i < NumRequestVoteClients; i++) request_vote_client_.cancelAllCalls();
{
request_vote_clients_[i]->cancelAllCalls(); // TODO FIXME Concurrent calls!!
}
append_entries_client_.cancelAllCalls(); append_entries_client_.cancelAllCalls();
/* /*
@@ -729,12 +725,8 @@ public:
, append_entries_srv_(node) , append_entries_srv_(node)
, append_entries_client_(node) , append_entries_client_(node)
, request_vote_srv_(node) , request_vote_srv_(node)
{ , request_vote_client_(node)
for (uint8_t i = 0; i < NumRequestVoteClients; i++) { }
{
request_vote_clients_[i].construct<INode&>(node);
}
}
/** /**
* Once started, the logic runs in the background until destructor is called. * Once started, the logic runs in the background until destructor is called.
@@ -790,17 +782,13 @@ public:
&RaftCore::handleAppendEntriesResponse)); &RaftCore::handleAppendEntriesResponse));
append_entries_client_.setRequestTimeout(update_interval_); append_entries_client_.setRequestTimeout(update_interval_);
for (uint8_t i = 0; i < NumRequestVoteClients; i++) res = request_vote_client_.init();
if (res < 0)
{ {
res = request_vote_clients_[i]->init(); return res;
if (res < 0)
{
return res;
}
request_vote_clients_[i]->setCallback(RequestVoteResponseCallback(this,
&RaftCore::handleRequestVoteResponse));
request_vote_clients_[i]->setRequestTimeout(update_interval_);
} }
request_vote_client_.setCallback(RequestVoteResponseCallback(this, &RaftCore::handleRequestVoteResponse));
request_vote_client_.setRequestTimeout(update_interval_);
startPeriodic(update_interval_); startPeriodic(update_interval_);