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

Server event tracer extracted to the common level

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-10 17:53:16 +03:00
parent 7477de3bd9
commit 12a81b5bef
12 changed files with 15 additions and 19 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
+1 -1
View File
@@ -13,8 +13,8 @@
#include <uavcan/node/publisher.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
// UAVCAN types
#include <uavcan/protocol/dynamic_node_id/server/Discovery.hpp>
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
+1 -1
View File
@@ -8,8 +8,8 @@
#include <uavcan/build_config.hpp>
#include <uavcan/debug.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
namespace uavcan
{
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
+1 -1
View File
@@ -8,9 +8,9 @@
#include <uavcan/build_config.hpp>
#include <uavcan/debug.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
#include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
namespace uavcan
{
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
+1 -1
View File
@@ -12,9 +12,9 @@
#include <uavcan/node/service_server.hpp>
#include <uavcan/node/service_client.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
// UAVCAN types
#include <uavcan/protocol/dynamic_node_id/server/AppendEntries.hpp>
#include <uavcan/protocol/dynamic_node_id/server/RequestVote.hpp>
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
+1 -1
View File
@@ -9,11 +9,11 @@
#include <uavcan/debug.hpp>
#include <uavcan/node/timer.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp>
#include <uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp>
#include <uavcan/protocol/dynamic_node_id_server/node_id_selector.hpp>
#include <uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
namespace uavcan
{
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/event.hpp → libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp
+2 -6
View File
@@ -2,8 +2,8 @@
* Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
*/
#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_EVENT_HPP_INCLUDED
#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_EVENT_HPP_INCLUDED
#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_EVENT_HPP_INCLUDED
#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_EVENT_HPP_INCLUDED
#include <uavcan/build_config.hpp>
#include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
@@ -12,8 +12,6 @@ namespace uavcan
{
namespace dynamic_node_id_server
{
namespace distributed
{
/**
* @ref IEventTracer.
* Event codes cannot be changed, only new ones can be added.
@@ -109,7 +107,6 @@ public:
/**
* The server invokes this method every time it believes that a noteworthy event has happened.
* The table of event codes can be found in the server sources.
* It is guaranteed that event code values will never change, but new ones can be added in future. This ensures
* full backward compatibility.
* @param event_code Event code, see the sources for the enum with values.
@@ -120,7 +117,6 @@ public:
virtual ~IEventTracer() { }
};
}
}
}
libuavcan/test/protocol/dynamic_node_id_server/distributed/cluster_manager.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <gtest/gtest.h>
#include <uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp>
#include "event_tracer.hpp"
#include "../event_tracer.hpp"
#include "../../helpers.hpp"
#include "../memory_storage_backend.hpp"
libuavcan/test/protocol/dynamic_node_id_server/distributed/log.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <gtest/gtest.h>
#include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
#include "event_tracer.hpp"
#include "../event_tracer.hpp"
#include "../../helpers.hpp"
#include "../memory_storage_backend.hpp"
libuavcan/test/protocol/dynamic_node_id_server/distributed/persistent_state.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <gtest/gtest.h>
#include <uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp>
#include "event_tracer.hpp"
#include "../event_tracer.hpp"
#include "../memory_storage_backend.hpp"
libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include <memory>
#include <uavcan/protocol/dynamic_node_id_server/distributed.hpp>
#include <uavcan/protocol/dynamic_node_id_client.hpp>
#include "event_tracer.hpp"
#include "../event_tracer.hpp"
#include "../../helpers.hpp"
#include "../memory_storage_backend.hpp"
libuavcan/test/protocol/dynamic_node_id_server/distributed/event.cpp → libuavcan/test/protocol/dynamic_node_id_server/event.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include <gtest/gtest.h>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
TEST(DynamicNodeIDServer, EventCodeToString)
libuavcan/test/protocol/dynamic_node_id_server/distributed/event_tracer.hpp → libuavcan/test/protocol/dynamic_node_id_server/event_tracer.hpp
+3 -3
View File
@@ -6,14 +6,14 @@
#include <iostream>
#include <string>
#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
class EventTracer : public uavcan::dynamic_node_id_server::distributed::IEventTracer
class EventTracer : public uavcan::dynamic_node_id_server::IEventTracer
{
const std::string id_;
virtual void onEvent(uavcan::dynamic_node_id_server::distributed::TraceCode code, uavcan::int64_t argument)
virtual void onEvent(uavcan::dynamic_node_id_server::TraceCode code, uavcan::int64_t argument)
{
std::cout << "EVENT [" << id_ << "]\t" << code << "\t" << getEventName(code) << "\t" << argument << std::endl;
}