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

Too many tracepoints? No such thing.

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-11 18:52:03 +03:00
parent 2868fd5712
commit 92c8944e49
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp
+2 -2
View File
@@ -77,7 +77,7 @@ enum TraceCode
TraceDiscoveryTimerStop, // reason code (see sources for details)
TraceDiscoveryGetNodeInfoRequest, // target node ID
TraceDiscoveryNodeRestartDetected, // node ID
Trace21,
TraceDiscoveryNodeRemoved, // node ID
Trace22,
// 50
@@ -148,7 +148,7 @@ public:
"DiscoveryTimerStop",
"DiscoveryGetNodeInfoRequest",
"DiscoveryNodeRestartDetected",
"",
"DiscoveryNodeRemoved",
""
};
uavcan::StaticAssert<sizeof(Strings) / sizeof(Strings[0]) == NumTraceCodes>::check();
libuavcan/include/uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp
+10 -4
View File
@@ -111,6 +111,12 @@ class NodeDiscoverer : TimerBase
INode& getNode() { return node_status_sub_.getNode(); }
void removeNode(const NodeID node_id)
{
node_map_.remove(node_id);
trace(TraceDiscoveryNodeRemoved, node_id.get());
}
NodeID pickNextNodeToQuery() const
{
const unsigned node_map_size = node_map_.getSize();
@@ -166,14 +172,14 @@ class NodeDiscoverer : TimerBase
}
else if (awareness == INodeDiscoveryHandler::NodeAwarenessKnownButNotCommitted)
{
node_map_.remove(node_id);
removeNode(node_id);
return false;
}
else if (awareness == INodeDiscoveryHandler::NodeAwarenessKnownAndCommitted)
{
trace(TraceDiscoveryCommitCacheUpdated, node_id.get());
committed_node_mask_[node_id.get()] = true;
node_map_.remove(node_id);
removeNode(node_id);
return false;
}
else
@@ -197,7 +203,7 @@ class NodeDiscoverer : TimerBase
}
else
{
node_map_.remove(node_id);
removeNode(node_id);
}
}
}
@@ -208,7 +214,7 @@ class NodeDiscoverer : TimerBase
void finalizeNodeDiscovery(const UniqueID* unique_id_or_null, NodeID node_id)
{
trace(TraceDiscoveryNodeFinalized, node_id.get() | ((unique_id_or_null == NULL) ? 0U : 0x100U));
node_map_.remove(node_id);
removeNode(node_id);
/*
* It is paramount to check if the server is still interested to receive this data.
* Otherwise, if the node appeared in the log while we were waiting for response, we'd end up with