Fixed naming of trace events

libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp

@@ -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

@@ -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

@@ -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_);
 

libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp

@@ -21,20 +21,20 @@ enum TraceCode
     // Event name                          Argument
     // 0
     TraceError,                         // error code (may be negated)
-    TraceLogLastIndexRestored,          // recovered last index value
-    TraceLogAppend,                     // index of new entry
-    TraceLogRemove,                     // new last index value
-    TraceCurrentTermRestored,           // current term
+    TraceRaftLogLastIndexRestored,      // recovered last index value
+    TraceRaftLogAppend,                 // index of new entry
+    TraceRaftLogRemove,                 // new last index value
+    TraceRaftCurrentTermRestored,       // current term
     // 5
-    TraceCurrentTermUpdate,             // current term
-    TraceVotedForRestored,              // value of votedFor
-    TraceVotedForUpdate,                // value of votedFor
-    TraceDiscoveryBroadcast,            // number of known servers
-    TraceNewServerDiscovered,           // node ID of the new server
+    TraceRaftCurrentTermUpdate,         // current term
+    TraceRaftVotedForRestored,          // value of votedFor
+    TraceRaftVotedForUpdate,            // value of votedFor
+    TraceRaftDiscoveryBroadcast,        // number of known servers
+    TraceRaftNewServerDiscovered,       // node ID of the new server
     // 10
-    TraceDiscoveryReceived,             // node ID of the sender
-    TraceClusterSizeInited,             // cluster size
-    TraceInvalidClusterSizeReceived,    // received cluster size
+    TraceRaftDiscoveryReceived,         // node ID of the sender
+    TraceRaftClusterSizeInited,         // cluster size
+    TraceRaftBadClusterSizeReceived,    // received cluster size
     TraceRaftCoreInited,                // update interval in usec
     TraceRaftStateSwitch,               // 0 - Follower, 1 - Candidate, 2 - Leader
     // 15
@@ -101,18 +101,18 @@ public:
         static const char* const Strings[] =
         {
             "Error",
-            "LogLastIndexRestored",
-            "LogAppend",
-            "LogRemove",
-            "CurrentTermRestored",
-            "CurrentTermUpdate",
-            "VotedForRestored",
-            "VotedForUpdate",
-            "DiscoveryBroadcast",
-            "NewServerDiscovered",
-            "DiscoveryReceived",
-            "ClusterSizeInited",
-            "InvalidClusterSizeReceived",
+            "RaftLogLastIndexRestored",
+            "RaftLogAppend",
+            "RaftLogRemove",
+            "RaftCurrentTermRestored",
+            "RaftCurrentTermUpdate",
+            "RaftVotedForRestored",
+            "RaftVotedForUpdate",
+            "RaftDiscoveryBroadcast",
+            "RaftNewServerDiscovered",
+            "RaftDiscoveryReceived",
+            "RaftClusterSizeInited",
+            "RaftBadClusterSizeReceived",
             "RaftCoreInited",
             "RaftStateSwitch",
             "RaftActiveSwitch",

libuavcan/test/protocol/dynamic_node_id_server/event.cpp

@@ -14,5 +14,5 @@ TEST(DynamicNodeIDServer, EventCodeToString)
     ASSERT_STREQ("Error",                        IEventTracer::getEventName(TraceError));
     ASSERT_STREQ("RaftActiveSwitch",             IEventTracer::getEventName(TraceRaftActiveSwitch));
     ASSERT_STREQ("RaftAppendEntriesCallFailure", IEventTracer::getEventName(TraceRaftAppendEntriesCallFailure));
-    ASSERT_STREQ("DiscoveryReceived",            IEventTracer::getEventName(TraceDiscoveryReceived));
+    ASSERT_STREQ("RaftDiscoveryReceived",        IEventTracer::getEventName(TraceRaftDiscoveryReceived));
 }