diff --git a/daisi/src/cpps/common/cpps_logger_ns3.cpp b/daisi/src/cpps/common/cpps_logger_ns3.cpp index 9a872243..02f9d8c3 100644 --- a/daisi/src/cpps/common/cpps_logger_ns3.cpp +++ b/daisi/src/cpps/common/cpps_logger_ns3.cpp @@ -18,8 +18,8 @@ #include "ns3/simulator.h" -#define TableDefinition static const DatabaseTable -#define ViewDefinition static const std::unordered_map +using TableDefinition = const DatabaseTable; +using ViewDefinition = const std::unordered_map; namespace daisi::cpps { @@ -27,27 +27,28 @@ namespace daisi::cpps { //! Don't forget to use .c_str() to convert std::string into a char array // * CppsExecutedOrderUtility -TableDefinition kExecutedOrderUtility("CppsExecutedOrderUtility", - {{"OrderUuid", "%s", true, "TransportOrder(OrderUuid)"}, - {"AMRUuid", "%s", true, "AMR(ApplicationUuid)"}, - {"Timestamp_ms", "%lu", true}, - {"ExpectedStartTime_ms", "%lf", true}, - {"ExecutionDuration_ms", "%lf", true}, - {"ExecutionDistance_m", "%lf", true}, - {"TravelToPickupDuration_ms", "%lf", true}, - {"TravelToPickupDistance_m", "%lf", true}, - {"Makespan", "%lf", true}, - {"Delay_ms", "%lf", true}, - {"DeltaExecutionDuration_ms", "%lf", true}, - {"DeltaExecutionDistance_m", "%lf", true}, - {"DeltaTravelToPickupDuration_ms", "%lf", true}, - {"DeltaTravelToPickupDistance_m", "%lf", true}, - {"DeltaMakespan", "%lf", true}, - {"QueueSize", "%u", true}, - {"Quality", "%lf", true}, - {"Costs", "%lf", true}, - {"Utility", "%lf", true}}, - "PRIMARY KEY(AMRUuid, OrderUuid, Timestamp_ms)"); +static TableDefinition kExecutedOrderUtility("CppsExecutedOrderUtility", + {{"OrderUuid", "%s", true, + "TransportOrder(OrderUuid)"}, + {"AMRUuid", "%s", true, "AMR(ApplicationUuid)"}, + {"Timestamp_ms", "%lu", true}, + {"ExpectedStartTime_ms", "%lf", true}, + {"ExecutionDuration_ms", "%lf", true}, + {"ExecutionDistance_m", "%lf", true}, + {"TravelToPickupDuration_ms", "%lf", true}, + {"TravelToPickupDistance_m", "%lf", true}, + {"Makespan", "%lf", true}, + {"Delay_ms", "%lf", true}, + {"DeltaExecutionDuration_ms", "%lf", true}, + {"DeltaExecutionDistance_m", "%lf", true}, + {"DeltaTravelToPickupDuration_ms", "%lf", true}, + {"DeltaTravelToPickupDistance_m", "%lf", true}, + {"DeltaMakespan", "%lf", true}, + {"QueueSize", "%u", true}, + {"Quality", "%lf", true}, + {"Costs", "%lf", true}, + {"Utility", "%lf", true}}, + "PRIMARY KEY(AMRUuid, OrderUuid, Timestamp_ms)"); static const std::string kCreateExecutedOrderUtility = getCreateTableStatement(kExecutedOrderUtility); @@ -82,12 +83,12 @@ void CppsLoggerNs3::logExecutedOrderCost(const ExecutedOrderUtilityLoggingInfo & } // * CppsMaterialFlow -TableDefinition kMaterialFlow("CppsMaterialFlow", {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%u", true}, - {"Uuid", "%s", true}, - {"IpLogicalCore", "%s", true}, - {"PortLogicalCore", "%u", true}, - {"State", "%u", true}}); +static TableDefinition kMaterialFlow("CppsMaterialFlow", {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%u", true}, + {"Uuid", "%s", true}, + {"IpLogicalCore", "%s", true}, + {"PortLogicalCore", "%u", true}, + {"State", "%u", true}}); static const std::string kCreateMaterialFlow = getCreateTableStatement(kMaterialFlow); void CppsLoggerNs3::logMaterialFlow(const std::string &mf_uuid, const std::string &ip, @@ -108,20 +109,20 @@ void CppsLoggerNs3::logMaterialFlow(const std::string &mf_uuid, const std::strin } // * CppsNegotiationTraffic -TableDefinition kNegotiationTraffic("CppsNegotiationTraffic", - {DatabaseColumnInfo{"Id"}, - {"TransportOrderId", "sql%u", true, "TransportOrder(Id)"}, - {"Timestamp_ms", "%u", true}, - {"SenderIp", "%s", true}, - {"SenderPort", "%u", true}, - {"TargetIp", "%s", true}, - {"TargetPort", "%u", true}, - {"MsgType", "%u", true}, - {"Content", "%s"}}); +static TableDefinition kNegotiationTraffic("CppsNegotiationTraffic", {DatabaseColumnInfo{"Id"}, + {"TransportOrderId", "sql%u", + true, "TransportOrder(Id)"}, + {"Timestamp_ms", "%u", true}, + {"SenderIp", "%s", true}, + {"SenderPort", "%u", true}, + {"TargetIp", "%s", true}, + {"TargetPort", "%u", true}, + {"MsgType", "%u", true}, + {"Content", "%s"}}); static const std::string kCreateNegotiationTraffic = getCreateTableStatement(kNegotiationTraffic); -TableDefinition kEnumCppsMessageType("enumCppsMessageType", - {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); +static TableDefinition kEnumCppsMessageType("enumCppsMessageType", + {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); static const std::string kCreateEnumCppsMessageType = getCreateTableStatement(kEnumCppsMessageType); void CppsLoggerNs3::logCppsMessageTypes() { @@ -134,11 +135,11 @@ void CppsLoggerNs3::logCppsMessageTypes() { // } } -TableDefinition kCppsMessage("CppsTopicMessage", { - DatabaseColumnInfo{"Id"}, - {"MessageUuid", "%s", true}, - {"MessageContent", "%s", true}, - }); +static TableDefinition kCppsMessage("CppsTopicMessage", { + DatabaseColumnInfo{"Id"}, + {"MessageUuid", "%s", true}, + {"MessageContent", "%s", true}, + }); static const std::string kCreateCppsMessage = getCreateTableStatement(kCppsMessage); void CppsLoggerNs3::logCppsMessage(solanet::UUID msg_uuid, const std::string &msg_content) { @@ -156,7 +157,7 @@ void CppsLoggerNs3::logCppsMessage(solanet::UUID msg_uuid, const std::string &ms log_(getInsertStatement(kCppsMessage, t)); } -ViewDefinition kNegotiationTrafficReplacements = { +static ViewDefinition kNegotiationTrafficReplacements = { {"MsgType", "enumCppsMessageType.Name AS MessageType"}}; static const std::string kCreateViewNegotiationTraffic = getCreateViewStatement( kNegotiationTraffic, kNegotiationTrafficReplacements, @@ -192,12 +193,12 @@ void CppsLoggerNs3::logNegotiationTraffic(const NegotiationTrafficLoggingInfo &l } // * CppsStation -TableDefinition kStation("CppsStation", {DatabaseColumnInfo{"Id"}, - // {"ApplicationUuid", "%s", true}, - {"Name", "%s", true}, - {"Type", "%s", true}, - {"PosX_m", "%lf", true}, - {"PosY_M", "%lf", true}}); +static TableDefinition kStation("CppsStation", {DatabaseColumnInfo{"Id"}, + // {"ApplicationUuid", "%s", true}, + {"Name", "%s", true}, + {"Type", "%s", true}, + {"PosX_m", "%lf", true}, + {"PosY_M", "%lf", true}}); static const std::string kCreateStation = getCreateTableStatement(kStation); void CppsLoggerNs3::logStation(const std::string &name, const std::string &type, @@ -234,6 +235,3 @@ CppsLoggerNs3::~CppsLoggerNs3() { } } // namespace daisi::cpps - -#undef TableDefinition -#undef ViewDefinition diff --git a/daisi/src/cpps/common/cpps_logger_ns3_amr.cpp b/daisi/src/cpps/common/cpps_logger_ns3_amr.cpp index 98147703..57d211d8 100644 --- a/daisi/src/cpps/common/cpps_logger_ns3_amr.cpp +++ b/daisi/src/cpps/common/cpps_logger_ns3_amr.cpp @@ -17,19 +17,18 @@ #include "cpps_logger_ns3.h" #include "ns3/simulator.h" -#define TableDefinition static const DatabaseTable -#define ViewDefinition static const std::unordered_map +using TableDefinition = const DatabaseTable; namespace daisi::cpps { // * CppsAMRHistory -TableDefinition kAmrHistory("CppsAMRHistory", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%u", true}, - {"AmrId", "sql%u", true, "CppsAutonomousMobileRobot(Id)"}, - {"PosX_m", "%f", true}, - {"PosY_m", "%f", true}, - {"State", "%u", true}}); +static TableDefinition kAmrHistory("CppsAMRHistory", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%u", true}, + {"AmrId", "sql%u", true, "CppsAutonomousMobileRobot(Id)"}, + {"PosX_m", "%f", true}, + {"PosY_m", "%f", true}, + {"State", "%u", true}}); static const std::string kCreateAmrHistory = getCreateTableStatement(kAmrHistory); void CppsLoggerNs3::logPositionUpdate(const AmrPositionLoggingInfo &logging_info) { @@ -52,26 +51,26 @@ void CppsLoggerNs3::logPositionUpdate(const AmrPositionLoggingInfo &logging_info } // * CppsAutonomousMobileRobot -TableDefinition kAutonomousMobileRobot("CppsAutonomousMobileRobot", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%u", true}, - {"ApplicationUuid", "%s", true, - "DeviceApplication(ApplicationUuid)"}, - {"FriendlyName", "%s"}, - {"ModelName", "%s"}, - {"IpLogicalService", "%s", true}, - {"PortLogicalService", "%u", true}, - {"IpPhysicalAsset", "%s", true}, - {"PortPhysicalAsset", "%u", true}, - {"IpLocalAsset", "%s", true}, - {"PortLocalAsset", "%u", true}, - {"LoadTime_ms", "%u", true}, - {"UnloadTime_ms", "%u", true}, - {"MaxWeight_kg", "%f", true}, - {"MaxVelocity_mps", "%f", true}, - {"MinVelocity_mps", "%f", true}, - {"MaxAcceleration_mpss", "%f", true}, - {"MaxDeceleration_mpss", "%f", true}}); +static TableDefinition kAutonomousMobileRobot("CppsAutonomousMobileRobot", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%u", true}, + {"ApplicationUuid", "%s", true, + "DeviceApplication(ApplicationUuid)"}, + {"FriendlyName", "%s"}, + {"ModelName", "%s"}, + {"IpLogicalService", "%s", true}, + {"PortLogicalService", "%u", true}, + {"IpPhysicalAsset", "%s", true}, + {"PortPhysicalAsset", "%u", true}, + {"IpLocalAsset", "%s", true}, + {"PortLocalAsset", "%u", true}, + {"LoadTime_ms", "%u", true}, + {"UnloadTime_ms", "%u", true}, + {"MaxWeight_kg", "%f", true}, + {"MaxVelocity_mps", "%f", true}, + {"MinVelocity_mps", "%f", true}, + {"MaxAcceleration_mpss", "%f", true}, + {"MaxDeceleration_mpss", "%f", true}}); static const std::string kCreateAmr = getCreateTableStatement(kAutonomousMobileRobot); void CppsLoggerNs3::logAMR(const AmrLoggingInfo &amr_info) { @@ -103,9 +102,9 @@ void CppsLoggerNs3::logAMR(const AmrLoggingInfo &amr_info) { } // * CppsService -TableDefinition kService("CppsService", {{"Uuid", "%s", true, "", true}, - {"StartTime_ms", "%u"}, - {"Type", "%u", true}}); +static TableDefinition kService("CppsService", {{"Uuid", "%s", true, "", true}, + {"StartTime_ms", "%u"}, + {"Type", "%u", true}}); static const std::string kCreateService = getCreateTableStatement(kService); void CppsLoggerNs3::logService(const std::string &uuid, uint8_t type) { @@ -123,12 +122,12 @@ void CppsLoggerNs3::logService(const std::string &uuid, uint8_t type) { } // * CppsServiceTransport -TableDefinition kServiceTransport("CppsServiceTransport", - {DatabaseColumnInfo{"Id"}, - {"Uuid", "%s", true}, - {"AmrId", "sql%u", true, "CppsAutonomousMobileRobot(Id)"}, - {"LoadCarrierType", "%s", true}, - {"MaxWeightPayload_kg", "%f", true}}); +static TableDefinition kServiceTransport("CppsServiceTransport", + {DatabaseColumnInfo{"Id"}, + {"Uuid", "%s", true}, + {"AmrId", "sql%u", true, "CppsAutonomousMobileRobot(Id)"}, + {"LoadCarrierType", "%s", true}, + {"MaxWeightPayload_kg", "%f", true}}); static const std::string kCreateServiceTransport = getCreateTableStatement(kServiceTransport); void CppsLoggerNs3::logTransportService(const sola::Service &service, bool /*active*/) { diff --git a/daisi/src/logging/definitions.h b/daisi/src/logging/definitions.h index 429132d7..444a9b2c 100644 --- a/daisi/src/logging/definitions.h +++ b/daisi/src/logging/definitions.h @@ -28,13 +28,13 @@ #include // Args: (Application UUID) -using LogDeviceApp = const std::function; +using LogDeviceApp = std::function; // Args: (SQL statement) using LogFunction = std::function; // Args: (Event UUID, Event type, Application ID) -using LogEvent = const std::function; +using LogEvent = std::function; /// @brief Creates a SQL Statement by calling snprintf. The amount of format specifiers in /// format_str has to be identical to the provided values diff --git a/daisi/src/logging/logger_manager.cpp b/daisi/src/logging/logger_manager.cpp index 0fd2beb2..190cb5a3 100644 --- a/daisi/src/logging/logger_manager.cpp +++ b/daisi/src/logging/logger_manager.cpp @@ -23,8 +23,7 @@ #include "ns3/simulator.h" #include "utils/daisi_check.h" -#define TableDefinition static const DatabaseTable -#define ViewDefinition static const std::unordered_map +using TableDefinition = const DatabaseTable; namespace daisi { @@ -37,7 +36,7 @@ static uint64_t getDeviceId() { } // * Device -TableDefinition kDevice("Device", {{"Id", "%lu", true, "", true}}); +static TableDefinition kDevice("Device", {{"Id", "%lu", true, "", true}}); const std::string kCreateDevice = getCreateTableStatement(kDevice); void LoggerManager::logDevice(uint32_t id) { @@ -50,12 +49,13 @@ void LoggerManager::logDevice(uint32_t id) { } // * DeviceApplication -TableDefinition kDeviceApplication("DeviceApplication", - {DatabaseColumnInfo{"ApplicationUuid", "%s", true, "", true}, - {"ApplicationName", "%s", true}, - {"DeviceUuid", "%lu", true, "Device(Id)"}, - {"StartTime_ms", "%lu", true}, - {"StopTime_ms", "%lu"}}); +static TableDefinition kDeviceApplication("DeviceApplication", + {DatabaseColumnInfo{"ApplicationUuid", "%s", true, "", + true}, + {"ApplicationName", "%s", true}, + {"DeviceUuid", "%lu", true, "Device(Id)"}, + {"StartTime_ms", "%lu", true}, + {"StopTime_ms", "%lu"}}); const std::string kCreateDeviceApplication = getCreateTableStatement(kDeviceApplication); void LoggerManager::logDeviceApplication(const std::string &application_uuid, @@ -72,12 +72,12 @@ void LoggerManager::logDeviceApplication(const std::string &application_uuid, } // * Event -TableDefinition kEvent("Event", - {DatabaseColumnInfo{"Id"}, - {"Uuid", "%s", true}, - {"Timestamp_ms", "%lu", true}, - {"Type", "%u", true}, - {"ApplicationUuid", "%s", true, "DeviceApplication(ApplicationUuid)"}}); +static TableDefinition kEvent("Event", {DatabaseColumnInfo{"Id"}, + {"Uuid", "%s", true}, + {"Timestamp_ms", "%lu", true}, + {"Type", "%u", true}, + {"ApplicationUuid", "%s", true, + "DeviceApplication(ApplicationUuid)"}}); const std::string kCreateEvent = getCreateTableStatement(kEvent); void LoggerManager::logEvent(const std::string &event_uuid, uint16_t event_type, @@ -90,12 +90,12 @@ void LoggerManager::logEvent(const std::string &event_uuid, uint16_t event_type, } // * General -TableDefinition kGeneral("General", {{"StartTime_ut", "%lu", true}, - {"StopTime_ut", "%lu", true}, - {"NumberOfEvents", "%lu", true}, - {"Exception", "%s"}, - {"Config", "%s"}, - {"AdditionalParameters", "%s"}}); +static TableDefinition kGeneral("General", {{"StartTime_ut", "%lu", true}, + {"StopTime_ut", "%lu", true}, + {"NumberOfEvents", "%lu", true}, + {"Exception", "%s"}, + {"Config", "%s"}, + {"AdditionalParameters", "%s"}}); const std::string kCreateGeneral = getCreateTableStatement(kGeneral); std::vector general_updates_; @@ -266,6 +266,3 @@ std::shared_ptr LoggerManager::createSolaLogger() { } } // namespace daisi - -#undef TableDefinition -#undef ViewDefinition diff --git a/daisi/src/minhton-ns3/minhton_logger_ns3.cpp b/daisi/src/minhton-ns3/minhton_logger_ns3.cpp index 1b6aabee..c22679dd 100644 --- a/daisi/src/minhton-ns3/minhton_logger_ns3.cpp +++ b/daisi/src/minhton-ns3/minhton_logger_ns3.cpp @@ -20,8 +20,8 @@ #include "ns3/simulator.h" -#define TableDefinition static const DatabaseTable -#define ViewDefinition static const std::unordered_map +using TableDefinition = const DatabaseTable; +using ViewDefinition = const std::unordered_map; namespace minhton { @@ -37,12 +37,12 @@ void MinhtonLoggerNs3::logEvent(const LoggerInfoAddEvent &info) { } // * FindQuery -TableDefinition kFindQuery("MinhtonFindQuery", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"EventId", "%lu", true, "Event(Id)"}, - {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"Query", "%s"}}); +static TableDefinition kFindQuery("MinhtonFindQuery", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"EventId", "%lu", true, "Event(Id)"}, + {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"Query", "%s"}}); static const std::string kCreateFindQuery = getCreateTableStatement(kFindQuery); void MinhtonLoggerNs3::logFindQuery(const LoggerInfoAddFindQuery &info) { @@ -60,11 +60,11 @@ void MinhtonLoggerNs3::logFindQuery(const LoggerInfoAddFindQuery &info) { } // * FindQueryResult -TableDefinition kFindQueryResult("MinhtonFindQueryResult", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"EventId", "%lu", true, "Event(Id)"}, - {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}}); +static TableDefinition kFindQueryResult("MinhtonFindQueryResult", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"EventId", "%lu", true, "Event(Id)"}, + {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}}); static const std::string kCreateFindQueryResult = getCreateTableStatement(kFindQueryResult); void MinhtonLoggerNs3::logFindQueryResult(const LoggerInfoAddFindQueryResult &info) { @@ -81,11 +81,11 @@ void MinhtonLoggerNs3::logFindQueryResult(const LoggerInfoAddFindQueryResult &in } // * MinhtonPhysicalNodeInfo -TableDefinition kMinhtonPhysicalNodeInfo("MinhtonPhysicalNodeInfo", - {{"ApplicationUuid", "%s", true, - "DeviceApplication(ApplicationUuid)", true}, - {"Ip", "%s", true}, - {"Port", "%u", true}}); +static TableDefinition kMinhtonPhysicalNodeInfo("MinhtonPhysicalNodeInfo", + {{"ApplicationUuid", "%s", true, + "DeviceApplication(ApplicationUuid)", true}, + {"Ip", "%s", true}, + {"Port", "%u", true}}); static const std::string kCreateMinhtonPhysicalNodeInfo = getCreateTableStatement(kMinhtonPhysicalNodeInfo); @@ -103,12 +103,12 @@ void MinhtonLoggerNs3::logPhysicalNodeInfo(const LoggerPhysicalNodeInfo &info) { } // * MinhtonNode -TableDefinition kMinhtonNode("MinhtonNode", - {{"PositionUuid", "%s", true, "", true}, - {"ApplicationUuid", "%s", true, "DeviceApplication(ApplicationUuid)"}, - {"Level", "%u"}, - {"Number", "%u"}, - {"Fanout", "%u"}}); +static TableDefinition kMinhtonNode("MinhtonNode", {{"PositionUuid", "%s", true, "", true}, + {"ApplicationUuid", "%s", true, + "DeviceApplication(ApplicationUuid)"}, + {"Level", "%u"}, + {"Number", "%u"}, + {"Fanout", "%u"}}); static const std::string kCreateMinhtonNode = getCreateTableStatement(kMinhtonNode); void MinhtonLoggerNs3::logNode(const LoggerInfoAddNode &info) { @@ -137,18 +137,18 @@ void MinhtonLoggerNs3::logNode(const LoggerInfoAddNode &info) { } // * MinhtonNodeState -TableDefinition kMinhtonNodeState("MinhtonNodeState", - {DatabaseColumnInfo{"Id"}, - {"PositionUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"Timestamp_ms", "%u", true}, - {"State", "%u", true}, - {"EventId", "%lu", true, "Event(Id)"}}, - "UNIQUE(PositionUuid, State)"); +static TableDefinition kMinhtonNodeState("MinhtonNodeState", + {DatabaseColumnInfo{"Id"}, + {"PositionUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"Timestamp_ms", "%u", true}, + {"State", "%u", true}, + {"EventId", "%lu", true, "Event(Id)"}}, + "UNIQUE(PositionUuid, State)"); static const std::string kCreateMinhtonNodeState = getCreateTableStatement(kMinhtonNodeState); static bool minhton_node_state_exists_ = false; -TableDefinition kEnumMinhtonNodeState("enumMinhtonNodeState", - {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); +static TableDefinition kEnumMinhtonNodeState("enumMinhtonNodeState", + {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); static const std::string kCreateEnumMinhtonNodeState = getCreateTableStatement(kEnumMinhtonNodeState); @@ -167,7 +167,7 @@ void MinhtonLoggerNs3::logMinhtonNodeStates() { } } -ViewDefinition kNodeStateReplacements = { +static ViewDefinition kNodeStateReplacements = { {"PositionUuid", "N1.Level AS Level, N1.Number AS Number, Net1.Ip AS Ip, Net1.Port AS Port"}, {"State", "enumMinhtonNodeState.Name AS State"}}; static const std::string kCreateViewMinhtonNodeState = getCreateViewStatement( @@ -231,23 +231,23 @@ void MinhtonLoggerNs3::logNodeLeft(const LoggerInfoNodeState &info) { } // * MinhtonTraffic -TableDefinition kMinhtonTraffic("MinhtonTraffic", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"MsgType", "%u", true}, - {"Mode", "%u", true}, - {"EventId", "%lu", true, "Event(Id)"}, - {"RefEventId", "%lu", true, "Event(Id)"}, - {"SenderNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"TargetNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"PrimaryOtherNodeUuid", "%s", false, "MinhtonNode(PositionUuid)"}, - {"SecondaryOtherNodeUuid", "%s", false, - "MinhtonNode(PositionUuid)"}, - {"Content", "%s"}}); +static TableDefinition kMinhtonTraffic( + "MinhtonTraffic", {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"MsgType", "%u", true}, + {"Mode", "%u", true}, + {"EventId", "%lu", true, "Event(Id)"}, + {"RefEventId", "%lu", true, "Event(Id)"}, + {"SenderNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"TargetNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"PrimaryOtherNodeUuid", "%s", false, "MinhtonNode(PositionUuid)"}, + {"SecondaryOtherNodeUuid", "%s", false, "MinhtonNode(PositionUuid)"}, + {"Content", "%s"}}); static const std::string kCreateMinhtonTraffic = getCreateTableStatement(kMinhtonTraffic); -TableDefinition kEnumMinhtonMessageType("enumMinhtonMessageType", - {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); +static TableDefinition kEnumMinhtonMessageType("enumMinhtonMessageType", + {{"Id", "%u", true, "", true}, + {"Name", "%s", true}}); static const std::string kCreateEnumMinhtonMessageType = getCreateTableStatement(kEnumMinhtonMessageType); @@ -260,7 +260,7 @@ void MinhtonLoggerNs3::logMinhtonMessageTypes() { } } -ViewDefinition kTrafficReplacements = { +static ViewDefinition kTrafficReplacements = { {"MsgType", "enumMinhtonMessageType.Name AS MessageType"}, {"SenderNodeUuid", "SNode.Level AS SLevel, SNode.Number AS SNumber, SNetwork.Ip AS SIp"}, {"TargetNodeUuid", "TNode.Level AS TLevel, TNode.Number AS TNumber, TNetwork.Ip AS TIp"}, @@ -312,14 +312,14 @@ void MinhtonLoggerNs3::logTraffic(const MessageLoggingInfo &info) { } // * SearchContent -TableDefinition kSearchContent("MinhtonSearchContent", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"State", "%u", true}, - {"AttributeName", "%s"}, - {"Type", "%u", true}, - {"Text", "%s"}}); +static TableDefinition kSearchContent("MinhtonSearchContent", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"State", "%u", true}, + {"AttributeName", "%s"}, + {"Type", "%u", true}, + {"Text", "%s"}}); static const std::string kCreateCreateTraffic = getCreateTableStatement(kSearchContent); void MinhtonLoggerNs3::logContent(const LoggerInfoAddContent &info) { @@ -340,16 +340,16 @@ void MinhtonLoggerNs3::logContent(const LoggerInfoAddContent &info) { } // * MinhtonSearchTest -TableDefinition kSearchTest("MinhtonSearchTest", {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"EventId", "%lu", true, "Event(Id)"}, - {"State", "%u", true}, - {"SenderLevel", "%u"}, - {"SenderNumber", "%u"}, - {"TargetLevel", "%u"}, - {"TargetNumber", "%u"}, - {"HopLevel", "%u"}, - {"HopNumber", "%u"}}); +static TableDefinition kSearchTest("MinhtonSearchTest", {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"EventId", "%lu", true, "Event(Id)"}, + {"State", "%u", true}, + {"SenderLevel", "%u"}, + {"SenderNumber", "%u"}, + {"TargetLevel", "%u"}, + {"TargetNumber", "%u"}, + {"HopLevel", "%u"}, + {"HopNumber", "%u"}}); static const std::string kCreateSearchTest = getCreateTableStatement(kSearchTest); void MinhtonLoggerNs3::logSearchExactTest(const LoggerInfoSearchExact &info) { @@ -373,17 +373,18 @@ void MinhtonLoggerNs3::logSearchExactTest(const LoggerInfoSearchExact &info) { } // * RoutingInfo -TableDefinition kRoutingInfo("MinhtonRoutingInfo", - {DatabaseColumnInfo{"Id"}, - {"Timestamp_ms", "%lu", true}, - {"EventId", "%lu", true, "Event(Id)"}, - {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"NeighborNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, - {"Relationship", "%u", true}}); +static TableDefinition kRoutingInfo("MinhtonRoutingInfo", + {DatabaseColumnInfo{"Id"}, + {"Timestamp_ms", "%lu", true}, + {"EventId", "%lu", true, "Event(Id)"}, + {"NodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"NeighborNodeUuid", "%s", true, "MinhtonNode(PositionUuid)"}, + {"Relationship", "%u", true}}); static const std::string kCreateRoutingInfo = getCreateTableStatement(kRoutingInfo); -TableDefinition kEnumMinhtonRelationship("enumMinhtonRelationship", - {{"Id", "%u", true, "", true}, {"Name", "%s", true}}); +static TableDefinition kEnumMinhtonRelationship("enumMinhtonRelationship", + {{"Id", "%u", true, "", true}, + {"Name", "%s", true}}); static const std::string kCreateEnumMinhtonRelationship = getCreateTableStatement(kEnumMinhtonRelationship); @@ -405,7 +406,7 @@ void MinhtonLoggerNs3::logMinhtonRelationships() { } } -ViewDefinition kRtReplacements = { +static ViewDefinition kRtReplacements = { {"NodeUuid", "N1.Level AS NodeLevel, N1.Number AS NodeNumber, Net1.Ip AS NodeIp, Net1.Port AS NodePort"}, {"NeighborNodeUuid", "N2.Level AS NeighborLevel, N2.Number AS NeighborNumber, " @@ -469,6 +470,3 @@ void MinhtonLoggerNs3::logDebug(const std::string & /*msg*/) const { } } // namespace minhton - -#undef TableDefinition -#undef ViewDefinition