fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 20:13:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed naming of trace events

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-10 19:33:16 +03:00
parent 10b5661da4
commit 6e287dc1b2
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp
+5 -5
View File
@@ -94,7 +94,7 @@ private:
UAVCAN_ASSERT((num_known_servers_ + 1) < (MaxClusterSize - 2));
if (!isKnownServer(node_id) && node_id.isUnicast())
{
tracer_.onEvent(TraceNewServerDiscovered, node_id.get());
tracer_.onEvent(TraceRaftNewServerDiscovered, node_id.get());
servers_[num_known_servers_].node_id = node_id;
servers_[num_known_servers_].resetIndices(log_);
num_known_servers_ = static_cast<uint8_t>(num_known_servers_ + 1U);
@@ -109,7 +109,7 @@ private:
{
UAVCAN_ASSERT(num_known_servers_ < cluster_size_);
tracer_.onEvent(TraceDiscoveryBroadcast, num_known_servers_);
tracer_.onEvent(TraceRaftDiscoveryBroadcast, num_known_servers_);
/*
* Filling the message
@@ -154,7 +154,7 @@ private:
void handleDiscovery(const ReceivedDataStructure<Discovery>& msg)
{
tracer_.onEvent(TraceDiscoveryReceived, msg.getSrcNodeID().get());
tracer_.onEvent(TraceRaftDiscoveryReceived, msg.getSrcNodeID().get());
/*
* Validating cluster configuration
@@ -162,7 +162,7 @@ private:
*/
if (msg.configured_cluster_size != cluster_size_)
{
tracer_.onEvent(TraceInvalidClusterSizeReceived, msg.configured_cluster_size);
tracer_.onEvent(TraceRaftBadClusterSizeReceived, msg.configured_cluster_size);
getNode().registerInternalFailure("Bad Raft cluster size");
return;
}
@@ -271,7 +271,7 @@ public:
}
}
tracer_.onEvent(TraceClusterSizeInited, cluster_size_);
tracer_.onEvent(TraceRaftClusterSizeInited, cluster_size_);
UAVCAN_ASSERT(cluster_size_ > 0);
UAVCAN_ASSERT(cluster_size_ <= MaxClusterSize);
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
+3 -3
View File
@@ -185,7 +185,7 @@ public:
last_index_ = Index(value);
}
tracer_.onEvent(TraceLogLastIndexRestored, last_index_);
tracer_.onEvent(TraceRaftLogLastIndexRestored, last_index_);
// Restoring log entries - note that index 0 always exists
for (Index index = 0; index <= last_index_; index++)
@@ -214,7 +214,7 @@ public:
return -ErrLogic;
}
tracer_.onEvent(TraceLogAppend, last_index_ + 1U);
tracer_.onEvent(TraceRaftLogAppend, last_index_ + 1U);
// If next operations fail, we'll get a dangling entry, but it's absolutely OK.
int res = writeEntryToStorage(Index(last_index_ + 1), entry);
@@ -258,7 +258,7 @@ public:
uint32_t new_last_index = index - 1U;
tracer_.onEvent(TraceLogRemove, new_last_index);
tracer_.onEvent(TraceRaftLogRemove, new_last_index);
if (new_last_index != last_index_)
{
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
+4 -4
View File
@@ -96,7 +96,7 @@ public:
}
}
tracer_.onEvent(TraceCurrentTermRestored, current_term_);
tracer_.onEvent(TraceRaftCurrentTermRestored, current_term_);
if (current_term_ < last_entry->term)
{
@@ -144,7 +144,7 @@ public:
voted_for_ = NodeID(uint8_t(stored_voted_for));
}
tracer_.onEvent(TraceVotedForRestored, voted_for_.get());
tracer_.onEvent(TraceRaftVotedForRestored, voted_for_.get());
return 0;
}
@@ -168,7 +168,7 @@ public:
return -ErrInvalidParam;
}
tracer_.onEvent(TraceCurrentTermUpdate, term);
tracer_.onEvent(TraceRaftCurrentTermUpdate, term);
StorageMarshaller io(storage_);
@@ -199,7 +199,7 @@ public:
return -ErrInvalidParam;
}
tracer_.onEvent(TraceVotedForUpdate, node_id.get());
tracer_.onEvent(TraceRaftVotedForUpdate, node_id.get());
StorageMarshaller io(storage_);