diff --git a/doc/design/diagrams/logging/logging_classes.puml b/doc/design/diagrams/logging/logging_classes.puml index df6022553e..97dd8dbc7d 100644 --- a/doc/design/diagrams/logging/logging_classes.puml +++ b/doc/design/diagrams/logging/logging_classes.puml @@ -3,13 +3,13 @@ package building_blocks <> { enum LogLevel { - OFF = 0, - FATAL, - ERROR, - WARN, - INFO, - DEBUG, - TRACE, + Off = 0, + Fatal, + Error, + Warn, + Info, + Debug, + Trace, } class Logger { diff --git a/doc/design/logging.md b/doc/design/logging.md index efba75140b..5b220778c7 100644 --- a/doc/design/logging.md +++ b/doc/design/logging.md @@ -23,14 +23,14 @@ variables, e.g. the log level. | LogLevel | Usage | |----------|-------| -| FATAL | For fatal and non-recoverable errors which essentially lead to termination of the program. | -| ERROR | For severe but recoverable errors. | -| WARN | For cases when something unintentional happens which is not considered a severe error. | -| INFO | Anything which could be relevant for the daily user. | -| DEBUG | Anything that is helpful for debugging, i.e. the info log level for the fellow developer. | -| TRACE | Anything that might be helpful for debugging in some cases but would be too verbose for debug log level. | - -The log levels `FATAL`, `ERROR` and `WARN` should not be used independently but +| Fatal | For fatal and non-recoverable errors which essentially lead to termination of the program. | +| Error | For severe but recoverable errors. | +| Warn | For cases when something unintentional happens which is not considered a severe error. | +| Info | Anything which could be relevant for the daily user. | +| Debug | Anything that is helpful for debugging, i.e. the info log level for the fellow developer. | +| Trace | Anything that might be helpful for debugging in some cases but would be too verbose for debug log level. | + +The log levels `Fatal`, `Error` and `Warn` should not be used independently but in combination with the error handler and vice versa. ## Design @@ -146,14 +146,14 @@ logger, independent of the active log level. The `IOX_LOG_INTERNAL` calls `self()` on the `LogStream` instance to create an lvalue reference to the `LogStream` instance. This eases the implementation of logging -support for custom types since `IOX_LOG(INFO, myType);` would require to implement -an overload with a rvalue `LogStream` reference but `IOX_LOG(INFO, "#### " << myType);` +support for custom types since `IOX_LOG(Info, myType);` would require to implement +an overload with a rvalue `LogStream` reference but `IOX_LOG(Info, "#### " << myType);` requires a lvalue reference. #### Behavior before calling Logger::init In order to have log messages before `Logger::init` is called, the default logger -is used with `LogLevel::INFO`. It is up to the implementation of the default +is used with `LogLevel::Info`. It is up to the implementation of the default logger what to do with these messages. For iceoryx the default logger is the `ConsoleLogger` (this can be changed via the platform abstraction) which will print the log messages to the console. @@ -269,11 +269,11 @@ This is the sequence diagram of the setup of the testing logger: The behavior of the logger can be altered via environment variables and the `Logger::init` function. Calling this function without arguments, it will check whether the environment variable `IOX_LOG_LEVEL` is set and use that value or -`LogLevel::INFO` if the environment variable is not set. To have a different +`LogLevel::Info` if the environment variable is not set. To have a different fallback log level, the `logLevelFromEnvOr` function can be used, e.g. ```cpp -iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::DEBUG)); +iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::Debug)); ``` If the logger shall not be altered via environment variables, `Logger::init` must @@ -303,9 +303,9 @@ re-implemented via the platform abstraction. int main() { - iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::DEBUG)); + iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::Debug)); - IOX_LOG(DEBUG, "Hello World"); + IOX_LOG(Debug, "Hello World"); return 0; } @@ -333,7 +333,7 @@ iox::log::LogStream& operator<<(iox::log::LogStream& stream, const MyType& m) int main() { MyType m; - IOX_LOG(INFO, m); + IOX_LOG(Info, m); return 0; } @@ -355,7 +355,7 @@ class MyLogger : public iox::log::Logger { static MyLogger myLogger; iox::log::Logger::setActiveLogger(myLogger); - iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::INFO)); + iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::Info)); } private: @@ -366,22 +366,22 @@ class MyLogger : public iox::log::Logger iox::log::LogLevel logLevel) noexcept override { switch(logLevel) { - case iox::log::LogLevel::FATAL: + case iox::log::LogLevel::Fatal: logString("💀: "); break; - case iox::log::LogLevel::ERROR: + case iox::log::LogLevel::Error: logString("🙈: "); break; - case iox::log::LogLevel::WARN: + case iox::log::LogLevel::Warn: logString("🙀: "); break; - case iox::log::LogLevel::INFO: + case iox::log::LogLevel::Info: logString("💘: "); break; - case iox::log::LogLevel::DEBUG: + case iox::log::LogLevel::Debug: logString("🐞: "); break; - case iox::log::LogLevel::TRACE: + case iox::log::LogLevel::Trace: logString("🐾: "); break; default: @@ -399,12 +399,12 @@ int main() { MyLogger::init(); - IOX_LOG(FATAL, "Whoops ... look, over there is a dead seagull flying!"); - IOX_LOG(ERROR, "Oh no!"); - IOX_LOG(WARN, "It didn't happen!"); - IOX_LOG(INFO, "All glory to the hypnotoad!"); - IOX_LOG(DEBUG, "I didn't do it!"); - IOX_LOG(TRACE, "Row row row your boat!"); + IOX_LOG(Fatal, "Whoops ... look, over there is a dead seagull flying!"); + IOX_LOG(Error, "Oh no!"); + IOX_LOG(Warn, "It didn't happen!"); + IOX_LOG(Info, "All glory to the hypnotoad!"); + IOX_LOG(Debug, "I didn't do it!"); + IOX_LOG(Trace, "Row row row your boat!"); return 0; } @@ -420,9 +420,9 @@ int main() log messages when the signal is raised? It might be necessary to wait for the error handling refactoring before this can be done - instead of having the `Logger::init()` static function with hidden default - parameter this could be replaced by `Logger::init(LogLevel::WARN)`, - `Logger::initFromEnvOr(LogLevel::WARN)` and a builder like - `Logger::customize().logLevelFromEnvOr(LogLevel::WARN).init()` + parameter this could be replaced by `Logger::init(LogLevel::Warn)`, + `Logger::initFromEnvOr(LogLevel::Warn)` and a builder like + `Logger::customize().logLevelFromEnvOr(LogLevel::Warn).init()` - wrap `__FILE__`, `__LINE__` and `__FUNCTION__` into a `source_location` struct - where should this struct be placed - could also be used by `IOX_EXPECTS`, `IOX_ENSURES` diff --git a/doc/website/images/logging_classes.svg b/doc/website/images/logging_classes.svg index daeb4a7004..2c0c4baf67 100644 --- a/doc/website/images/logging_classes.svg +++ b/doc/website/images/logging_classes.svg @@ -1,7 +1,7 @@ building_blockstestingLogLevelOFF = 0,FATAL,ERROR,WARN,INFO,DEBUG,TRACE,LogLevelOff = 0,Fatal,Error,Warn,Info,Debug,Trace,LoggerBaseLoggervoid init(const LogLevel logLevel = LogLevelFromEnvOr(LogLevel::Info))Logger& get()void setActiveLogger(Logger* newLogger)void initLoggerInternal(LogLevel logLevel)Logger& activeLogger(Logger* newLogger = nullptr)ConsoleLoggerLogLevel getLogLevel()void setLogLevel(LogLevel logLevel)ConsoleLogger()void initLogger(LogLevel logLevel)void createLogMessageHeader(const char* file, const int line, const char* function, LogLevel logLevel)void flush()LogBuffer getLogBuffer() constvoid assumeFlushed()void logString(const char* message)void logBool(const bool value)void logDec(const T value) with T being arithmetic typesvoid logHex(const T value) with T being unsigned integers, floats or pointervoid logOct(const T value) with T being unsigned integersTestingLoggervoid init()uint64_t getNumberOfLogMessages()std::vector<std::string> getLogMessages()bool doesLoggerSupportLogLevel(const LogLevel logLevel)void clearLogBuffer()void printLogBuffer()void TestingLogger()void flush()«friend»«friend»«friend» \ No newline at end of file +link LogStream to LogOct-->«friend» diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md index ad51e3aeb0..b63302334f 100644 --- a/doc/website/release-notes/iceoryx-unreleased.md +++ b/doc/website/release-notes/iceoryx-unreleased.md @@ -777,13 +777,13 @@ | before | after | |:----------:|:-------:| - | `kOff` | `OFF` | - | `kFatal` | `FATAL` | - | `kError` | `ERROR` | - | `kWarn` | `WARN` | - | `kInfo` | `INFO` | - | `kDebug` | `DEBUG` | - | `kVerbose` | `TRACE` | + | `kOff` | `Off` | + | `kFatal` | `Fatal` | + | `kError` | `Error` | + | `kWarn` | `Warn` | + | `kInfo` | `Info` | + | `kDebug` | `Debug` | + | `kVerbose` | `Trace` | In the C binding the `Iceoryx_LogLevel_Verbose` changed to `Iceoryx_LogLevel_Trace`. @@ -802,9 +802,9 @@ // after #include "iox/logging.hpp" - iox::log::Logger::init(iox::log::LogLevel::INFO); + iox::log::Logger::init(iox::log::LogLevel::Info); - IOX_LOG(INFO, "Hello World " << 42); + IOX_LOG(Info, "Hello World " << 42); ``` 31. Setting the default log level changed @@ -818,7 +818,7 @@ // after #include "iox/logging.hpp" - iox::log::Logger::init(iox::log::LogLevel::ERROR); + iox::log::Logger::init(iox::log::LogLevel::Error); ``` Please look at the logger design document for more details like setting the log level via environment variables. @@ -830,7 +830,7 @@ logger.SetLogLevel(); // directly on the instance // after - iox::log::Logger::setLogLevel(iox::log::LogLevel::DEBUG); + iox::log::Logger::setLogLevel(iox::log::LogLevel::Debug); ``` 33. Using the logger in libraries is massively simplified @@ -890,7 +890,7 @@ { void myFunc() { - IOX_LOG(INFO, "Hello World " << 42); + IOX_LOG(Info, "Hello World " << 42); } } ``` @@ -899,12 +899,12 @@ | before | after | |:---------------------------:|:---------------------------:| - | `LogFatal() << "x" << 42` | `IOX_LOG(FATAL, "x" << 42)` | - | `LogError() << "x" << 42` | `IOX_LOG(ERROR, "x" << 42)` | - | `LogWarn() << "x" << 42` | `IOX_LOG(WARN, "x" << 42)` | - | `LogInfo() << "x" << 42` | `IOX_LOG(INFO, "x" << 42)` | - | `LogDebug() << "x" << 42` | `IOX_LOG(DEBUG, "x" << 42)` | - | `LogVerbose() << "x" << 42` | `IOX_LOG(TRACE, "x" << 42)` | + | `LogFatal() << "x" << 42` | `IOX_LOG(Fatal, "x" << 42)` | + | `LogError() << "x" << 42` | `IOX_LOG(Error, "x" << 42)` | + | `LogWarn() << "x" << 42` | `IOX_LOG(Warn, "x" << 42)` | + | `LogInfo() << "x" << 42` | `IOX_LOG(Info, "x" << 42)` | + | `LogDebug() << "x" << 42` | `IOX_LOG(Debug, "x" << 42)` | + | `LogVerbose() << "x" << 42` | `IOX_LOG(Trace, "x" << 42)` | 35. Logger formatting changed @@ -915,10 +915,10 @@ LogInfo() << iox::log::RawBuffer(buf); // after - IOX_LOG(INFO, iox::log::hex(42)); - IOX_LOG(INFO, iox::log::oct(37)); - IOX_LOG(INFO, iox::log::bin(73)); - IOX_LOG(INFO, iox::log::raw(buf)); + IOX_LOG(Info, iox::log::hex(42)); + IOX_LOG(Info, iox::log::oct(37)); + IOX_LOG(Info, iox::log::bin(73)); + IOX_LOG(Info, iox::log::raw(buf)); ``` 36. Creating an instance of `LogStream` does not work anymore @@ -935,7 +935,7 @@ stream.Flush(); // after - IOX_LOG(INFO, [] (auto& stream) -> auto& { + IOX_LOG(Info, [] (auto& stream) -> auto& { stream << "fibonacci: " for(auto fib : {1, 1, 2, 3, 5, 8}) { @@ -1005,7 +1005,7 @@ #include "iceoryx_hoofs/testing/testing_logger.hpp" sut.methodCallWithLogOutput(); - if (iox::testing::TestingLogger::doesLoggerSupportLogLevel(iox::log::LogLevel::ERROR)) + if (iox::testing::TestingLogger::doesLoggerSupportLogLevel(iox::log::LogLevel::Error)) { auto logMessages = iox::testing::TestingLogger::getLogMessages(); ASSERT_THAT(logMessages.size(), Eq(1U)); diff --git a/iceoryx_binding_c/source/c2cpp_enum_translation.cpp b/iceoryx_binding_c/source/c2cpp_enum_translation.cpp index d38e6e9a32..ac4ce0bdc0 100644 --- a/iceoryx_binding_c/source/c2cpp_enum_translation.cpp +++ b/iceoryx_binding_c/source/c2cpp_enum_translation.cpp @@ -58,7 +58,7 @@ iox::popo::SubscriberEvent subscriberEvent(const iox_SubscriberEvent value) noex return iox::popo::SubscriberEvent::DATA_RECEIVED; } - IOX_LOG(FATAL, "invalid iox_SubscriberEvent value"); + IOX_LOG(Fatal, "invalid iox_SubscriberEvent value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SUBSCRIBER_EVENT_VALUE); return iox::popo::SubscriberEvent::DATA_RECEIVED; } @@ -71,7 +71,7 @@ iox::popo::SubscriberState subscriberState(const iox_SubscriberState value) noex return iox::popo::SubscriberState::HAS_DATA; } - IOX_LOG(FATAL, "invalid iox_SubscriberState value"); + IOX_LOG(Fatal, "invalid iox_SubscriberState value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SUBSCRIBER_STATE_VALUE); return iox::popo::SubscriberState::HAS_DATA; } @@ -84,7 +84,7 @@ iox::popo::ClientEvent clientEvent(const iox_ClientEvent value) noexcept return iox::popo::ClientEvent::RESPONSE_RECEIVED; } - IOX_LOG(FATAL, "invalid iox_ClientEvent value"); + IOX_LOG(Fatal, "invalid iox_ClientEvent value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_CLIENT_EVENT_VALUE); return iox::popo::ClientEvent::RESPONSE_RECEIVED; } @@ -97,7 +97,7 @@ iox::popo::ClientState clientState(const iox_ClientState value) noexcept return iox::popo::ClientState::HAS_RESPONSE; } - IOX_LOG(FATAL, "invalid iox_ClientState value"); + IOX_LOG(Fatal, "invalid iox_ClientState value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_CLIENT_STATE_VALUE); return iox::popo::ClientState::HAS_RESPONSE; } @@ -110,7 +110,7 @@ iox::popo::ServerEvent serverEvent(const iox_ServerEvent value) noexcept return iox::popo::ServerEvent::REQUEST_RECEIVED; } - IOX_LOG(FATAL, "invalid iox_ServerEvent value"); + IOX_LOG(Fatal, "invalid iox_ServerEvent value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVER_EVENT_VALUE); return iox::popo::ServerEvent::REQUEST_RECEIVED; } @@ -123,7 +123,7 @@ iox::popo::ServerState serverState(const iox_ServerState value) noexcept return iox::popo::ServerState::HAS_REQUEST; } - IOX_LOG(FATAL, "invalid iox_ServerState value"); + IOX_LOG(Fatal, "invalid iox_ServerState value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVER_STATE_VALUE); return iox::popo::ServerState::HAS_REQUEST; } @@ -136,7 +136,7 @@ iox::runtime::ServiceDiscoveryEvent serviceDiscoveryEvent(const iox_ServiceDisco return iox::runtime::ServiceDiscoveryEvent::SERVICE_REGISTRY_CHANGED; } - IOX_LOG(FATAL, "invalid iox_ServiceDiscoveryEvent value"); + IOX_LOG(Fatal, "invalid iox_ServiceDiscoveryEvent value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVICE_DISCOVERY_EVENT_VALUE); return iox::runtime::ServiceDiscoveryEvent::SERVICE_REGISTRY_CHANGED; } @@ -151,7 +151,7 @@ iox::popo::MessagingPattern messagingPattern(const iox_MessagingPattern value) n return iox::popo::MessagingPattern::REQ_RES; } - IOX_LOG(FATAL, "invalid iox_MessagingPattern value"); + IOX_LOG(Fatal, "invalid iox_MessagingPattern value"); IOX_REPORT_FATAL(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_MESSAGING_PATTERN_VALUE); return iox::popo::MessagingPattern::PUB_SUB; } diff --git a/iceoryx_binding_c/source/c_log.cpp b/iceoryx_binding_c/source/c_log.cpp index 4b8119f997..6f1e20c54c 100644 --- a/iceoryx_binding_c/source/c_log.cpp +++ b/iceoryx_binding_c/source/c_log.cpp @@ -27,21 +27,21 @@ LogLevel toLogLevel(enum iox_LogLevel level) switch (level) { case Iceoryx_LogLevel_Off: - return LogLevel::OFF; + return LogLevel::Off; case Iceoryx_LogLevel_Trace: - return LogLevel::TRACE; + return LogLevel::Trace; case Iceoryx_LogLevel_Debug: - return LogLevel::DEBUG; + return LogLevel::Debug; case Iceoryx_LogLevel_Info: - return LogLevel::INFO; + return LogLevel::Info; case Iceoryx_LogLevel_Warn: - return LogLevel::WARN; + return LogLevel::Warn; case Iceoryx_LogLevel_Error: - return LogLevel::ERROR; + return LogLevel::Error; case Iceoryx_LogLevel_Fatal: - return LogLevel::FATAL; + return LogLevel::Fatal; default: - return LogLevel::TRACE; + return LogLevel::Trace; } } diff --git a/iceoryx_binding_c/source/c_publisher.cpp b/iceoryx_binding_c/source/c_publisher.cpp index 042fa301bb..5ff63be2ca 100644 --- a/iceoryx_binding_c/source/c_publisher.cpp +++ b/iceoryx_binding_c/source/c_publisher.cpp @@ -41,7 +41,7 @@ void iox_pub_options_init(iox_pub_options_t* options) { if (options == nullptr) { - IOX_LOG(WARN, "publisher options initialization skipped - null pointer provided"); + IOX_LOG(Warn, "publisher options initialization skipped - null pointer provided"); return; } @@ -67,7 +67,7 @@ iox_pub_t iox_pub_init(iox_pub_storage_t* self, { if (self == nullptr) { - IOX_LOG(WARN, "publisher initialization skipped - null pointer provided for iox_pub_storage_t"); + IOX_LOG(Warn, "publisher initialization skipped - null pointer provided for iox_pub_storage_t"); return nullptr; } @@ -80,7 +80,7 @@ iox_pub_t iox_pub_init(iox_pub_storage_t* self, { // note that they may have been initialized but the initCheck // pattern overwritten afterwards, we cannot be sure but it is a misuse - IOX_LOG(FATAL, "publisher options may not have been initialized with iox_pub_options_init"); + IOX_LOG(Fatal, "publisher options may not have been initialized with iox_pub_options_init"); IOX_REPORT_FATAL(CBindingError::BINDING_C__PUBLISHER_OPTIONS_NOT_INITIALIZED); } publisherOptions.historyCapacity = options->historyCapacity; diff --git a/iceoryx_binding_c/source/c_subscriber.cpp b/iceoryx_binding_c/source/c_subscriber.cpp index 0cb263c68e..f54f5ecd21 100644 --- a/iceoryx_binding_c/source/c_subscriber.cpp +++ b/iceoryx_binding_c/source/c_subscriber.cpp @@ -50,7 +50,7 @@ void iox_sub_options_init(iox_sub_options_t* options) { if (options == nullptr) { - IOX_LOG(WARN, "subscriber options initialization skipped - null pointer provided"); + IOX_LOG(Warn, "subscriber options initialization skipped - null pointer provided"); return; } @@ -78,7 +78,7 @@ iox_sub_t iox_sub_init(iox_sub_storage_t* self, { if (self == nullptr) { - IOX_LOG(WARN, "subscriber initialization skipped - null pointer provided for iox_sub_storage_t"); + IOX_LOG(Warn, "subscriber initialization skipped - null pointer provided for iox_sub_storage_t"); return nullptr; } @@ -91,7 +91,7 @@ iox_sub_t iox_sub_init(iox_sub_storage_t* self, { // note that they may have been initialized but the initCheck // pattern overwritten afterwards, we cannot be sure but it is a misuse - IOX_LOG(FATAL, "subscriber options may not have been initialized with iox_sub_init"); + IOX_LOG(Fatal, "subscriber options may not have been initialized with iox_sub_init"); IOX_REPORT_FATAL(CBindingError::BINDING_C__SUBSCRIBER_OPTIONS_NOT_INITIALIZED); } subscriberOptions.queueCapacity = options->queueCapacity; diff --git a/iceoryx_binding_c/source/c_user_trigger.cpp b/iceoryx_binding_c/source/c_user_trigger.cpp index 81a69ca130..e5df943bdb 100644 --- a/iceoryx_binding_c/source/c_user_trigger.cpp +++ b/iceoryx_binding_c/source/c_user_trigger.cpp @@ -31,7 +31,7 @@ iox_user_trigger_t iox_user_trigger_init(iox_user_trigger_storage_t* self) { if (self == nullptr) { - IOX_LOG(WARN, "user trigger initialization skipped - null pointer provided for iox_user_trigger_storage_t"); + IOX_LOG(Warn, "user trigger initialization skipped - null pointer provided for iox_user_trigger_storage_t"); return nullptr; } auto* me = new UserTrigger(); diff --git a/iceoryx_binding_c/test/moduletests/test_log.cpp b/iceoryx_binding_c/test/moduletests/test_log.cpp index 304bec6fa8..d5f913c8f3 100644 --- a/iceoryx_binding_c/test/moduletests/test_log.cpp +++ b/iceoryx_binding_c/test/moduletests/test_log.cpp @@ -33,25 +33,25 @@ TEST(iox_log_test, LogLevelIsSetCorrectly) auto& logger = iox::log::Logger::get(); iox_set_loglevel(Iceoryx_LogLevel_Off); - EXPECT_EQ(logger.getLogLevel(), LogLevel::OFF); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Off); iox_set_loglevel(Iceoryx_LogLevel_Fatal); - EXPECT_EQ(logger.getLogLevel(), LogLevel::FATAL); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Fatal); iox_set_loglevel(Iceoryx_LogLevel_Error); - EXPECT_EQ(logger.getLogLevel(), LogLevel::ERROR); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Error); iox_set_loglevel(Iceoryx_LogLevel_Warn); - EXPECT_EQ(logger.getLogLevel(), LogLevel::WARN); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Warn); iox_set_loglevel(Iceoryx_LogLevel_Info); - EXPECT_EQ(logger.getLogLevel(), LogLevel::INFO); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Info); iox_set_loglevel(Iceoryx_LogLevel_Debug); - EXPECT_EQ(logger.getLogLevel(), LogLevel::DEBUG); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Debug); iox_set_loglevel(Iceoryx_LogLevel_Trace); - EXPECT_EQ(logger.getLogLevel(), LogLevel::TRACE); + EXPECT_EQ(logger.getLogLevel(), LogLevel::Trace); } } // namespace diff --git a/iceoryx_examples/experimental/node/iox_cpp_node_publisher.cpp b/iceoryx_examples/experimental/node/iox_cpp_node_publisher.cpp index 48a25501df..054a6d63a2 100644 --- a/iceoryx_examples/experimental/node/iox_cpp_node_publisher.cpp +++ b/iceoryx_examples/experimental/node/iox_cpp_node_publisher.cpp @@ -26,7 +26,7 @@ constexpr char APP_NAME[] = "iox-cpp-node-publisher"; int main() { - iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::INFO)); + iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::Info)); double value = 0.0; while (!iox::hasTerminationRequested()) diff --git a/iceoryx_examples/experimental/node/iox_cpp_node_subscriber.cpp b/iceoryx_examples/experimental/node/iox_cpp_node_subscriber.cpp index 1c172b7ec9..5e01f4291d 100644 --- a/iceoryx_examples/experimental/node/iox_cpp_node_subscriber.cpp +++ b/iceoryx_examples/experimental/node/iox_cpp_node_subscriber.cpp @@ -39,7 +39,7 @@ static void sigHandler(int sig [[maybe_unused]]) int main() { - iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::INFO)); + iox::log::Logger::init(iox::log::logLevelFromEnvOr(iox::log::LogLevel::Info)); auto signalIntGuard = iox::registerSignalHandler(iox::PosixSignal::INT, sigHandler).expect("failed to register SIGINT"); diff --git a/iceoryx_examples/ice_access_control/roudi_main_static_segments.cpp b/iceoryx_examples/ice_access_control/roudi_main_static_segments.cpp index dcd58f1c9a..ee225b21e7 100644 --- a/iceoryx_examples/ice_access_control/roudi_main_static_segments.cpp +++ b/iceoryx_examples/ice_access_control/roudi_main_static_segments.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) auto cmdLineArgs = cmdLineParser.parse(argc, argv); if (cmdLineArgs.has_error()) { - IOX_LOG(FATAL, "Unable to parse command line arguments!"); + IOX_LOG(Fatal, "Unable to parse command line arguments!"); return EXIT_FAILURE; } diff --git a/iceoryx_examples/iceperf/roudi_main_static_config.cpp b/iceoryx_examples/iceperf/roudi_main_static_config.cpp index 8138888dcf..c3f1cf65d2 100644 --- a/iceoryx_examples/iceperf/roudi_main_static_config.cpp +++ b/iceoryx_examples/iceperf/roudi_main_static_config.cpp @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) auto cmdLineArgs = cmdLineParser.parse(argc, argv); if (cmdLineArgs.has_error()) { - IOX_LOG(FATAL, "Unable to parse command line arguments!"); + IOX_LOG(Fatal, "Unable to parse command line arguments!"); return EXIT_FAILURE; } diff --git a/iceoryx_examples/singleprocess/README.md b/iceoryx_examples/singleprocess/README.md index 5b57a4bba8..63cadde08e 100644 --- a/iceoryx_examples/singleprocess/README.md +++ b/iceoryx_examples/singleprocess/README.md @@ -27,7 +27,7 @@ transmit and receive data. ```cpp -iox::log::Logger::init(iox::log::LogLevel::INFO); +iox::log::Logger::init(iox::log::LogLevel::Info); ``` 2. To start RouDi we have to create a configuration for him. We are choosing the diff --git a/iceoryx_examples/singleprocess/single_process.cpp b/iceoryx_examples/singleprocess/single_process.cpp index ada254d2f3..bffe069754 100644 --- a/iceoryx_examples/singleprocess/single_process.cpp +++ b/iceoryx_examples/singleprocess/single_process.cpp @@ -111,7 +111,7 @@ int main() { // set the log level to info to to have the output for launch_testing //! [log level] - iox::log::Logger::init(iox::log::LogLevel::INFO); + iox::log::Logger::init(iox::log::LogLevel::Info); //! [log level] //! [roudi config] diff --git a/iceoryx_hoofs/BUILD.bazel b/iceoryx_hoofs/BUILD.bazel index c299dad6b5..0c3c0708c0 100644 --- a/iceoryx_hoofs/BUILD.bazel +++ b/iceoryx_hoofs/BUILD.bazel @@ -25,7 +25,7 @@ configure_file( "IOX_MAX_NAMED_PIPE_MESSAGE_SIZE": "4096", "IOX_MAX_NAMED_PIPE_NUMBER_OF_MESSAGES": "10", # FIXME: for values see "iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake" ... for now some nice defaults - "IOX_MINIMAL_LOG_LEVEL": "TRACE", + "IOX_MINIMAL_LOG_LEVEL": "Trace", }, ) diff --git a/iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake b/iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake index 3110be87a3..fa65048b32 100644 --- a/iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake +++ b/iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake @@ -20,7 +20,7 @@ message(STATUS "[i] <<<<<<<<<<<<< Start iceoryx_hoofs configuration: >>>>>>>>>>> configure_option( NAME IOX_MINIMAL_LOG_LEVEL - DEFAULT_VALUE "TRACE" + DEFAULT_VALUE "Trace" ) configure_option( NAME IOX_MAX_NAMED_PIPE_MESSAGE_SIZE diff --git a/iceoryx_hoofs/concurrent/sync/include/iox/detail/periodic_task.hpp b/iceoryx_hoofs/concurrent/sync/include/iox/detail/periodic_task.hpp index 2e9e47af0e..259ed857aa 100644 --- a/iceoryx_hoofs/concurrent/sync/include/iox/detail/periodic_task.hpp +++ b/iceoryx_hoofs/concurrent/sync/include/iox/detail/periodic_task.hpp @@ -56,7 +56,7 @@ static constexpr PeriodicTaskManualStart_t PeriodicTaskManualStart; /// { /// using namespace iox::units::duration_literals; /// iox::concurrent::detail::PeriodicTask> task{ -/// iox::concurrent::detail::PeriodicTaskAutoStart, 1_s, "MyTask", [] { IOX_LOG(INFO, "Hello World"; }}); +/// iox::concurrent::detail::PeriodicTaskAutoStart, 1_s, "MyTask", [] { IOX_LOG(Info, "Hello World"; }}); /// /// return 0; /// } diff --git a/iceoryx_hoofs/concurrent/sync/source/spin_lock.cpp b/iceoryx_hoofs/concurrent/sync/source/spin_lock.cpp index dfe8bb2172..7c7f087ab0 100644 --- a/iceoryx_hoofs/concurrent/sync/source/spin_lock.cpp +++ b/iceoryx_hoofs/concurrent/sync/source/spin_lock.cpp @@ -26,7 +26,7 @@ SpinLockBuilder::create(optional& uninitializedLock) noexc { if (uninitializedLock.has_value()) { - IOX_LOG(ERROR, "Unable to override an already initialized SpinLock with a new SpinLock"); + IOX_LOG(Error, "Unable to override an already initialized SpinLock with a new SpinLock"); return err(Error::LOCK_ALREADY_INITIALIZED); } diff --git a/iceoryx_hoofs/concurrent/sync/source/spin_semaphore.cpp b/iceoryx_hoofs/concurrent/sync/source/spin_semaphore.cpp index b09905b1f2..6f183ec908 100644 --- a/iceoryx_hoofs/concurrent/sync/source/spin_semaphore.cpp +++ b/iceoryx_hoofs/concurrent/sync/source/spin_semaphore.cpp @@ -26,7 +26,7 @@ SpinSemaphoreBuilder::create(optional& uninitializedSemaphore) co { if (m_initialValue > IOX_SEM_VALUE_MAX) { - IOX_LOG(ERROR, + IOX_LOG(Error, "The spin semaphore initial value of " << m_initialValue << " exceeds the maximum semaphore value " << IOX_SEM_VALUE_MAX); return err(SemaphoreError::SEMAPHORE_OVERFLOW); diff --git a/iceoryx_hoofs/container/include/iox/detail/forward_list.inl b/iceoryx_hoofs/container/include/iox/detail/forward_list.inl index 370fea37bc..023eb929e9 100644 --- a/iceoryx_hoofs/container/include/iox/detail/forward_list.inl +++ b/iceoryx_hoofs/container/include/iox/detail/forward_list.inl @@ -233,7 +233,7 @@ forward_list::emplace_after(const_iterator iter, ConstructorArgs&&. if (m_size >= Capacity) { - IOX_LOG(DEBUG, "capacity exhausted"); + IOX_LOG(Debug, "capacity exhausted"); return end(); } @@ -271,7 +271,7 @@ inline typename forward_list::iterator forward_list::e // additional validity check on to-be-erase element if (!isValidElementIdx(eraseIdx) || empty()) { - IOX_LOG(DEBUG, "iterator is end() or list is empty"); + IOX_LOG(Debug, "iterator is end() or list is empty"); return end(); } diff --git a/iceoryx_hoofs/container/include/iox/detail/list.inl b/iceoryx_hoofs/container/include/iox/detail/list.inl index 2b88f6f330..7749d8a9aa 100644 --- a/iceoryx_hoofs/container/include/iox/detail/list.inl +++ b/iceoryx_hoofs/container/include/iox/detail/list.inl @@ -233,7 +233,7 @@ inline typename list::iterator list::emplace(const_ite if (m_size >= Capacity) { - IOX_LOG(DEBUG, "capacity exhausted"); + IOX_LOG(Debug, "capacity exhausted"); return end(); } @@ -272,7 +272,7 @@ inline typename list::iterator list::erase(const_itera // further narrow-down checks if (!isValidElementIdx(eraseIdx) || empty()) { - IOX_LOG(DEBUG, "list is empty"); + IOX_LOG(Debug, "list is empty"); return end(); } diff --git a/iceoryx_hoofs/container/include/iox/detail/vector.inl b/iceoryx_hoofs/container/include/iox/detail/vector.inl index 6c20aaff20..a6f46c6fd0 100644 --- a/iceoryx_hoofs/container/include/iox/detail/vector.inl +++ b/iceoryx_hoofs/container/include/iox/detail/vector.inl @@ -31,7 +31,7 @@ inline vector::vector(const uint64_t count, const T& value) noexcep { if (count > Capacity) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Attempting to initialize a vector of capacity " << Capacity << " with " << count << " elements. This exceeds the capacity and only " << Capacity << " elements will be created!"); @@ -48,7 +48,7 @@ inline vector::vector(const uint64_t count) noexcept { if (count > Capacity) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Attempting to initialize a vector of capacity " << Capacity << " with " << count << " elements. This exceeds the capacity and only " << Capacity << " elements will be created!"); diff --git a/iceoryx_hoofs/filesystem/source/file_reader.cpp b/iceoryx_hoofs/filesystem/source/file_reader.cpp index 6f6c27a049..bb8656c581 100644 --- a/iceoryx_hoofs/filesystem/source/file_reader.cpp +++ b/iceoryx_hoofs/filesystem/source/file_reader.cpp @@ -46,13 +46,13 @@ FileReader::FileReader(const std::string& fileName, const std::string& filePath, } case ErrorMode::Inform: { - IOX_LOG(ERROR, "Could not open file '" << fileName << "' from path '" << filePath << "'."); + IOX_LOG(Error, "Could not open file '" << fileName << "' from path '" << filePath << "'."); return; } case ErrorMode::Terminate: { m_fileStream.close(); - IOX_LOG(FATAL, "Could not open file '" << fileName << "' from path '" << filePath << "'!"); + IOX_LOG(Fatal, "Could not open file '" << fileName << "' from path '" << filePath << "'!"); IOX_PANIC("Exiting due to file open failure!"); return; } diff --git a/iceoryx_hoofs/filesystem/source/filesystem.cpp b/iceoryx_hoofs/filesystem/source/filesystem.cpp index 2b5d259ea5..d8d4dbd94d 100644 --- a/iceoryx_hoofs/filesystem/source/filesystem.cpp +++ b/iceoryx_hoofs/filesystem/source/filesystem.cpp @@ -188,7 +188,7 @@ int convertToOflags(const AccessMode accessMode) noexcept return O_WRONLY; } - IOX_LOG(ERROR, "Unable to convert to O_ flag since an undefined iox::AccessMode was provided"); + IOX_LOG(Error, "Unable to convert to O_ flag since an undefined iox::AccessMode was provided"); return 0; } @@ -208,7 +208,7 @@ int convertToOflags(const OpenMode openMode) noexcept return O_CREAT | O_EXCL; } - IOX_LOG(ERROR, "Unable to convert to O_ flag since an undefined iox::OpenMode was provided"); + IOX_LOG(Error, "Unable to convert to O_ flag since an undefined iox::OpenMode was provided"); return 0; } @@ -225,7 +225,7 @@ int convertToProtFlags(const AccessMode accessMode) noexcept return PROT_WRITE; } - IOX_LOG(ERROR, "Unable to convert to PROT_ flag since an undefined iox::AccessMode was provided"); + IOX_LOG(Error, "Unable to convert to PROT_ flag since an undefined iox::AccessMode was provided"); return PROT_NONE; } diff --git a/iceoryx_hoofs/memory/include/iox/scope_guard.hpp b/iceoryx_hoofs/memory/include/iox/scope_guard.hpp index 7f1e859164..b3a30d6b53 100644 --- a/iceoryx_hoofs/memory/include/iox/scope_guard.hpp +++ b/iceoryx_hoofs/memory/include/iox/scope_guard.hpp @@ -34,9 +34,9 @@ namespace iox /// // I am doing stuff /// // goodbye /// void someFunc() { -/// ScopeGuard myScopeGuard{[](){ IOX_LOG(INFO, "hello world\n"); }, -/// [](){ IOX_LOG(INFO, "goodbye"; }}); -/// IOX_LOG(INFO, "I am doing stuff"); +/// ScopeGuard myScopeGuard{[](){ IOX_LOG(Info, "hello world\n"); }, +/// [](){ IOX_LOG(Info, "goodbye"; }}); +/// IOX_LOG(Info, "I am doing stuff"); /// // myScopeGuard goes out of scope here and the cleanupFunction is called in the /// // destructor /// } diff --git a/iceoryx_hoofs/memory/include/iox/unique_ptr.hpp b/iceoryx_hoofs/memory/include/iox/unique_ptr.hpp index d96a8054fd..8d5063906d 100644 --- a/iceoryx_hoofs/memory/include/iox/unique_ptr.hpp +++ b/iceoryx_hoofs/memory/include/iox/unique_ptr.hpp @@ -40,7 +40,7 @@ namespace iox /// }); /// /// // Data can be accessed through unique_ptr -/// IOX_LOG(INFO, myPtr->myClassMember); +/// IOX_LOG(Info, myPtr->myClassMember); /// /// // Resetting the unique_ptr, can be performed by calling the move assignment operator /// myPtr = std::move(uniquePtrToAnotherInt); diff --git a/iceoryx_hoofs/memory/source/bump_allocator.cpp b/iceoryx_hoofs/memory/source/bump_allocator.cpp index 496db530c8..8b2cd4903f 100644 --- a/iceoryx_hoofs/memory/source/bump_allocator.cpp +++ b/iceoryx_hoofs/memory/source/bump_allocator.cpp @@ -38,7 +38,7 @@ expected BumpAllocator::allocate(const uint64_t size, { if (size == 0) { - IOX_LOG(WARN, "Cannot allocate memory of size 0."); + IOX_LOG(Warn, "Cannot allocate memory of size 0."); return err(BumpAllocatorError::REQUESTED_ZERO_SIZED_MEMORY); } @@ -59,7 +59,7 @@ expected BumpAllocator::allocate(const uint64_t size, } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "Trying to allocate additional " << size << " bytes in the memory of capacity " << m_length << " when there are already " << alignedPosition << " aligned bytes in use.\n Only " << m_length - alignedPosition diff --git a/iceoryx_hoofs/posix/auth/source/posix_group.cpp b/iceoryx_hoofs/posix/auth/source/posix_group.cpp index dd5213d32c..68157c4a04 100644 --- a/iceoryx_hoofs/posix/auth/source/posix_group.cpp +++ b/iceoryx_hoofs/posix/auth/source/posix_group.cpp @@ -42,7 +42,7 @@ PosixGroup::PosixGroup(const PosixGroup::groupName_t& name) noexcept } else { - IOX_LOG(ERROR, "Error: Group name not found"); + IOX_LOG(Error, "Error: Group name not found"); m_id = std::numeric_limits::max(); } } @@ -63,7 +63,7 @@ optional PosixGroup::getGroupID(const PosixGroup::groupName_t& name) if (getgrnamCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not find group '" << name << "'."); + IOX_LOG(Error, "Error: Could not find group '" << name << "'."); return nullopt_t(); } @@ -76,7 +76,7 @@ optional PosixGroup::getGroupName(iox_gid_t id) noexcep if (getgrgidCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not find group with id '" << id << "'."); + IOX_LOG(Error, "Error: Could not find group with id '" << id << "'."); return nullopt_t(); } diff --git a/iceoryx_hoofs/posix/auth/source/posix_user.cpp b/iceoryx_hoofs/posix/auth/source/posix_user.cpp index 186eda6a6d..672698877d 100644 --- a/iceoryx_hoofs/posix/auth/source/posix_user.cpp +++ b/iceoryx_hoofs/posix/auth/source/posix_user.cpp @@ -35,7 +35,7 @@ optional PosixUser::getUserID(const userName_t& name) noexcept if (getpwnamCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not find user '" << name << "'."); + IOX_LOG(Error, "Error: Could not find user '" << name << "'."); return nullopt_t(); } return make_optional(getpwnamCall->value->pw_uid); @@ -47,7 +47,7 @@ optional PosixUser::getUserName(iox_uid_t id) noexcept if (getpwuidCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not find user with id'" << id << "'."); + IOX_LOG(Error, "Error: Could not find user with id'" << id << "'."); return nullopt_t(); } return make_optional(userName_t(iox::TruncateToCapacity, getpwuidCall->value->pw_name)); @@ -64,7 +64,7 @@ PosixUser::groupVector_t PosixUser::getGroups() const noexcept auto getpwnamCall = IOX_POSIX_CALL(getpwnam)(userName->c_str()).failureReturnValue(nullptr).evaluate(); if (getpwnamCall.has_error()) { - IOX_LOG(ERROR, "Error: getpwnam call failed"); + IOX_LOG(Error, "Error: getpwnam call failed"); return groupVector_t(); } @@ -78,13 +78,13 @@ PosixUser::groupVector_t PosixUser::getGroups() const noexcept .evaluate(); if (getgrouplistCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not obtain group list"); + IOX_LOG(Error, "Error: Could not obtain group list"); return groupVector_t(); } if (numGroups == -1) { - IOX_LOG(ERROR, "Error: List with negative size returned"); + IOX_LOG(Error, "Error: List with negative size returned"); return groupVector_t(); } @@ -112,7 +112,7 @@ PosixUser::PosixUser(const PosixUser::userName_t& name) noexcept } else { - IOX_LOG(ERROR, "Error: User name not found"); + IOX_LOG(Error, "Error: User name not found"); m_id = std::numeric_limits::max(); } } diff --git a/iceoryx_hoofs/posix/design/include/iox/detail/posix_call.inl b/iceoryx_hoofs/posix/design/include/iox/detail/posix_call.inl index 17b686a8bb..9dbb5e5e91 100644 --- a/iceoryx_hoofs/posix/design/include/iox/detail/posix_call.inl +++ b/iceoryx_hoofs/posix/design/include/iox/detail/posix_call.inl @@ -190,7 +190,7 @@ PosixCallEvaluator::evaluate() const&& noexcept if (!m_details.hasSilentErrno) { - IOX_LOG(ERROR, + IOX_LOG(Error, m_details.file << ":" << m_details.line << " { " << m_details.callingFunction << " -> " << m_details.posixFunctionName << " } ::: [ " << m_details.result.errnum << " ] " << m_details.result.getHumanReadableErrnum()); diff --git a/iceoryx_hoofs/posix/design/include/iox/posix_call.hpp b/iceoryx_hoofs/posix/design/include/iox/posix_call.hpp index 37fc3f931f..fcbf0eb18c 100644 --- a/iceoryx_hoofs/posix/design/include/iox/posix_call.hpp +++ b/iceoryx_hoofs/posix/design/include/iox/posix_call.hpp @@ -192,14 +192,14 @@ class [[nodiscard]] PosixCallBuilder /// .ignoreErrnos(ETIMEDOUT) // can be a comma separated list of errnos /// .evaluate() /// .and_then([](auto & result){ -/// IOX_LOG(INFO, result.value); // return value of sem_timedwait -/// IOX_LOG(INFO, result.errno); // errno which was set by sem_timedwait -/// IOX_LOG(INFO, result.getHumanReadableErrnum()); // get string returned by strerror_r(errno, ...) +/// IOX_LOG(Info, result.value); // return value of sem_timedwait +/// IOX_LOG(Info, result.errno); // errno which was set by sem_timedwait +/// IOX_LOG(Info, result.getHumanReadableErrnum()); // get string returned by strerror_r(errno, ...) /// }) /// .or_else([](auto & result){ -/// IOX_LOG(INFO, result.value); // return value of sem_timedwait -/// IOX_LOG(INFO, result.errno); // errno which was set by sem_timedwait -/// IOX_LOG(INFO, result.getHumanReadableErrnum()); // get string returned by strerror_r(errno, ...) +/// IOX_LOG(Info, result.value); // return value of sem_timedwait +/// IOX_LOG(Info, result.errno); // errno which was set by sem_timedwait +/// IOX_LOG(Info, result.getHumanReadableErrnum()); // get string returned by strerror_r(errno, ...) /// }) /// /// // when your posix call signals failure with one specific return value use diff --git a/iceoryx_hoofs/posix/design/source/file_management_interface.cpp b/iceoryx_hoofs/posix/design/source/file_management_interface.cpp index 50d6162052..01cf0ea8a4 100644 --- a/iceoryx_hoofs/posix/design/source/file_management_interface.cpp +++ b/iceoryx_hoofs/posix/design/source/file_management_interface.cpp @@ -33,18 +33,18 @@ expected get_file_status(const int fildes) noexcept switch (result.error().errnum) { case EBADF: - IOX_LOG(ERROR, "The provided file descriptor is invalid."); + IOX_LOG(Error, "The provided file descriptor is invalid."); return err(FileStatError::BadFileDescriptor); case EIO: - IOX_LOG(ERROR, "Unable to acquire file status since an io failure occurred while reading."); + IOX_LOG(Error, "Unable to acquire file status since an io failure occurred while reading."); return err(FileStatError::IoFailure); case EOVERFLOW: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to acquire file status since the file size cannot be represented by the " "corresponding structure."); return err(FileStatError::FileTooLarge); default: - IOX_LOG(ERROR, "Unable to acquire file status due to an unknown failure. errno: " << result.error().errnum); + IOX_LOG(Error, "Unable to acquire file status due to an unknown failure. errno: " << result.error().errnum); return err(FileStatError::UnknownError); } } @@ -61,27 +61,27 @@ expected set_owner(const int fildes, const iox_uid_t ui switch (result.error().errnum) { case EBADF: - IOX_LOG(ERROR, "The provided file descriptor is invalid."); + IOX_LOG(Error, "The provided file descriptor is invalid."); return err(FileSetOwnerError::BadFileDescriptor); case EPERM: - IOX_LOG(ERROR, "Unable to set owner due to insufficient permissions."); + IOX_LOG(Error, "Unable to set owner due to insufficient permissions."); return err(FileSetOwnerError::PermissionDenied); case EROFS: - IOX_LOG(ERROR, "Unable to set owner since it is a read-only filesystem."); + IOX_LOG(Error, "Unable to set owner since it is a read-only filesystem."); return err(FileSetOwnerError::ReadOnlyFilesystem); case EINVAL: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to set owner since the uid " << uid << " or the gid " << gid << " are not supported by the OS implementation."); return err(FileSetOwnerError::InvalidUidOrGid); case EIO: - IOX_LOG(ERROR, "Unable to set owner due to an IO error."); + IOX_LOG(Error, "Unable to set owner due to an IO error."); return err(FileSetOwnerError::IoFailure); case EINTR: - IOX_LOG(ERROR, "Unable to set owner since an interrupt was received."); + IOX_LOG(Error, "Unable to set owner since an interrupt was received."); return err(FileSetOwnerError::Interrupt); default: - IOX_LOG(ERROR, "Unable to set owner since an unknown error occurred. errno: " << result.error().errnum); + IOX_LOG(Error, "Unable to set owner since an unknown error occurred. errno: " << result.error().errnum); return err(FileSetOwnerError::UnknownError); } } @@ -98,16 +98,16 @@ expected set_permissions(const int fildes, const a switch (result.error().errnum) { case EBADF: - IOX_LOG(ERROR, "The provided file descriptor is invalid."); + IOX_LOG(Error, "The provided file descriptor is invalid."); return err(FileSetPermissionError::BadFileDescriptor); case EPERM: - IOX_LOG(ERROR, "Unable to adjust permissions due to insufficient permissions."); + IOX_LOG(Error, "Unable to adjust permissions due to insufficient permissions."); return err(FileSetPermissionError::PermissionDenied); case EROFS: - IOX_LOG(ERROR, "Unable to adjust permissions since it is a read-only filesystem."); + IOX_LOG(Error, "Unable to adjust permissions since it is a read-only filesystem."); return err(FileSetPermissionError::ReadOnlyFilesystem); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to adjust permissions since an unknown error occurred. errno: " << result.error().errnum); return err(FileSetPermissionError::UnknownError); } diff --git a/iceoryx_hoofs/posix/filesystem/source/file.cpp b/iceoryx_hoofs/posix/filesystem/source/file.cpp index 7d5821c60e..ed04014e4d 100644 --- a/iceoryx_hoofs/posix/filesystem/source/file.cpp +++ b/iceoryx_hoofs/posix/filesystem/source/file.cpp @@ -30,7 +30,7 @@ expected FileBuilder::create(const FilePath& name) noex { if (File::remove(name).has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to purge and open file \"" << name.as_string() << "\" since the file could not be removed"); return err(FileCreationError::CannotBePurged); } @@ -55,7 +55,7 @@ expected FileBuilder::open(const FilePath& name) noexce const auto perms = file.get_permissions(); if (perms.has_error()) { - IOX_LOG(ERROR, "Unable to acquire the permissions of '" << name.as_string() << "'."); + IOX_LOG(Error, "Unable to acquire the permissions of '" << name.as_string() << "'."); return err(FileCreationError::PermissionDenied); } @@ -63,7 +63,7 @@ expected FileBuilder::open(const FilePath& name) noexce { if ((perms->value() & perms::owner_read.value()) == 0) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' due to insufficient read permissions."); return err(FileCreationError::PermissionDenied); } @@ -73,7 +73,7 @@ expected FileBuilder::open(const FilePath& name) noexce { if ((perms->value() & perms::owner_write.value()) == 0) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' due to insufficient write permissions."); return err(FileCreationError::PermissionDenied); } @@ -85,48 +85,48 @@ expected FileBuilder::open(const FilePath& name) noexce switch (result.error().errnum) { case EACCES: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' due to insufficient permissions."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' due to insufficient permissions."); return err(FileCreationError::PermissionDenied); case EPERM: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' due to insufficient permissions."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' due to insufficient permissions."); return err(FileCreationError::PermissionDenied); case EINTR: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' since an interrupt signal was received."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since an interrupt signal was received."); return err(FileCreationError::Interrupt); case EISDIR: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' since it is actually a directory."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since it is actually a directory."); return err(FileCreationError::IsDirectory); case ELOOP: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since too many symbolic links were encountered."); return err(FileCreationError::TooManySymbolicLinksEncountered); case EMFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since the process limit of open file descriptors was reached."); return err(FileCreationError::ProcessLimitOfOpenFileDescriptorsReached); case ENFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since the system limit of open file descriptors was reached."); return err(FileCreationError::SystemLimitOfOpenFileDescriptorsReached); case ENOENT: - IOX_LOG(ERROR, "Unable to open '" << name.as_string() << "' since the file does not exist."); + IOX_LOG(Error, "Unable to open '" << name.as_string() << "' since the file does not exist."); return err(FileCreationError::DoesNotExist); case ENOMEM: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' due to insufficient memory."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' due to insufficient memory."); return err(FileCreationError::InsufficientMemory); case EOVERFLOW: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' since it is too large."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since it is too large."); return err(FileCreationError::FileTooLarge); case ETXTBSY: - IOX_LOG(ERROR, "Unable to open/create '" << name.as_string() << "' since it is currently in use."); + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since it is currently in use."); return err(FileCreationError::CurrentlyInUse); case EEXIST: - IOX_LOG(ERROR, "Unable to create '" << name.as_string() << "' since it already exists."); + IOX_LOG(Error, "Unable to create '" << name.as_string() << "' since it already exists."); return err(FileCreationError::AlreadyExists); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to open/create '" << name.as_string() << "' since an unknown error occurred (" << result.error().errnum << ")."); return err(FileCreationError::UnknownError); @@ -183,16 +183,16 @@ void File::close_fd() noexcept switch (result.error().errnum) { case EBADF: - IOX_LOG(FATAL, "This should never happen! Unable to close file since the file descriptor is invalid."); + IOX_LOG(Fatal, "This should never happen! Unable to close file since the file descriptor is invalid."); break; case EINTR: - IOX_LOG(FATAL, "This should never happen! Unable to close file since an interrupt signal was received."); + IOX_LOG(Fatal, "This should never happen! Unable to close file since an interrupt signal was received."); break; case EIO: - IOX_LOG(FATAL, "This should never happen! Unable to close file due to an IO failure."); + IOX_LOG(Fatal, "This should never happen! Unable to close file due to an IO failure."); break; default: - IOX_LOG(FATAL, + IOX_LOG(Fatal, "This should never happen! Unable to close file due to an unknown error (" << result.error().errnum << ")."); break; @@ -213,21 +213,21 @@ expected File::does_exist(const FilePath& file) noexcept switch (result.error().errnum) { case EACCES: - IOX_LOG(ERROR, "Unable to determine if '" << file.as_string() << "' exists due to insufficient permissions."); + IOX_LOG(Error, "Unable to determine if '" << file.as_string() << "' exists due to insufficient permissions."); return err(FileAccessError::InsufficientPermissions); case ENOENT: return ok(false); case ELOOP: - IOX_LOG(ERROR, "Unable to determine if '" << file.as_string() << "' exists due to too many symbolic links."); + IOX_LOG(Error, "Unable to determine if '" << file.as_string() << "' exists due to too many symbolic links."); return err(FileAccessError::TooManySymbolicLinksEncountered); case EIO: - IOX_LOG(ERROR, "Unable to determine if '" << file.as_string() << "' exists due to an IO failure."); + IOX_LOG(Error, "Unable to determine if '" << file.as_string() << "' exists due to an IO failure."); return err(FileAccessError::IoFailure); case ENOMEM: - IOX_LOG(ERROR, "Unable to determine if '" << file.as_string() << "' exists due insufficient kernel memory."); + IOX_LOG(Error, "Unable to determine if '" << file.as_string() << "' exists due insufficient kernel memory."); return err(FileAccessError::InsufficientKernelMemory); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to determine if '" << file.as_string() << "' exists since an unknown error occurred (" << result.error().errnum << ")."); return err(FileAccessError::UnknownError); @@ -253,28 +253,28 @@ expected File::remove(const FilePath& file) noexcept case EPERM: [[fallthrough]]; case EACCES: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' due to insufficient permissions."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' due to insufficient permissions."); return err(FileRemoveError::PermissionDenied); case EBUSY: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' since it is currently in use."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' since it is currently in use."); return err(FileRemoveError::CurrentlyInUse); case EIO: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' due to an IO failure."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' due to an IO failure."); return err(FileRemoveError::IoFailure); case ELOOP: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' due to too many symbolic links."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' due to too many symbolic links."); return err(FileRemoveError::TooManySymbolicLinksEncountered); case ENOMEM: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' due to insufficient kernel memory."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' due to insufficient kernel memory."); return err(FileRemoveError::InsufficientKernelMemory); case EISDIR: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' since it is a directory."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' since it is a directory."); return err(FileRemoveError::IsDirectory); case EROFS: - IOX_LOG(ERROR, "Unable to remove '" << file.as_string() << "' since it resides on a read-only file system."); + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' since it resides on a read-only file system."); return err(FileRemoveError::ReadOnlyFilesystem); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to remove '" << file.as_string() << "' since an unknown error occurred (" << result.error().errnum << ")."); return err(FileRemoveError::UnknownError); @@ -294,7 +294,7 @@ expected File::set_offset(const uint64_t offset) const no return ok(); } - IOX_LOG(ERROR, "Unable to set file offset position since it set to the wrong offset position."); + IOX_LOG(Error, "Unable to set file offset position since it set to the wrong offset position."); return err(FileOffsetError::OffsetAtWrongPosition); } @@ -304,16 +304,16 @@ expected File::set_offset(const uint64_t offset) const no case EINVAL: [[fallthrough]]; case ENXIO: - IOX_LOG(ERROR, "Unable to set file offset position since it is beyond the file limits."); + IOX_LOG(Error, "Unable to set file offset position since it is beyond the file limits."); return err(FileOffsetError::OffsetBeyondFileLimits); case EOVERFLOW: - IOX_LOG(ERROR, "Unable to set file offset position since the file is too large and the offset would overflow."); + IOX_LOG(Error, "Unable to set file offset position since the file is too large and the offset would overflow."); return err(FileOffsetError::FileOffsetOverflow); case ESPIPE: - IOX_LOG(ERROR, "Unable to set file offset position since seeking is not supported by the file type."); + IOX_LOG(Error, "Unable to set file offset position since seeking is not supported by the file type."); return err(FileOffsetError::SeekingNotSupportedByFileType); default: - IOX_LOG(ERROR, "Unable to remove file since an unknown error occurred (" << result.error().errnum << ")."); + IOX_LOG(Error, "Unable to remove file since an unknown error occurred (" << result.error().errnum << ")."); return err(FileOffsetError::UnknownError); } } @@ -330,13 +330,13 @@ File::read_at(const uint64_t offset, uint8_t* const buffer, const uint64_t buffe { if (m_access_mode == AccessMode::WRITE_ONLY) { - IOX_LOG(ERROR, "Unable to read from file since it is opened for writing only."); + IOX_LOG(Error, "Unable to read from file since it is opened for writing only."); return err(FileReadError::NotOpenedForReading); } if (set_offset(offset).has_error()) { - IOX_LOG(ERROR, "Unable to read from file since the offset could not be set."); + IOX_LOG(Error, "Unable to read from file since the offset could not be set."); return err(FileReadError::OffsetFailure); } @@ -352,22 +352,22 @@ File::read_at(const uint64_t offset, uint8_t* const buffer, const uint64_t buffe switch (result.error().errnum) { case EAGAIN: - IOX_LOG(ERROR, "Unable to read from file since the operation would block."); + IOX_LOG(Error, "Unable to read from file since the operation would block."); return err(FileReadError::OperationWouldBlock); case EINTR: - IOX_LOG(ERROR, "Unable to read from file since an interrupt signal was received."); + IOX_LOG(Error, "Unable to read from file since an interrupt signal was received."); return err(FileReadError::Interrupt); case EINVAL: - IOX_LOG(ERROR, "Unable to read from file since it is unsuitable for reading."); + IOX_LOG(Error, "Unable to read from file since it is unsuitable for reading."); return err(FileReadError::FileUnsuitableForReading); case EIO: - IOX_LOG(ERROR, "Unable to read from file since an IO failure occurred."); + IOX_LOG(Error, "Unable to read from file since an IO failure occurred."); return err(FileReadError::IoFailure); case EISDIR: - IOX_LOG(ERROR, "Unable to read from file since it is a directory."); + IOX_LOG(Error, "Unable to read from file since it is a directory."); return err(FileReadError::IsDirectory); default: - IOX_LOG(ERROR, "Unable to read from file since an unknown error occurred (" << result.error().errnum << ")."); + IOX_LOG(Error, "Unable to read from file since an unknown error occurred (" << result.error().errnum << ")."); return err(FileReadError::UnknownError); } } @@ -386,13 +386,13 @@ File::write_at(const uint64_t offset, const uint8_t* const buffer, const uint64_ { if (m_access_mode == AccessMode::READ_ONLY) { - IOX_LOG(ERROR, "Unable to write to file since it is opened for reading only."); + IOX_LOG(Error, "Unable to write to file since it is opened for reading only."); return err(FileWriteError::NotOpenedForWriting); } if (set_offset(offset).has_error()) { - IOX_LOG(ERROR, "Unable to write to file since the offset could not be set."); + IOX_LOG(Error, "Unable to write to file since the offset could not be set."); return err(FileWriteError::OffsetFailure); } @@ -408,31 +408,31 @@ File::write_at(const uint64_t offset, const uint8_t* const buffer, const uint64_ switch (result.error().errnum) { case EAGAIN: - IOX_LOG(ERROR, "Unable to write to file since the operation would block."); + IOX_LOG(Error, "Unable to write to file since the operation would block."); return err(FileWriteError::OperationWouldBlock); case EDQUOT: - IOX_LOG(ERROR, "Unable to write to file since the users disk quota has been exhausted."); + IOX_LOG(Error, "Unable to write to file since the users disk quota has been exhausted."); return err(FileWriteError::DiskQuotaExhausted); case EFBIG: - IOX_LOG(ERROR, "Unable to write to file since file size exceeds the maximum supported size."); + IOX_LOG(Error, "Unable to write to file since file size exceeds the maximum supported size."); return err(FileWriteError::FileSizeExceedsMaximumSupportedSize); case EINTR: - IOX_LOG(ERROR, "Unable to write to file since an interrupt signal occurred."); + IOX_LOG(Error, "Unable to write to file since an interrupt signal occurred."); return err(FileWriteError::Interrupt); case EINVAL: - IOX_LOG(ERROR, "Unable to write to file since the file is unsuitable for writing."); + IOX_LOG(Error, "Unable to write to file since the file is unsuitable for writing."); return err(FileWriteError::FileUnsuitableForWriting); case ENOSPC: - IOX_LOG(ERROR, "Unable to write to file since there is no space left on target."); + IOX_LOG(Error, "Unable to write to file since there is no space left on target."); return err(FileWriteError::NoSpaceLeftOnDevice); case EPERM: - IOX_LOG(ERROR, "Unable to write to file since the operation was prevented by a file seal."); + IOX_LOG(Error, "Unable to write to file since the operation was prevented by a file seal."); return err(FileWriteError::PreventedByFileSeal); case EIO: - IOX_LOG(ERROR, "Unable to write to file since an IO failure occurred."); + IOX_LOG(Error, "Unable to write to file since an IO failure occurred."); return err(FileWriteError::IoFailure); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to write to file since an unknown error has occurred (" << result.error().errnum << ")."); return err(FileWriteError::UnknownError); } diff --git a/iceoryx_hoofs/posix/filesystem/source/file_lock.cpp b/iceoryx_hoofs/posix/filesystem/source/file_lock.cpp index 222af401b2..81518f7bca 100644 --- a/iceoryx_hoofs/posix/filesystem/source/file_lock.cpp +++ b/iceoryx_hoofs/posix/filesystem/source/file_lock.cpp @@ -35,13 +35,13 @@ expected FileLockBuilder::create() noexcept { if (!isValidFileName(m_name)) { - IOX_LOG(ERROR, "Unable to create FileLock since the name \"" << m_name << "\" is not a valid file name."); + IOX_LOG(Error, "Unable to create FileLock since the name \"" << m_name << "\" is not a valid file name."); return err(FileLockError::INVALID_FILE_NAME); } if (!isValidPathToDirectory(m_path)) { - IOX_LOG(ERROR, "Unable to create FileLock since the path \"" << m_path << "\" is not a valid path."); + IOX_LOG(Error, "Unable to create FileLock since the path \"" << m_path << "\" is not a valid path."); return err(FileLockError::INVALID_PATH); } @@ -77,7 +77,7 @@ expected FileLockBuilder::create() noexcept IOX_POSIX_CALL(iox_ext_close) (fileDescriptor).failureReturnValue(-1).evaluate().or_else([&](auto& result) { IOX_DISCARD_RESULT(FileLock::convertErrnoToFileLockError(result.errnum, fileLockPath)); - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to close file lock \"" << fileLockPath << "\" in error related cleanup during initialization."); }); @@ -106,7 +106,7 @@ FileLock& FileLock::operator=(FileLock&& rhs) noexcept { if (closeFileDescriptor().has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to cleanup file lock \"" << m_fileLockPath << "\" in the move constructor/move assingment operator"); } @@ -124,7 +124,7 @@ FileLock::~FileLock() noexcept { if (closeFileDescriptor().has_error()) { - IOX_LOG(ERROR, "unable to cleanup file lock \"" << m_fileLockPath << "\" in the destructor"); + IOX_LOG(Error, "unable to cleanup file lock \"" << m_fileLockPath << "\" in the destructor"); } } @@ -141,21 +141,21 @@ expected FileLock::closeFileDescriptor() noexcept .or_else([&](auto& result) { cleanupFailed = true; IOX_DISCARD_RESULT(FileLock::convertErrnoToFileLockError(result.errnum, m_fileLockPath)); - IOX_LOG(ERROR, "Unable to unlock the file lock \"" << m_fileLockPath << '"'); + IOX_LOG(Error, "Unable to unlock the file lock \"" << m_fileLockPath << '"'); }); IOX_POSIX_CALL(iox_ext_close) (m_fd).failureReturnValue(-1).evaluate().or_else([&](auto& result) { cleanupFailed = true; IOX_DISCARD_RESULT(FileLock::convertErrnoToFileLockError(result.errnum, m_fileLockPath)); - IOX_LOG(ERROR, "Unable to close the file handle to the file lock \"" << m_fileLockPath << '"'); + IOX_LOG(Error, "Unable to close the file handle to the file lock \"" << m_fileLockPath << '"'); }); IOX_POSIX_CALL(remove) (m_fileLockPath.c_str()).failureReturnValue(-1).evaluate().or_else([&](auto& result) { cleanupFailed = true; IOX_DISCARD_RESULT(FileLock::convertErrnoToFileLockError(result.errnum, m_fileLockPath)); - IOX_LOG(ERROR, "Unable to remove the file lock \"" << m_fileLockPath << '"'); + IOX_LOG(Error, "Unable to remove the file lock \"" << m_fileLockPath << '"'); }); if (cleanupFailed) @@ -181,83 +181,83 @@ FileLockError FileLock::convertErrnoToFileLockError(const int32_t errnum, const { case EACCES: { - IOX_LOG(ERROR, "permission denied for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "permission denied for file lock \"" << fileLockPath << '"'); return FileLockError::ACCESS_DENIED; } case EDQUOT: { - IOX_LOG(ERROR, "user disk quota exhausted for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "user disk quota exhausted for file lock \"" << fileLockPath << '"'); return FileLockError::QUOTA_EXHAUSTED; } case EFAULT: { - IOX_LOG(ERROR, "outside address space error for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "outside address space error for file lock \"" << fileLockPath << '"'); return FileLockError::ACCESS_DENIED; } case EFBIG: case EOVERFLOW: { - IOX_LOG(ERROR, "file lock \"" << fileLockPath << '"' << " is too large to be openend"); + IOX_LOG(Error, "file lock \"" << fileLockPath << '"' << " is too large to be openend"); return FileLockError::FILE_TOO_LARGE; } case ELOOP: { - IOX_LOG(ERROR, "too many symbolic links for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "too many symbolic links for file lock \"" << fileLockPath << '"'); return FileLockError::INVALID_FILE_NAME; } case EMFILE: { - IOX_LOG(ERROR, "process limit reached for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "process limit reached for file lock \"" << fileLockPath << '"'); return FileLockError::PROCESS_LIMIT; } case ENFILE: { - IOX_LOG(ERROR, "system limit reached for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "system limit reached for file lock \"" << fileLockPath << '"'); return FileLockError::SYSTEM_LIMIT; } case ENODEV: { - IOX_LOG(ERROR, "permission to access file lock denied \"" << fileLockPath << '"'); + IOX_LOG(Error, "permission to access file lock denied \"" << fileLockPath << '"'); return FileLockError::ACCESS_DENIED; } case ENOENT: { - IOX_LOG(ERROR, "directory \"" << &platform::IOX_LOCK_FILE_PATH_PREFIX[0] << '"' << " does not exist."); + IOX_LOG(Error, "directory \"" << &platform::IOX_LOCK_FILE_PATH_PREFIX[0] << '"' << " does not exist."); return FileLockError::NO_SUCH_DIRECTORY; } case ENOMEM: { - IOX_LOG(ERROR, "out of memory for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "out of memory for file lock \"" << fileLockPath << '"'); return FileLockError::OUT_OF_MEMORY; } case ENOSPC: { - IOX_LOG(ERROR, "Device has no space for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "Device has no space for file lock \"" << fileLockPath << '"'); return FileLockError::QUOTA_EXHAUSTED; } case ENOSYS: { - IOX_LOG(ERROR, "open() not implemented for filesystem to \"" << fileLockPath << '"'); + IOX_LOG(Error, "open() not implemented for filesystem to \"" << fileLockPath << '"'); return FileLockError::SYS_CALL_NOT_IMPLEMENTED; } case ENXIO: { - IOX_LOG(ERROR, '"' << fileLockPath << '"' << " is a special file and no corresponding device exists"); + IOX_LOG(Error, '"' << fileLockPath << '"' << " is a special file and no corresponding device exists"); return FileLockError::SPECIAL_FILE; } case EPERM: { - IOX_LOG(ERROR, "permission denied to file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "permission denied to file lock \"" << fileLockPath << '"'); return FileLockError::ACCESS_DENIED; } case EROFS: { - IOX_LOG(ERROR, "read only error for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "read only error for file lock \"" << fileLockPath << '"'); return FileLockError::INVALID_FILE_NAME; } case ETXTBSY: { - IOX_LOG(ERROR, "write access requested for file lock \"" << fileLockPath << '"' << " in use"); + IOX_LOG(Error, "write access requested for file lock \"" << fileLockPath << '"' << " in use"); return FileLockError::FILE_IN_USE; } case EWOULDBLOCK: @@ -267,17 +267,17 @@ FileLockError FileLock::convertErrnoToFileLockError(const int32_t errnum, const } case ENOLCK: { - IOX_LOG(ERROR, "system limit for locks reached for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "system limit for locks reached for file lock \"" << fileLockPath << '"'); return FileLockError::SYSTEM_LIMIT; } case EIO: { - IOX_LOG(ERROR, "I/O for file lock \"" << fileLockPath << '"'); + IOX_LOG(Error, "I/O for file lock \"" << fileLockPath << '"'); return FileLockError::I_O_ERROR; } default: { - IOX_LOG(ERROR, "internal logic error in file lock \"" << fileLockPath << "\" occurred"); + IOX_LOG(Error, "internal logic error in file lock \"" << fileLockPath << "\" occurred"); return FileLockError::INTERNAL_LOGIC_ERROR; } } diff --git a/iceoryx_hoofs/posix/filesystem/source/posix_acl.cpp b/iceoryx_hoofs/posix/filesystem/source/posix_acl.cpp index 69cdb58f55..a903c6c57d 100644 --- a/iceoryx_hoofs/posix/filesystem/source/posix_acl.cpp +++ b/iceoryx_hoofs/posix/filesystem/source/posix_acl.cpp @@ -34,7 +34,7 @@ bool PosixAcl::writePermissionsToFile(const int32_t fileDescriptor) const noexce { if (m_permissions.empty()) { - IOX_LOG(ERROR, "Error: No ACL entries defined."); + IOX_LOG(Error, "Error: No ACL entries defined."); return false; } @@ -42,7 +42,7 @@ bool PosixAcl::writePermissionsToFile(const int32_t fileDescriptor) const noexce if (maybeWorkingACL.has_error()) { - IOX_LOG(ERROR, "Error: Creating ACL failed."); + IOX_LOG(Error, "Error: Creating ACL failed."); return false; } @@ -68,7 +68,7 @@ bool PosixAcl::writePermissionsToFile(const int32_t fileDescriptor) const noexce if (aclCheckCall.has_error()) { - IOX_LOG(ERROR, "Error: Invalid ACL, cannot write to file."); + IOX_LOG(Error, "Error: Invalid ACL, cannot write to file."); return false; } @@ -77,7 +77,7 @@ bool PosixAcl::writePermissionsToFile(const int32_t fileDescriptor) const noexce IOX_POSIX_CALL(iox_acl_set_fd)(fileDescriptor, workingACL.get()).successReturnValue(0).evaluate(); if (aclSetFdCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not set file ACL."); + IOX_LOG(Error, "Error: Could not set file ACL."); return false; } @@ -108,7 +108,7 @@ bool PosixAcl::addUserPermission(const Permission permission, const PosixUser::u { if (name.empty()) { - IOX_LOG(ERROR, "Error: specific users must have an explicit name."); + IOX_LOG(Error, "Error: specific users must have an explicit name."); return false; } @@ -125,7 +125,7 @@ bool PosixAcl::addGroupPermission(const Permission permission, const PosixGroup: { if (name.empty()) { - IOX_LOG(ERROR, "Error: specific groups must have an explicit name."); + IOX_LOG(Error, "Error: specific groups must have an explicit name."); return false; } @@ -142,7 +142,7 @@ bool PosixAcl::addPermissionEntry(const Category category, const Permission perm { if (m_permissions.size() >= m_permissions.capacity()) { - IOX_LOG(ERROR, "Error: Number of allowed permission entries exceeded."); + IOX_LOG(Error, "Error: Number of allowed permission entries exceeded."); return false; } @@ -152,7 +152,7 @@ bool PosixAcl::addPermissionEntry(const Category category, const Permission perm { if (!PosixUser::getUserName(id).has_value()) { - IOX_LOG(ERROR, "Error: No such user"); + IOX_LOG(Error, "Error: No such user"); return false; } @@ -163,7 +163,7 @@ bool PosixAcl::addPermissionEntry(const Category category, const Permission perm { if (!PosixGroup::getGroupName(id).has_value()) { - IOX_LOG(ERROR, "Error: No such group"); + IOX_LOG(Error, "Error: No such group"); return false; } @@ -191,7 +191,7 @@ bool PosixAcl::createACLEntry(const acl_t ACL, const PermissionEntry& entry) noe if (aclCreateEntryCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not create new ACL entry."); + IOX_LOG(Error, "Error: Could not create new ACL entry."); return false; } @@ -201,7 +201,7 @@ bool PosixAcl::createACLEntry(const acl_t ACL, const PermissionEntry& entry) noe if (aclSetTagTypeCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not add tag type to ACL entry."); + IOX_LOG(Error, "Error: Could not add tag type to ACL entry."); return false; } @@ -215,7 +215,7 @@ bool PosixAcl::createACLEntry(const acl_t ACL, const PermissionEntry& entry) noe if (aclSetQualifierCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not set ACL qualifier of user " << entry.m_id); + IOX_LOG(Error, "Error: Could not set ACL qualifier of user " << entry.m_id); return false; } @@ -228,7 +228,7 @@ bool PosixAcl::createACLEntry(const acl_t ACL, const PermissionEntry& entry) noe if (aclSetQualifierCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not set ACL qualifier of group " << entry.m_id); + IOX_LOG(Error, "Error: Could not set ACL qualifier of group " << entry.m_id); return false; } break; @@ -246,7 +246,7 @@ bool PosixAcl::createACLEntry(const acl_t ACL, const PermissionEntry& entry) noe if (aclGetPermsetCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not obtain ACL permission set of new ACL entry."); + IOX_LOG(Error, "Error: Could not obtain ACL permission set of new ACL entry."); return false; } @@ -285,7 +285,7 @@ bool PosixAcl::addAclPermission(acl_permset_t permset, acl_perm_t perm) noexcept if (aclAddPermCall.has_error()) { - IOX_LOG(ERROR, "Error: Could not add permission to ACL permission set."); + IOX_LOG(Error, "Error: Could not add permission to ACL permission set."); return false; } return true; diff --git a/iceoryx_hoofs/posix/ipc/include/iox/detail/message_queue.inl b/iceoryx_hoofs/posix/ipc/include/iox/detail/message_queue.inl index 2a7818452c..506a0793ab 100644 --- a/iceoryx_hoofs/posix/ipc/include/iox/detail/message_queue.inl +++ b/iceoryx_hoofs/posix/ipc/include/iox/detail/message_queue.inl @@ -35,7 +35,7 @@ MessageQueue::timedSendImpl(not_null msg, uint64_t msgSize, const u if (msgSizeToSend > static_cast(m_attributes.mq_msgsize)) { - IOX_LOG(ERROR, "the message which should be sent to the message queue '" << m_name << "' is too long"); + IOX_LOG(Error, "the message which should be sent to the message queue '" << m_name << "' is too long"); return err(PosixIpcChannelError::MESSAGE_TOO_LONG); } @@ -70,7 +70,7 @@ expected MessageQueue::sendImpl(not_null static_cast(m_attributes.mq_msgsize)) { - IOX_LOG(ERROR, "the message which should be sent to the message queue '" << m_name << "' is too long"); + IOX_LOG(Error, "the message which should be sent to the message queue '" << m_name << "' is too long"); return err(PosixIpcChannelError::MESSAGE_TOO_LONG); } diff --git a/iceoryx_hoofs/posix/ipc/include/iox/detail/unix_domain_socket.inl b/iceoryx_hoofs/posix/ipc/include/iox/detail/unix_domain_socket.inl index eed222f3d9..904fa2226e 100644 --- a/iceoryx_hoofs/posix/ipc/include/iox/detail/unix_domain_socket.inl +++ b/iceoryx_hoofs/posix/ipc/include/iox/detail/unix_domain_socket.inl @@ -34,7 +34,7 @@ expected UnixDomainSocket::timedSendImpl(not_null UnixDomainSocket::timedReceiveImpl( { if (PosixIpcChannelSide::CLIENT == m_channelSide) { - IOX_LOG(ERROR, "receiving on client side not supported for unix domain socket \"" << m_name << "\""); + IOX_LOG(Error, "receiving on client side not supported for unix domain socket \"" << m_name << "\""); return err(PosixIpcChannelError::INTERNAL_LOGIC_ERROR); } diff --git a/iceoryx_hoofs/posix/ipc/source/message_queue.cpp b/iceoryx_hoofs/posix/ipc/source/message_queue.cpp index 8cfc09f456..9f218fb484 100644 --- a/iceoryx_hoofs/posix/ipc/source/message_queue.cpp +++ b/iceoryx_hoofs/posix/ipc/source/message_queue.cpp @@ -53,7 +53,7 @@ expected MessageQueueBuilder::create() const .and_then([&sanitizedName](auto& r) { if (r.errnum != ENOENT) { - IOX_LOG(DEBUG, "MQ still there, doing an unlink of '" << sanitizedName << "'"); + IOX_LOG(Debug, "MQ still there, doing an unlink of '" << sanitizedName << "'"); } }); } @@ -99,7 +99,7 @@ MessageQueue::~MessageQueue() noexcept { if (destroy().has_error()) { - IOX_LOG(ERROR, "unable to cleanup message queue '" << m_name << "' in the destructor"); + IOX_LOG(Error, "unable to cleanup message queue '" << m_name << "' in the destructor"); } } @@ -109,7 +109,7 @@ MessageQueue& MessageQueue::operator=(MessageQueue&& other) noexcept { if (destroy().has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "unable to cleanup message queue '" << m_name << "' during move operation - resource leaks are possible!"); } @@ -300,12 +300,12 @@ PosixIpcChannelError MessageQueue::errnoToEnum(const PosixIpcChannelName_t& name { case EACCES: { - IOX_LOG(ERROR, "access denied to message queue '" << name << "'"); + IOX_LOG(Error, "access denied to message queue '" << name << "'"); return PosixIpcChannelError::ACCESS_DENIED; } case EAGAIN: { - IOX_LOG(ERROR, "the message queue '" << name << "' is full"); + IOX_LOG(Error, "the message queue '" << name << "' is full"); return PosixIpcChannelError::CHANNEL_FULL; } case ETIMEDOUT: @@ -315,12 +315,12 @@ PosixIpcChannelError MessageQueue::errnoToEnum(const PosixIpcChannelName_t& name } case EEXIST: { - IOX_LOG(ERROR, "message queue '" << name << "' already exists"); + IOX_LOG(Error, "message queue '" << name << "' already exists"); return PosixIpcChannelError::CHANNEL_ALREADY_EXISTS; } case EINVAL: { - IOX_LOG(ERROR, "provided invalid arguments for message queue '" << name << "'"); + IOX_LOG(Error, "provided invalid arguments for message queue '" << name << "'"); return PosixIpcChannelError::INVALID_ARGUMENTS; } case ENOENT: @@ -330,12 +330,12 @@ PosixIpcChannelError MessageQueue::errnoToEnum(const PosixIpcChannelName_t& name } case ENAMETOOLONG: { - IOX_LOG(ERROR, "message queue name '" << name << "' is too long"); + IOX_LOG(Error, "message queue name '" << name << "' is too long"); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } default: { - IOX_LOG(ERROR, "internal logic error in message queue '" << name << "' occurred"); + IOX_LOG(Error, "internal logic error in message queue '" << name << "' occurred"); return PosixIpcChannelError::INTERNAL_LOGIC_ERROR; } } diff --git a/iceoryx_hoofs/posix/ipc/source/named_pipe.cpp b/iceoryx_hoofs/posix/ipc/source/named_pipe.cpp index 84f6e36bab..688bf777c6 100644 --- a/iceoryx_hoofs/posix/ipc/source/named_pipe.cpp +++ b/iceoryx_hoofs/posix/ipc/source/named_pipe.cpp @@ -40,7 +40,7 @@ expected NamedPipeBuilder::create() const noexc { if (m_name.size() + strlen(&NamedPipe::NAMED_PIPE_PREFIX[0]) > NamedPipe::MAX_MESSAGE_SIZE) { - IOX_LOG(ERROR, + IOX_LOG(Error, "The named pipe name: '" << m_name << "' is too long. Maxium name length is: " << NamedPipe::MAX_MESSAGE_SIZE - strlen(&NamedPipe::NAMED_PIPE_PREFIX[0])); return err(PosixIpcChannelError::INVALID_CHANNEL_NAME); @@ -53,13 +53,13 @@ expected NamedPipeBuilder::create() const noexc || (!m_name.empty() && m_name.c_str()[0] == '/' && isValidFileName(*m_name.substr(1))); if (!isValidPipeName) { - IOX_LOG(ERROR, "The named pipe name: '" << m_name << "' is not a valid file path name."); + IOX_LOG(Error, "The named pipe name: '" << m_name << "' is not a valid file path name."); return err(PosixIpcChannelError::INVALID_CHANNEL_NAME); } if (m_maxMsgSize > NamedPipe::MAX_MESSAGE_SIZE) { - IOX_LOG(ERROR, + IOX_LOG(Error, "A message size of " << m_maxMsgSize << " exceeds the maximum message size for named pipes of " << NamedPipe::MAX_MESSAGE_SIZE); return err(PosixIpcChannelError::MAX_MESSAGE_SIZE_EXCEEDED); @@ -67,7 +67,7 @@ expected NamedPipeBuilder::create() const noexc if (m_maxMsgNumber > NamedPipe::MAX_NUMBER_OF_MESSAGES) { - IOX_LOG(ERROR, + IOX_LOG(Error, "A message amount of " << m_maxMsgNumber << " exceeds the maximum number of messages for named pipes of " << NamedPipe::MAX_NUMBER_OF_MESSAGES); @@ -87,7 +87,7 @@ expected NamedPipeBuilder::create() const noexc if (sharedMemoryResult.has_error()) { - IOX_LOG(ERROR, "Unable to open shared memory: '" << namedPipeShmName << "' for named pipe '" << m_name << "'"); + IOX_LOG(Error, "Unable to open shared memory: '" << namedPipeShmName << "' for named pipe '" << m_name << "'"); return err((m_channelSide == PosixIpcChannelSide::CLIENT) ? PosixIpcChannelError::NO_SUCH_CHANNEL : PosixIpcChannelError::INTERNAL_LOGIC_ERROR); } @@ -99,7 +99,7 @@ expected NamedPipeBuilder::create() const noexc auto allocationResult = allocator.allocate(sizeof(NamedPipe::NamedPipeData), alignof(NamedPipe::NamedPipeData)); if (allocationResult.has_error()) { - IOX_LOG(ERROR, "Unable to allocate memory for named pipe '" << m_name << "'"); + IOX_LOG(Error, "Unable to allocate memory for named pipe '" << m_name << "'"); return err(PosixIpcChannelError::MEMORY_ALLOCATION_FAILED); } auto* data = static_cast(allocationResult.value()); @@ -263,7 +263,7 @@ expected NamedPipe::timedReceive(const units: expected NamedPipe::NamedPipeData::initialize(const uint32_t maxMsgNumber) noexcept { auto signalError = [&](const char* name) { - IOX_LOG(ERROR, "Unable to create '" << name << "' semaphore for named pipe"); + IOX_LOG(Error, "Unable to create '" << name << "' semaphore for named pipe"); }; if (UnnamedSemaphoreBuilder() diff --git a/iceoryx_hoofs/posix/ipc/source/posix_memory_map.cpp b/iceoryx_hoofs/posix/ipc/source/posix_memory_map.cpp index 27c6500848..b2f8aefd9a 100644 --- a/iceoryx_hoofs/posix/ipc/source/posix_memory_map.cpp +++ b/iceoryx_hoofs/posix/ipc/source/posix_memory_map.cpp @@ -49,7 +49,7 @@ expected PosixMemoryMapBuilder::create() no } constexpr uint64_t FLAGS_BIT_SIZE = 32U; - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to map memory with the following properties [ baseAddressHint = " << iox::log::hex(m_baseAddressHint) << ", length = " << m_length << ", fileDescriptor = " << m_fileDescriptor << ", access mode = " << asStringLiteral(m_accessMode) @@ -72,7 +72,7 @@ PosixMemoryMapError PosixMemoryMap::errnoToEnum(const int32_t errnum) noexcept switch (errnum) { case EACCES: - IOX_LOG(ERROR, + IOX_LOG(Error, "One or more of the following failures happened:\n" << " 1. The file descriptor belongs to a non-regular file.\n" << " 2. The file descriptor is not opened for reading.\n" @@ -81,30 +81,30 @@ PosixMemoryMapError PosixMemoryMap::errnoToEnum(const int32_t errnum) noexcept << " 4. PROT_WRITE is set but the file descriptor is set to append-only."); return PosixMemoryMapError::ACCESS_FAILED; case EAGAIN: - IOX_LOG(ERROR, "Either too much memory has been locked or the file is already locked."); + IOX_LOG(Error, "Either too much memory has been locked or the file is already locked."); return PosixMemoryMapError::UNABLE_TO_LOCK; case EBADF: - IOX_LOG(ERROR, "Invalid file descriptor provided."); + IOX_LOG(Error, "Invalid file descriptor provided."); return PosixMemoryMapError::INVALID_FILE_DESCRIPTOR; case EEXIST: - IOX_LOG(ERROR, "The mapped range that is requested is overlapping with an already mapped memory range."); + IOX_LOG(Error, "The mapped range that is requested is overlapping with an already mapped memory range."); return PosixMemoryMapError::MAP_OVERLAP; case EINVAL: - IOX_LOG(ERROR, + IOX_LOG(Error, "One or more of the following failures happened:\n" << " 1. The address, length or the offset is not aligned on a page boundary.\n" << " 2. The provided length is 0.\n" << " 3. One of the flags of MAP_PRIVATE, MAP_SHARED or MAP_SHARED_VALIDATE is missing."); return PosixMemoryMapError::INVALID_PARAMETERS; case ENFILE: - IOX_LOG(ERROR, "System limit of maximum open files reached"); + IOX_LOG(Error, "System limit of maximum open files reached"); return PosixMemoryMapError::OPEN_FILES_SYSTEM_LIMIT_EXCEEDED; case ENODEV: - IOX_LOG(ERROR, "Memory mappings are not supported by the underlying filesystem."); + IOX_LOG(Error, "Memory mappings are not supported by the underlying filesystem."); return PosixMemoryMapError::FILESYSTEM_DOES_NOT_SUPPORT_MEMORY_MAPPING; case ENOMEM: IOX_LOG( - ERROR, + Error, "One or more of the following failures happened:\n" << " 1. Not enough memory available.\n" << " 2. The maximum supported number of mappings is exceeded.\n" @@ -114,19 +114,19 @@ PosixMemoryMapError PosixMemoryMap::errnoToEnum(const int32_t errnum) noexcept "and unsigned long. (only 32-bit architecture)"); return PosixMemoryMapError::NOT_ENOUGH_MEMORY_AVAILABLE; case EOVERFLOW: - IOX_LOG(ERROR, "The sum of the number of pages and offset are overflowing. (only 32-bit architecture)"); + IOX_LOG(Error, "The sum of the number of pages and offset are overflowing. (only 32-bit architecture)"); return PosixMemoryMapError::OVERFLOWING_PARAMETERS; case EPERM: - IOX_LOG(ERROR, + IOX_LOG(Error, "One or more of the following failures happened:\n" << " 1. Mapping a memory region with PROT_EXEC which belongs to a filesystem that has no-exec.\n" << " 2. The corresponding file is sealed."); return PosixMemoryMapError::PERMISSION_FAILURE; case ETXTBSY: - IOX_LOG(ERROR, "The memory region was set up with MAP_DENYWRITE but write access was requested."); + IOX_LOG(Error, "The memory region was set up with MAP_DENYWRITE but write access was requested."); return PosixMemoryMapError::NO_WRITE_PERMISSION; default: - IOX_LOG(ERROR, "This should never happened. An unknown error occurred!\n"); + IOX_LOG(Error, "This should never happened. An unknown error occurred!\n"); return PosixMemoryMapError::UNKNOWN_ERROR; }; } @@ -142,7 +142,7 @@ PosixMemoryMap& PosixMemoryMap::operator=(PosixMemoryMap&& rhs) noexcept { if (!destroy()) { - IOX_LOG(ERROR, "move assignment failed to unmap mapped memory"); + IOX_LOG(Error, "move assignment failed to unmap mapped memory"); } m_baseAddress = rhs.m_baseAddress; @@ -158,7 +158,7 @@ PosixMemoryMap::~PosixMemoryMap() noexcept { if (!destroy()) { - IOX_LOG(ERROR, "destructor failed to unmap mapped memory"); + IOX_LOG(Error, "destructor failed to unmap mapped memory"); } } @@ -184,7 +184,7 @@ bool PosixMemoryMap::destroy() noexcept if (unmapResult.has_error()) { errnoToEnum(unmapResult.error().errnum); - IOX_LOG(ERROR, + IOX_LOG(Error, "unable to unmap mapped memory [ address = " << iox::log::hex(m_baseAddress) << ", size = " << m_length << " ]"); return false; diff --git a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp index 84a25e3c6d..71f5f84547 100644 --- a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp +++ b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory.cpp @@ -44,7 +44,7 @@ string addLeadingSlash(const PosixSha expected PosixSharedMemoryBuilder::create() noexcept { auto printError = [this] { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to create shared memory with the following properties [ name = " << m_name << ", access mode = " << asStringLiteral(m_accessMode) << ", open mode = " << asStringLiteral(m_openMode) @@ -55,13 +55,13 @@ expected PosixSharedMemoryBuilder::cr // on qnx the current working directory will be added to the /dev/shmem path if the leading slash is missing if (m_name.empty()) { - IOX_LOG(ERROR, "No shared memory name specified!"); + IOX_LOG(Error, "No shared memory name specified!"); return err(PosixSharedMemoryError::EMPTY_NAME); } if (!isValidFileName(m_name)) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Shared memory requires a valid file name (not path) as name and \"" << m_name << "\" is not a valid file name"); return err(PosixSharedMemoryError::INVALID_FILE_NAME); @@ -74,7 +74,7 @@ expected PosixSharedMemoryBuilder::cr if (hasOwnership && (m_accessMode == AccessMode::READ_ONLY)) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Cannot create shared-memory file \"" << m_name << "\" in read-only mode. " << "Initializing a new file requires write access"); return err(PosixSharedMemoryError::INCOMPATIBLE_OPEN_AND_ACCESS_MODE); @@ -141,7 +141,7 @@ expected PosixSharedMemoryBuilder::cr .failureReturnValue(PosixSharedMemory::INVALID_HANDLE) .evaluate() .or_else([&](auto& r) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to close filedescriptor (close failed) : " << r.getHumanReadableErrnum() << " for SharedMemory \"" << m_name << "\""); }); @@ -151,7 +151,7 @@ expected PosixSharedMemoryBuilder::cr .failureReturnValue(PosixSharedMemory::INVALID_HANDLE) .evaluate() .or_else([&](auto&) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to remove previously created SharedMemory \"" << m_name << "\". This may be a SharedMemory leak."); }); @@ -247,7 +247,7 @@ bool PosixSharedMemory::unlink() noexcept auto unlinkResult = unlinkIfExist(m_name); if (unlinkResult.has_error() || !unlinkResult.value()) { - IOX_LOG(ERROR, "Unable to unlink SharedMemory (shm_unlink failed)."); + IOX_LOG(Error, "Unable to unlink SharedMemory (shm_unlink failed)."); return false; } m_hasOwnership = false; @@ -263,7 +263,7 @@ bool PosixSharedMemory::close() noexcept { auto call = IOX_POSIX_CALL(iox_shm_close)(m_handle).failureReturnValue(INVALID_HANDLE).evaluate().or_else([](auto& r) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to close SharedMemory filedescriptor (close failed) : " << r.getHumanReadableErrnum()); }); @@ -280,45 +280,45 @@ PosixSharedMemoryError PosixSharedMemory::errnoToEnum(const int32_t errnum) noex switch (errnum) { case EACCES: - IOX_LOG(ERROR, "No permission to modify, truncate or access the shared memory!"); + IOX_LOG(Error, "No permission to modify, truncate or access the shared memory!"); return PosixSharedMemoryError::INSUFFICIENT_PERMISSIONS; case EPERM: - IOX_LOG(ERROR, "Resizing a file beyond its current size is not supported by the filesystem!"); + IOX_LOG(Error, "Resizing a file beyond its current size is not supported by the filesystem!"); return PosixSharedMemoryError::NO_RESIZE_SUPPORT; case EFBIG: - IOX_LOG(ERROR, "Requested Shared Memory is larger then the maximum file size."); + IOX_LOG(Error, "Requested Shared Memory is larger then the maximum file size."); return PosixSharedMemoryError::REQUESTED_MEMORY_EXCEEDS_MAXIMUM_FILE_SIZE; case EINVAL: - IOX_LOG(ERROR, + IOX_LOG(Error, "Requested Shared Memory is larger then the maximum file size or the filedescriptor does not " "belong to a regular file."); return PosixSharedMemoryError::REQUESTED_MEMORY_EXCEEDS_MAXIMUM_FILE_SIZE; case EBADF: - IOX_LOG(ERROR, "Provided filedescriptor is not a valid filedescriptor."); + IOX_LOG(Error, "Provided filedescriptor is not a valid filedescriptor."); return PosixSharedMemoryError::INVALID_FILEDESCRIPTOR; case EEXIST: - IOX_LOG(ERROR, "A Shared Memory with the given name already exists."); + IOX_LOG(Error, "A Shared Memory with the given name already exists."); return PosixSharedMemoryError::DOES_EXIST; case EISDIR: - IOX_LOG(ERROR, "The requested Shared Memory file is a directory."); + IOX_LOG(Error, "The requested Shared Memory file is a directory."); return PosixSharedMemoryError::PATH_IS_A_DIRECTORY; case ELOOP: - IOX_LOG(ERROR, "Too many symbolic links encountered while traversing the path."); + IOX_LOG(Error, "Too many symbolic links encountered while traversing the path."); return PosixSharedMemoryError::TOO_MANY_SYMBOLIC_LINKS; case EMFILE: - IOX_LOG(ERROR, "Process limit of maximum open files reached."); + IOX_LOG(Error, "Process limit of maximum open files reached."); return PosixSharedMemoryError::PROCESS_LIMIT_OF_OPEN_FILES_REACHED; case ENFILE: - IOX_LOG(ERROR, "System limit of maximum open files reached."); + IOX_LOG(Error, "System limit of maximum open files reached."); return PosixSharedMemoryError::SYSTEM_LIMIT_OF_OPEN_FILES_REACHED; case ENOENT: - IOX_LOG(ERROR, "Shared Memory does not exist."); + IOX_LOG(Error, "Shared Memory does not exist."); return PosixSharedMemoryError::DOES_NOT_EXIST; case ENOMEM: - IOX_LOG(ERROR, "Not enough memory available to create shared memory."); + IOX_LOG(Error, "Not enough memory available to create shared memory."); return PosixSharedMemoryError::NOT_ENOUGH_MEMORY_AVAILABLE; default: - IOX_LOG(ERROR, "This should never happen! An unknown error occurred!"); + IOX_LOG(Error, "This should never happen! An unknown error occurred!"); return PosixSharedMemoryError::UNKNOWN_ERROR; } } diff --git a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory_object.cpp b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory_object.cpp index 1cf72e2c60..5d25ca0909 100644 --- a/iceoryx_hoofs/posix/ipc/source/posix_shared_memory_object.cpp +++ b/iceoryx_hoofs/posix/ipc/source/posix_shared_memory_object.cpp @@ -71,7 +71,7 @@ expected PosixSharedMemor return stream; }; - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to create a shared memory object with the following properties [ name = " << m_name << ", sizeInBytes = " << m_memorySizeInBytes << ", access mode = " << asStringLiteral(m_accessMode) @@ -90,7 +90,7 @@ expected PosixSharedMemor if (!sharedMemory) { printErrorDetails(); - IOX_LOG(ERROR, "Unable to create SharedMemoryObject since we could not acquire a SharedMemory resource"); + IOX_LOG(Error, "Unable to create SharedMemoryObject since we could not acquire a SharedMemory resource"); return err(PosixSharedMemoryObjectError::SHARED_MEMORY_CREATION_FAILED); } @@ -98,7 +98,7 @@ expected PosixSharedMemor if (!realSizeResult) { printErrorDetails(); - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to create SharedMemoryObject since we could not acquire the memory size of the " "underlying object."); return err(PosixSharedMemoryObjectError::UNABLE_TO_VERIFY_MEMORY_SIZE); @@ -108,7 +108,7 @@ expected PosixSharedMemor if (realSize < m_memorySizeInBytes) { printErrorDetails(); - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to create SharedMemoryObject since a size of " << m_memorySizeInBytes << " was requested but the object has only a size of " << realSize); return err(PosixSharedMemoryObjectError::REQUESTED_SIZE_EXCEEDS_ACTUAL_SIZE); @@ -126,13 +126,13 @@ expected PosixSharedMemor if (!memoryMap) { printErrorDetails(); - IOX_LOG(ERROR, "Failed to map created shared memory into process!"); + IOX_LOG(Error, "Failed to map created shared memory into process!"); return err(PosixSharedMemoryObjectError::MAPPING_SHARED_MEMORY_FAILED); } if (sharedMemory->hasOwnership()) { - IOX_LOG(DEBUG, "Trying to reserve " << m_memorySizeInBytes << " bytes in the shared memory [" << m_name << "]"); + IOX_LOG(Debug, "Trying to reserve " << m_memorySizeInBytes << " bytes in the shared memory [" << m_name << "]"); if (platform::IOX_SHM_WRITE_ZEROS_ON_CREATION) { // this lock is required for the case that multiple threads are creating multiple @@ -142,7 +142,7 @@ expected PosixSharedMemor if (memsetSigbusGuard.has_error()) { printErrorDetails(); - IOX_LOG(ERROR, "Failed to temporarily override SIGBUS to safely zero the shared memory"); + IOX_LOG(Error, "Failed to temporarily override SIGBUS to safely zero the shared memory"); return err(PosixSharedMemoryObjectError::INTERNAL_LOGIC_FAILURE); } @@ -165,7 +165,7 @@ expected PosixSharedMemor memset(memoryMap->getBaseAddress(), 0, static_cast(m_memorySizeInBytes)); } - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Acquired " << m_memorySizeInBytes << " bytes successfully in the shared memory [" << m_name << "]"); } diff --git a/iceoryx_hoofs/posix/ipc/source/unix_domain_socket.cpp b/iceoryx_hoofs/posix/ipc/source/unix_domain_socket.cpp index 74320da023..eb4a26a68c 100644 --- a/iceoryx_hoofs/posix/ipc/source/unix_domain_socket.cpp +++ b/iceoryx_hoofs/posix/ipc/source/unix_domain_socket.cpp @@ -109,7 +109,7 @@ expected UnixDomainSocketBuilderNoPathPr if (bindCall.has_error()) { UnixDomainSocket::closeFileDescriptor(m_name, sockfd, sockAddr, m_channelSide).or_else([](auto) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to close socket file descriptor in error related cleanup during initialization."); }); // possible errors in closeFileDescriptor() are masked and we inform the user about the actual error @@ -130,7 +130,7 @@ expected UnixDomainSocketBuilderNoPathPr if (connectCall.has_error()) { UnixDomainSocket::closeFileDescriptor(m_name, sockfd, sockAddr, m_channelSide).or_else([](auto) { - IOX_LOG(ERROR, "Unable to close socket file descriptor in error related cleanup during initialization."); + IOX_LOG(Error, "Unable to close socket file descriptor in error related cleanup during initialization."); }); // possible errors in closeFileDescriptor() are masked and we inform the user about the actual error return err(UnixDomainSocket::errnoToEnum(m_name, connectCall.error().errnum)); @@ -160,7 +160,7 @@ UnixDomainSocket::~UnixDomainSocket() noexcept { if (destroy().has_error()) { - IOX_LOG(ERROR, "unable to cleanup unix domain socket \"" << m_name << "\" in the destructor"); + IOX_LOG(Error, "unable to cleanup unix domain socket \"" << m_name << "\" in the destructor"); } } @@ -175,7 +175,7 @@ UnixDomainSocket& UnixDomainSocket::operator=(UnixDomainSocket&& other) noexcept { if (destroy().has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to cleanup unix domain socket \"" << m_name << "\" in the move constructor/move assignment operator"); } @@ -328,82 +328,82 @@ PosixIpcChannelError UnixDomainSocket::errnoToEnum(const UdsName_t& name, const { case EACCES: { - IOX_LOG(ERROR, "permission to create unix domain socket denied \"" << name << "\""); + IOX_LOG(Error, "permission to create unix domain socket denied \"" << name << "\""); return PosixIpcChannelError::ACCESS_DENIED; } case EAFNOSUPPORT: { - IOX_LOG(ERROR, "address family not supported for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "address family not supported for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_ARGUMENTS; } case EINVAL: { - IOX_LOG(ERROR, "provided invalid arguments for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "provided invalid arguments for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_ARGUMENTS; } case EMFILE: { - IOX_LOG(ERROR, "process limit reached for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "process limit reached for unix domain socket \"" << name << "\""); return PosixIpcChannelError::PROCESS_LIMIT; } case ENFILE: { - IOX_LOG(ERROR, "system limit reached for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "system limit reached for unix domain socket \"" << name << "\""); return PosixIpcChannelError::SYSTEM_LIMIT; } case ENOBUFS: { - IOX_LOG(ERROR, "queue is full for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "queue is full for unix domain socket \"" << name << "\""); return PosixIpcChannelError::OUT_OF_MEMORY; } case ENOMEM: { - IOX_LOG(ERROR, "out of memory for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "out of memory for unix domain socket \"" << name << "\""); return PosixIpcChannelError::OUT_OF_MEMORY; } case EPROTONOSUPPORT: { - IOX_LOG(ERROR, "protocol type not supported for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "protocol type not supported for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_ARGUMENTS; } case EADDRINUSE: { - IOX_LOG(ERROR, "unix domain socket already in use \"" << name << "\""); + IOX_LOG(Error, "unix domain socket already in use \"" << name << "\""); return PosixIpcChannelError::CHANNEL_ALREADY_EXISTS; } case EBADF: { - IOX_LOG(ERROR, "invalid file descriptor for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "invalid file descriptor for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_FILE_DESCRIPTOR; } case ENOTSOCK: { - IOX_LOG(ERROR, "invalid unix domain socket \"" << name << "\""); + IOX_LOG(Error, "invalid unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_FILE_DESCRIPTOR; } case EADDRNOTAVAIL: { - IOX_LOG(ERROR, "interface or address error for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "interface or address error for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case EFAULT: { - IOX_LOG(ERROR, "outside address space error for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "outside address space error for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case ELOOP: { - IOX_LOG(ERROR, "too many symbolic links for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "too many symbolic links for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case ENAMETOOLONG: { - IOX_LOG(ERROR, "name too long for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "name too long for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case ENOTDIR: { - IOX_LOG(ERROR, "not a directory error for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "not a directory error for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case ENOENT: @@ -413,17 +413,17 @@ PosixIpcChannelError UnixDomainSocket::errnoToEnum(const UdsName_t& name, const } case EROFS: { - IOX_LOG(ERROR, "read only error for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "read only error for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_CHANNEL_NAME; } case EIO: { - IOX_LOG(ERROR, "I/O for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "I/O for unix domain socket \"" << name << "\""); return PosixIpcChannelError::I_O_ERROR; } case ENOPROTOOPT: { - IOX_LOG(ERROR, "invalid option for unix domain socket \"" << name << "\""); + IOX_LOG(Error, "invalid option for unix domain socket \"" << name << "\""); return PosixIpcChannelError::INVALID_ARGUMENTS; } case ECONNREFUSED: @@ -433,7 +433,7 @@ PosixIpcChannelError UnixDomainSocket::errnoToEnum(const UdsName_t& name, const } case ECONNRESET: { - IOX_LOG(ERROR, "connection was reset by peer for \"" << name << "\""); + IOX_LOG(Error, "connection was reset by peer for \"" << name << "\""); return PosixIpcChannelError::CONNECTION_RESET_BY_PEER; } case EWOULDBLOCK: @@ -443,7 +443,7 @@ PosixIpcChannelError UnixDomainSocket::errnoToEnum(const UdsName_t& name, const } default: { - IOX_LOG(ERROR, "internal logic error in unix domain socket \"" << name << "\" occurred"); + IOX_LOG(Error, "internal logic error in unix domain socket \"" << name << "\" occurred"); return PosixIpcChannelError::INTERNAL_LOGIC_ERROR; } } diff --git a/iceoryx_hoofs/posix/sync/source/mutex.cpp b/iceoryx_hoofs/posix/sync/source/mutex.cpp index f99e2ca75a..da4296ed1d 100644 --- a/iceoryx_hoofs/posix/sync/source/mutex.cpp +++ b/iceoryx_hoofs/posix/sync/source/mutex.cpp @@ -43,7 +43,7 @@ struct MutexAttributes IOX_POSIX_CALL(iox_pthread_mutexattr_destroy)(&*m_attributes).returnValueMatchesErrno().evaluate(); if (destroyResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while cleaning up the mutex attributes."); } } @@ -58,10 +58,10 @@ struct MutexAttributes switch (result.error().errnum) { case ENOMEM: - IOX_LOG(ERROR, "Not enough memory to initialize required mutex attributes"); + IOX_LOG(Error, "Not enough memory to initialize required mutex attributes"); return err(MutexBuilder::Error::INSUFFICIENT_MEMORY); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while initializing the mutex attributes."); return err(MutexBuilder::Error::UNKNOWN_ERROR); } @@ -83,10 +83,10 @@ struct MutexAttributes switch (result.error().errnum) { case ENOTSUP: - IOX_LOG(ERROR, "The platform does not support shared mutex (inter process mutex)"); + IOX_LOG(Error, "The platform does not support shared mutex (inter process mutex)"); return err(MutexBuilder::Error::INTER_PROCESS_LOCK_UNSUPPORTED_BY_PLATFORM); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while setting up the inter process " "configuration."); return err(MutexBuilder::Error::UNKNOWN_ERROR); @@ -103,7 +103,7 @@ struct MutexAttributes .evaluate(); if (result.has_error()) { - IOX_LOG(ERROR, "This should never happen. An unknown error occurred while setting up the mutex type."); + IOX_LOG(Error, "This should never happen. An unknown error occurred while setting up the mutex type."); return err(MutexBuilder::Error::UNKNOWN_ERROR); } @@ -121,16 +121,16 @@ struct MutexAttributes switch (result.error().errnum) { case ENOSYS: - IOX_LOG(ERROR, "The system does not support mutex priorities"); + IOX_LOG(Error, "The system does not support mutex priorities"); return err(MutexBuilder::Error::PRIORITIES_UNSUPPORTED_BY_PLATFORM); case ENOTSUP: - IOX_LOG(ERROR, "The used mutex priority is not supported by the platform"); + IOX_LOG(Error, "The used mutex priority is not supported by the platform"); return err(MutexBuilder::Error::USED_PRIORITY_UNSUPPORTED_BY_PLATFORM); case EPERM: - IOX_LOG(ERROR, "Insufficient permissions to set mutex priorities"); + IOX_LOG(Error, "Insufficient permissions to set mutex priorities"); return err(MutexBuilder::Error::PERMISSION_DENIED); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while setting up the mutex priority."); return err(MutexBuilder::Error::UNKNOWN_ERROR); } @@ -150,17 +150,17 @@ struct MutexAttributes switch (result.error().errnum) { case EPERM: - IOX_LOG(ERROR, "Insufficient permissions to set the mutex priority ceiling."); + IOX_LOG(Error, "Insufficient permissions to set the mutex priority ceiling."); return err(MutexBuilder::Error::PERMISSION_DENIED); case ENOSYS: - IOX_LOG(ERROR, "The platform does not support mutex priority ceiling."); + IOX_LOG(Error, "The platform does not support mutex priority ceiling."); return err(MutexBuilder::Error::PRIORITIES_UNSUPPORTED_BY_PLATFORM); case EINVAL: { auto minimumPriority = detail::getSchedulerPriorityMinimum(detail::Scheduler::FIFO); auto maximumPriority = detail::getSchedulerPriorityMaximum(detail::Scheduler::FIFO); - IOX_LOG(ERROR, + IOX_LOG(Error, "The priority ceiling \"" << priorityCeiling << "\" is not in the valid priority range [ " << minimumPriority << ", " << maximumPriority << "] of the Scheduler::FIFO."); @@ -168,7 +168,7 @@ struct MutexAttributes } default: IOX_LOG( - ERROR, + Error, "This should never happen. An unknown error occurred while setting up the mutex priority ceiling."); return err(MutexBuilder::Error::UNKNOWN_ERROR); } @@ -185,7 +185,7 @@ struct MutexAttributes .evaluate(); if (result.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while setting up the mutex thread " "termination behavior."); return err(MutexBuilder::Error::UNKNOWN_ERROR); @@ -206,16 +206,16 @@ expected initializeMutex(iox_pthread_mutex_t* const h switch (initResult.error().errnum) { case EAGAIN: - IOX_LOG(ERROR, "Not enough resources to initialize another mutex."); + IOX_LOG(Error, "Not enough resources to initialize another mutex."); return err(MutexBuilder::Error::INSUFFICIENT_RESOURCES); case ENOMEM: - IOX_LOG(ERROR, "Not enough memory to initialize mutex."); + IOX_LOG(Error, "Not enough memory to initialize mutex."); return err(MutexBuilder::Error::INSUFFICIENT_MEMORY); case EPERM: - IOX_LOG(ERROR, "Insufficient permissions to create mutex."); + IOX_LOG(Error, "Insufficient permissions to create mutex."); return err(MutexBuilder::Error::PERMISSION_DENIED); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while initializing the mutex handle. " "This is possible when the handle is an already initialized mutex handle."); return err(MutexBuilder::Error::UNKNOWN_ERROR); @@ -229,7 +229,7 @@ expected MutexBuilder::create(optional& uninit { if (uninitializedMutex.has_value()) { - IOX_LOG(ERROR, "Unable to override an already initialized mutex with a new mutex"); + IOX_LOG(Error, "Unable to override an already initialized mutex with a new mutex"); return err(Error::LOCK_ALREADY_INITIALIZED); } @@ -299,12 +299,12 @@ mutex::~mutex() noexcept switch (destroyCall.error().errnum) { case EBUSY: - IOX_LOG(ERROR, + IOX_LOG(Error, "Tried to remove a locked mutex which failed. The mutex handle is now leaked and " "cannot be removed anymore!"); break; default: - IOX_LOG(ERROR, "This should never happen. An unknown error occurred while cleaning up the mutex."); + IOX_LOG(Error, "This should never happen. An unknown error occurred while cleaning up the mutex."); break; } } @@ -321,7 +321,7 @@ void mutex::make_consistent() noexcept .evaluate() .and_then([&](auto) { this->m_hasInconsistentState = false; }) .or_else([](auto) { - IOX_LOG(ERROR, "This should never happen. Unable to put robust mutex in a consistent state!"); + IOX_LOG(Error, "This should never happen. Unable to put robust mutex in a consistent state!"); }); } } @@ -334,24 +334,24 @@ expected mutex::lock_impl() noexcept switch (result.error().errnum) { case EINVAL: - IOX_LOG(ERROR, + IOX_LOG(Error, "The mutex has the attribute MutexPriorityInheritance::PROTECT set and the calling threads " "priority is greater than the mutex priority."); return err(LockError::PRIORITY_MISMATCH); case EAGAIN: - IOX_LOG(ERROR, "Maximum number of recursive locks exceeded."); + IOX_LOG(Error, "Maximum number of recursive locks exceeded."); return err(LockError::MAXIMUM_NUMBER_OF_RECURSIVE_LOCKS_EXCEEDED); case EDEADLK: - IOX_LOG(ERROR, "Deadlock in mutex detected."); + IOX_LOG(Error, "Deadlock in mutex detected."); return err(LockError::DEADLOCK_CONDITION); case EOWNERDEAD: - IOX_LOG(ERROR, + IOX_LOG(Error, "The thread/process which owned the mutex died. The mutex is now in an inconsistent state " "and must be put into a consistent state again with Mutex::make_consistent()"); this->m_hasInconsistentState = true; return err(LockError::LOCK_ACQUIRED_BUT_HAS_INCONSISTENT_STATE_SINCE_OWNER_DIED); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while locking the mutex. " "This can indicate a either corrupted or non-POSIX compliant system."); return err(LockError::UNKNOWN_ERROR); @@ -368,12 +368,12 @@ expected mutex::unlock_impl() noexcept switch (result.error().errnum) { case EPERM: - IOX_LOG(ERROR, + IOX_LOG(Error, "The mutex is not owned by the current thread. The mutex must be unlocked by the same " "thread it was locked by."); return err(UnlockError::NOT_OWNED_BY_THREAD); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while unlocking the mutex. " "This can indicate a either corrupted or non-POSIX compliant system."); return err(UnlockError::UNKNOWN_ERROR); @@ -393,21 +393,21 @@ expected mutex::try_lock_impl() noexcept switch (result.error().errnum) { case EAGAIN: - IOX_LOG(ERROR, "Maximum number of recursive locks exceeded."); + IOX_LOG(Error, "Maximum number of recursive locks exceeded."); return err(TryLockError::MAXIMUM_NUMBER_OF_RECURSIVE_LOCKS_EXCEEDED); case EINVAL: - IOX_LOG(ERROR, + IOX_LOG(Error, "The mutex has the attribute MutexPriorityInheritance::PROTECT set and the calling threads " "priority is greater than the mutex priority."); return err(TryLockError::PRIORITY_MISMATCH); case EOWNERDEAD: - IOX_LOG(ERROR, + IOX_LOG(Error, "The thread/process which owned the mutex died. The mutex is now in an inconsistent state and must " "be put into a consistent state again with Mutex::make_consistent()"); this->m_hasInconsistentState = true; return err(TryLockError::LOCK_ACQUIRED_BUT_HAS_INCONSISTENT_STATE_SINCE_OWNER_DIED); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while trying to lock the mutex. This can " "indicate a either corrupted or non-POSIX compliant system."); return err(TryLockError::UNKNOWN_ERROR); diff --git a/iceoryx_hoofs/posix/sync/source/named_semaphore.cpp b/iceoryx_hoofs/posix/sync/source/named_semaphore.cpp index 552df47414..6aaf04ef12 100644 --- a/iceoryx_hoofs/posix/sync/source/named_semaphore.cpp +++ b/iceoryx_hoofs/posix/sync/source/named_semaphore.cpp @@ -40,10 +40,10 @@ static expected unlink(const NamedSemaphore::Name_t& name) switch (result.error().errnum) { case EACCES: - IOX_LOG(ERROR, "You don't have permission to remove the semaphore \"" << name << '"'); + IOX_LOG(Error, "You don't have permission to remove the semaphore \"" << name << '"'); return err(SemaphoreError::PERMISSION_DENIED); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while creating the semaphore \"" << name << '"'); return err(SemaphoreError::UNDEFINED); @@ -67,21 +67,21 @@ tryOpenExistingSemaphore(optional& uninitializedSemaphore, const switch (result.error().errnum) { case EACCES: - IOX_LOG(ERROR, "Insufficient permissions to open semaphore \"" << name << '"'); + IOX_LOG(Error, "Insufficient permissions to open semaphore \"" << name << '"'); return err(SemaphoreError::PERMISSION_DENIED); case EMFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "The per-process limit of file descriptor exceeded while opening the semaphore \"" << name << '"'); return err(SemaphoreError::FILE_DESCRIPTOR_LIMIT_REACHED); case ENFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "The system wide limit of file descriptor exceeded while opening the semaphore \"" << name << '"'); return err(SemaphoreError::FILE_DESCRIPTOR_LIMIT_REACHED); case ENOMEM: - IOX_LOG(ERROR, "Insufficient memory to open the semaphore \"" << name << '"'); + IOX_LOG(Error, "Insufficient memory to open the semaphore \"" << name << '"'); return err(SemaphoreError::OUT_OF_MEMORY); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while opening the semaphore \"" << name << '"'); return err(SemaphoreError::UNDEFINED); @@ -121,28 +121,28 @@ static expected createSemaphore(optional& switch (result.error().errnum) { case EACCES: - IOX_LOG(ERROR, "Insufficient permissions to create semaphore \"" << name << '"'); + IOX_LOG(Error, "Insufficient permissions to create semaphore \"" << name << '"'); return err(SemaphoreError::PERMISSION_DENIED); case EEXIST: - IOX_LOG(ERROR, + IOX_LOG(Error, "A semaphore with the name \"" << name << "\" does already exist. This should not happen until there is a race condition when " "multiple instances try to create the same named semaphore concurrently."); return err(SemaphoreError::ALREADY_EXIST); case EMFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "The per-process limit of file descriptor exceeded while creating the semaphore \"" << name << '"'); return err(SemaphoreError::FILE_DESCRIPTOR_LIMIT_REACHED); case ENFILE: - IOX_LOG(ERROR, + IOX_LOG(Error, "The system wide limit of file descriptor exceeded while creating the semaphore \"" << name << '"'); return err(SemaphoreError::FILE_DESCRIPTOR_LIMIT_REACHED); case ENOMEM: - IOX_LOG(ERROR, "Insufficient memory to create the semaphore \"" << name << '"'); + IOX_LOG(Error, "Insufficient memory to create the semaphore \"" << name << '"'); return err(SemaphoreError::OUT_OF_MEMORY); default: - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen. An unknown error occurred while creating the semaphore \"" << name << '"'); return err(SemaphoreError::UNDEFINED); @@ -163,13 +163,13 @@ NamedSemaphoreBuilder::create(optional& uninitializedSemaphore) { if (!isValidFileName(m_name)) { - IOX_LOG(ERROR, "The name \"" << m_name << "\" is not a valid semaphore name."); + IOX_LOG(Error, "The name \"" << m_name << "\" is not a valid semaphore name."); return err(SemaphoreError::INVALID_NAME); } if (m_initialValue > IOX_SEM_VALUE_MAX) { - IOX_LOG(ERROR, + IOX_LOG(Error, "The semaphores \"" << m_name << "\" initial value of " << m_initialValue << " exceeds the maximum semaphore value " << IOX_SEM_VALUE_MAX); return err(SemaphoreError::SEMAPHORE_OVERFLOW); @@ -185,7 +185,7 @@ NamedSemaphoreBuilder::create(optional& uninitializedSemaphore) if (!result.value()) { - IOX_LOG(ERROR, "Unable to open semaphore since no semaphore with the name \"" << m_name << "\" exists."); + IOX_LOG(Error, "Unable to open semaphore since no semaphore with the name \"" << m_name << "\" exists."); return err(SemaphoreError::NO_SEMAPHORE_WITH_THAT_NAME_EXISTS); } return ok(); @@ -232,7 +232,7 @@ NamedSemaphore::~NamedSemaphore() noexcept { if (IOX_POSIX_CALL(iox_sem_close)(m_handle).failureReturnValue(-1).evaluate().has_error()) { - IOX_LOG(ERROR, "This should never happen. Unable to close named semaphore \"" << m_name << '"'); + IOX_LOG(Error, "This should never happen. Unable to close named semaphore \"" << m_name << '"'); } if (m_hasOwnership) diff --git a/iceoryx_hoofs/posix/sync/source/semaphore_helper.cpp b/iceoryx_hoofs/posix/sync/source/semaphore_helper.cpp index a5c20ab5e1..f9dd2fa292 100644 --- a/iceoryx_hoofs/posix/sync/source/semaphore_helper.cpp +++ b/iceoryx_hoofs/posix/sync/source/semaphore_helper.cpp @@ -28,16 +28,16 @@ SemaphoreError sem_errno_to_enum(const int32_t errnum) noexcept switch (errnum) { case EINVAL: - IOX_LOG(ERROR, "The semaphore handle is no longer valid. This can indicate a corrupted system."); + IOX_LOG(Error, "The semaphore handle is no longer valid. This can indicate a corrupted system."); return SemaphoreError::INVALID_SEMAPHORE_HANDLE; case EOVERFLOW: - IOX_LOG(ERROR, "Semaphore overflow. The maximum value of " << IOX_SEM_VALUE_MAX << " would be exceeded."); + IOX_LOG(Error, "Semaphore overflow. The maximum value of " << IOX_SEM_VALUE_MAX << " would be exceeded."); return SemaphoreError::SEMAPHORE_OVERFLOW; case EINTR: - IOX_LOG(ERROR, "The semaphore call was interrupted multiple times by the operating system. Abort operation!"); + IOX_LOG(Error, "The semaphore call was interrupted multiple times by the operating system. Abort operation!"); return SemaphoreError::INTERRUPTED_BY_SIGNAL_HANDLER; default: - IOX_LOG(ERROR, "This should never happen. An unknown error occurred."); + IOX_LOG(Error, "This should never happen. An unknown error occurred."); break; } return SemaphoreError::UNDEFINED; diff --git a/iceoryx_hoofs/posix/sync/source/signal_handler.cpp b/iceoryx_hoofs/posix/sync/source/signal_handler.cpp index b6718bf43c..f9b1245b77 100644 --- a/iceoryx_hoofs/posix/sync/source/signal_handler.cpp +++ b/iceoryx_hoofs/posix/sync/source/signal_handler.cpp @@ -47,7 +47,7 @@ void SignalGuard::restorePreviousAction() noexcept m_doRestorePreviousAction = false; IOX_POSIX_CALL(sigaction) (static_cast(m_signal), &m_previousAction, nullptr).successReturnValue(0).evaluate().or_else([](auto&) { - IOX_LOG(ERROR, "Unable to restore the previous signal handling state!"); + IOX_LOG(Error, "Unable to restore the previous signal handling state!"); }); } } @@ -61,7 +61,7 @@ expected registerSignalHandler(const PosixSignal // sigemptyset fails when a nullptr is provided and this should never happen with this logic if (IOX_POSIX_CALL(sigemptyset)(&action.sa_mask).successReturnValue(0).evaluate().has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen! Unable to create an empty sigaction set while registering a signal handler " "for the signal [" << static_cast(signal) << "]. No signal handler will be registered!"); @@ -83,7 +83,7 @@ expected registerSignalHandler(const PosixSignal .evaluate() .has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "This should never happen! An error occurred while registering a signal handler for the signal [" << static_cast(signal) << "]. "); return err(SignalGuardError::UNDEFINED_ERROR_IN_SYSTEM_CALL); diff --git a/iceoryx_hoofs/posix/sync/source/thread.cpp b/iceoryx_hoofs/posix/sync/source/thread.cpp index e6d22a1736..457021ca78 100644 --- a/iceoryx_hoofs/posix/sync/source/thread.cpp +++ b/iceoryx_hoofs/posix/sync/source/thread.cpp @@ -31,7 +31,7 @@ bool setThreadName(const ThreadName_t& name) noexcept .or_else([&name](auto& r) { // String length limit is ensured through iox::string // ERANGE (string too long) intentionally not handled to avoid untestable and dead code - IOX_LOG(WARN, "Failed to set thread name '" << name << "'! error: " << r.getHumanReadableErrnum()); + IOX_LOG(Warn, "Failed to set thread name '" << name << "'! error: " << r.getHumanReadableErrnum()); }); return !result.has_error(); @@ -48,7 +48,7 @@ ThreadName_t getThreadName() noexcept (threadHandle, &tempName[0], MAX_THREAD_NAME_LENGTH + 1U).successReturnValue(0).evaluate().or_else([](auto& r) { // String length limit is ensured through MAX_THREAD_NAME_LENGTH // ERANGE (string too small) intentionally not handled to avoid untestable and dead code - IOX_LOG(FATAL, "This should never happen! " << r.getHumanReadableErrnum()); + IOX_LOG(Fatal, "This should never happen! " << r.getHumanReadableErrnum()); IOX_PANIC("Internal logic error"); }); @@ -94,10 +94,10 @@ Thread::~Thread() noexcept switch (joinResult.error().errnum) { case EDEADLK: - IOX_LOG(ERROR, "A deadlock was detected when attempting to join the thread."); + IOX_LOG(Error, "A deadlock was detected when attempting to join the thread."); break; default: - IOX_LOG(ERROR, "This should never happen. An unknown error occurred."); + IOX_LOG(Error, "This should never happen. An unknown error occurred."); break; } } @@ -116,19 +116,19 @@ ThreadError Thread::errnoToEnum(const int errnoValue) noexcept case EAGAIN: /// @todo iox-#1365 add thread name to log message once the name is set via BUILDER_PARAMETER, maybe add both, /// the name of the new thread and the name of the thread which created the new one - IOX_LOG(ERROR, "insufficient resources to create another thread"); + IOX_LOG(Error, "insufficient resources to create another thread"); return ThreadError::INSUFFICIENT_RESOURCES; case EINVAL: - IOX_LOG(ERROR, "invalid attribute settings"); + IOX_LOG(Error, "invalid attribute settings"); return ThreadError::INVALID_ATTRIBUTES; case ENOMEM: - IOX_LOG(ERROR, "not enough memory to initialize the thread attributes object"); + IOX_LOG(Error, "not enough memory to initialize the thread attributes object"); return ThreadError::INSUFFICIENT_MEMORY; case EPERM: - IOX_LOG(ERROR, "no appropriate permission to set required scheduling policy or parameters"); + IOX_LOG(Error, "no appropriate permission to set required scheduling policy or parameters"); return ThreadError::INSUFFICIENT_PERMISSIONS; default: - IOX_LOG(ERROR, "an unexpected error occurred in thread - this should never happen!"); + IOX_LOG(Error, "an unexpected error occurred in thread - this should never happen!"); return ThreadError::UNDEFINED; } } diff --git a/iceoryx_hoofs/posix/sync/source/unnamed_semaphore.cpp b/iceoryx_hoofs/posix/sync/source/unnamed_semaphore.cpp index a32910beb2..18b5f1317b 100644 --- a/iceoryx_hoofs/posix/sync/source/unnamed_semaphore.cpp +++ b/iceoryx_hoofs/posix/sync/source/unnamed_semaphore.cpp @@ -27,7 +27,7 @@ UnnamedSemaphoreBuilder::create(optional& uninitializedSemapho { if (m_initialValue > IOX_SEM_VALUE_MAX) { - IOX_LOG(ERROR, + IOX_LOG(Error, "The unnamed semaphore initial value of " << m_initialValue << " exceeds the maximum semaphore value " << IOX_SEM_VALUE_MAX); return err(SemaphoreError::SEMAPHORE_OVERFLOW); @@ -49,13 +49,13 @@ UnnamedSemaphoreBuilder::create(optional& uninitializedSemapho switch (result.error().errnum) { case EINVAL: - IOX_LOG(ERROR, "The initial value of " << m_initialValue << " exceeds " << IOX_SEM_VALUE_MAX); + IOX_LOG(Error, "The initial value of " << m_initialValue << " exceeds " << IOX_SEM_VALUE_MAX); break; case ENOSYS: - IOX_LOG(ERROR, "The system does not support process-shared semaphores"); + IOX_LOG(Error, "The system does not support process-shared semaphores"); break; default: - IOX_LOG(ERROR, "This should never happen. An unknown error occurred."); + IOX_LOG(Error, "This should never happen. An unknown error occurred."); break; } } @@ -73,10 +73,10 @@ UnnamedSemaphore::~UnnamedSemaphore() noexcept switch (result.error().errnum) { case EINVAL: - IOX_LOG(ERROR, "The semaphore handle was no longer valid. This can indicate a corrupted system."); + IOX_LOG(Error, "The semaphore handle was no longer valid. This can indicate a corrupted system."); break; default: - IOX_LOG(ERROR, "This should never happen. An unknown error occurred."); + IOX_LOG(Error, "This should never happen. An unknown error occurred."); break; } } diff --git a/iceoryx_hoofs/posix/time/include/iox/detail/adaptive_wait.hpp b/iceoryx_hoofs/posix/time/include/iox/detail/adaptive_wait.hpp index 64f12141a4..a5cb2764a4 100644 --- a/iceoryx_hoofs/posix/time/include/iox/detail/adaptive_wait.hpp +++ b/iceoryx_hoofs/posix/time/include/iox/detail/adaptive_wait.hpp @@ -91,7 +91,7 @@ class adaptive_wait /// std::this_thread::yield(); /// } /// auto end = std::chrono::steady_clock::now(); - /// IOX_LOG(INFO, (end - start).count()); // prints around 1ms + /// IOX_LOG(Info, (end - start).count()); // prints around 1ms /// @endcode static constexpr uint64_t YIELD_REPETITIONS = 10000U; diff --git a/iceoryx_hoofs/posix/utility/source/system_configuration.cpp b/iceoryx_hoofs/posix/utility/source/system_configuration.cpp index 65cceddabc..2bf3f26085 100644 --- a/iceoryx_hoofs/posix/utility/source/system_configuration.cpp +++ b/iceoryx_hoofs/posix/utility/source/system_configuration.cpp @@ -33,7 +33,7 @@ uint64_t pageSize() noexcept .failureReturnValue(-1) .evaluate() .or_else([](auto& r) { - IOX_LOG(FATAL, "This should never happen: " << r.getHumanReadableErrnum()); + IOX_LOG(Fatal, "This should never happen: " << r.getHumanReadableErrnum()); IOX_PANIC("Internal logic error"); }) .value() diff --git a/iceoryx_hoofs/primitives/include/iox/algorithm.hpp b/iceoryx_hoofs/primitives/include/iox/algorithm.hpp index 6ae14ef217..042275622f 100644 --- a/iceoryx_hoofs/primitives/include/iox/algorithm.hpp +++ b/iceoryx_hoofs/primitives/include/iox/algorithm.hpp @@ -181,7 +181,7 @@ struct greater_or_equal { if (t < Minimum) { - IOX_LOG(FATAL, "The value '" << t << "' is below '" << Minimum << "'"); + IOX_LOG(Fatal, "The value '" << t << "' is below '" << Minimum << "'"); IOX_PANIC("Violating invariant of 'greater_or_equal'"); } } @@ -210,7 +210,7 @@ struct range { if (t < Minimum || t > Maximum) { - IOX_LOG(FATAL, "The value '" << t << "' is out of the range [" << Minimum << ", " << Maximum << "]"); + IOX_LOG(Fatal, "The value '" << t << "' is out of the range [" << Minimum << ", " << Maximum << "]"); IOX_PANIC("Violating invariant of 'range'"); } } diff --git a/iceoryx_hoofs/primitives/include/iox/detail/iceoryx_hoofs_types.inl b/iceoryx_hoofs/primitives/include/iox/detail/iceoryx_hoofs_types.inl index 4e35dbd0c6..75d5cf025e 100644 --- a/iceoryx_hoofs/primitives/include/iox/detail/iceoryx_hoofs_types.inl +++ b/iceoryx_hoofs/primitives/include/iox/detail/iceoryx_hoofs_types.inl @@ -32,20 +32,20 @@ inline constexpr const char* asStringLiteral(const LogLevel value) noexcept { switch (value) { - case LogLevel::OFF: - return "LogLevel::OFF"; - case LogLevel::FATAL: - return "LogLevel::FATAL"; - case LogLevel::ERROR: - return "LogLevel::ERROR"; - case LogLevel::WARN: - return "LogLevel::WARN"; - case LogLevel::INFO: - return "LogLevel::INFO"; - case LogLevel::DEBUG: - return "LogLevel::DEBUG"; - case LogLevel::TRACE: - return "LogLevel::TRACE"; + case LogLevel::Off: + return "LogLevel::Off"; + case LogLevel::Fatal: + return "LogLevel::Fatal"; + case LogLevel::Error: + return "LogLevel::Error"; + case LogLevel::Warn: + return "LogLevel::Warn"; + case LogLevel::Info: + return "LogLevel::Info"; + case LogLevel::Debug: + return "LogLevel::Debug"; + case LogLevel::Trace: + return "LogLevel::Trace"; } return "[Undefined LogLevel]"; diff --git a/iceoryx_hoofs/primitives/include/iox/iceoryx_hoofs_types.hpp b/iceoryx_hoofs/primitives/include/iox/iceoryx_hoofs_types.hpp index 88ddbaa83f..d29a563300 100644 --- a/iceoryx_hoofs/primitives/include/iox/iceoryx_hoofs_types.hpp +++ b/iceoryx_hoofs/primitives/include/iox/iceoryx_hoofs_types.hpp @@ -33,13 +33,13 @@ namespace log /// @brief This enum defines the log levels used for logging. enum class LogLevel : uint8_t { - OFF = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_OFF, - FATAL = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_FATAL, - ERROR = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_ERROR, - WARN = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_WARN, - INFO = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_INFO, - DEBUG = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_DEBUG, - TRACE = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_TRACE, + Off = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_OFF, + Fatal = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_FATAL, + Error = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_ERROR, + Warn = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_WARN, + Info = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_INFO, + Debug = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_DEBUG, + Trace = IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_TRACE, }; /// @brief converts LogLevel into a string literal diff --git a/iceoryx_hoofs/primitives/include/iox/size.hpp b/iceoryx_hoofs/primitives/include/iox/size.hpp index 5799d467f1..4e03d0ba71 100644 --- a/iceoryx_hoofs/primitives/include/iox/size.hpp +++ b/iceoryx_hoofs/primitives/include/iox/size.hpp @@ -34,7 +34,7 @@ constexpr auto size(const Container& container) -> decltype(container.size()) /// @brief Get the capacity of a C array at compile time /// @code /// constexpr uint32_t FOO[42]{}; -/// IOX_LOG(INFO, size(FOO)); // will print 42 +/// IOX_LOG(Info, size(FOO)); // will print 42 /// @endcode /// @tparam T the type of the array filled out by the compiler. /// @tparam CapacityValue the capacity of the array filled out by the compiler. @@ -44,7 +44,7 @@ template // AXIVION Next Construct AutosarC++19_03-A2.10.5, AutosarC++19_03-M17.0.3 : The function is in the 'iox' namespace which prevents easy misuse // AXIVION Next Construct AutosarC++19_03-A18.1.1 : returning capacity of C array at compile time is safe, no possibility of out of bounds access // NOLINTNEXTLINE(hicpp-avoid-c-arrays,cppcoreguidelines-avoid-c-arrays) -static constexpr uint64_t size(T const (&/*notInterested*/)[CapacityValue]) noexcept +static constexpr uint64_t size(T const (& /*notInterested*/)[CapacityValue]) noexcept { return CapacityValue; } diff --git a/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logformat.inl b/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logformat.inl index 5e3c06281b..1b0b1d8154 100644 --- a/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logformat.inl +++ b/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logformat.inl @@ -31,19 +31,19 @@ inline constexpr const char* logLevelDisplayColor(const LogLevel value) noexcept { switch (value) { - case LogLevel::OFF: + case LogLevel::Off: return ""; // nothing - case LogLevel::FATAL: + case LogLevel::Fatal: return "\033[0;1;97;41m"; // bold bright white on red - case LogLevel::ERROR: + case LogLevel::Error: return "\033[0;1;31;103m"; // bold red on light yellow - case LogLevel::WARN: + case LogLevel::Warn: return "\033[0;1;93m"; // bold bright yellow - case LogLevel::INFO: + case LogLevel::Info: return "\033[0;1;92m"; // bold bright green - case LogLevel::DEBUG: + case LogLevel::Debug: return "\033[0;1;96m"; // bold bright cyan - case LogLevel::TRACE: + case LogLevel::Trace: return "\033[0;1;36m"; // bold cyan } @@ -54,19 +54,19 @@ inline constexpr const char* logLevelDisplayText(const LogLevel value) noexcept { switch (value) { - case LogLevel::OFF: + case LogLevel::Off: return "[ Off ]"; - case LogLevel::FATAL: + case LogLevel::Fatal: return "[Fatal]"; - case LogLevel::ERROR: + case LogLevel::Error: return "[Error]"; - case LogLevel::WARN: + case LogLevel::Warn: return "[Warn ]"; - case LogLevel::INFO: + case LogLevel::Info: return "[Info ]"; - case LogLevel::DEBUG: + case LogLevel::Debug: return "[Debug]"; - case LogLevel::TRACE: + case LogLevel::Trace: return "[Trace]"; } diff --git a/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logger.inl b/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logger.inl index f7525a1890..59ca65f07c 100644 --- a/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logger.inl +++ b/iceoryx_hoofs/reporting/include/iox/detail/log/building_blocks/logger.inl @@ -84,10 +84,10 @@ inline Logger& Logger::activeLogger(Logger* { if (logger->m_isFinalized.load(std::memory_order_relaxed)) { - logger->createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::ERROR); + logger->createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::Error); logger->logString("Trying to replace logger after already initialized!"); logger->flush(); - newLogger->createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::ERROR); + newLogger->createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::Error); logger->logString("Trying to replace logger after already initialized!"); newLogger->flush(); /// @todo iox-#1755 call error handler after the error handler refactoring was merged @@ -115,7 +115,7 @@ inline void Logger::initLoggerInternal(const LogLevel logLevel) noex } else { - BaseLogger::createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::ERROR); + BaseLogger::createLogMessageHeader(__FILE__, __LINE__, __FUNCTION__, LogLevel::Error); BaseLogger::logString("Multiple initLogger calls"); BaseLogger::flush(); /// @todo iox-#1755 call error handler after the error handler refactoring was merged diff --git a/iceoryx_hoofs/reporting/include/iox/error_reporting/error_logging.hpp b/iceoryx_hoofs/reporting/include/iox/error_reporting/error_logging.hpp index 503cb5ba48..e49c0918bc 100644 --- a/iceoryx_hoofs/reporting/include/iox/error_reporting/error_logging.hpp +++ b/iceoryx_hoofs/reporting/include/iox/error_reporting/error_logging.hpp @@ -30,7 +30,7 @@ IOX_LOG_INTERNAL(location.file, \ location.line, \ location.function, \ - iox::log::LogLevel::ERROR, \ + iox::log::LogLevel::Error, \ location.file << ":" << location.line << " " << msg_stream) /// @brief Log the location of a fatal error. @@ -40,7 +40,7 @@ IOX_LOG_INTERNAL(location.file, \ location.line, \ location.function, \ - iox::log::LogLevel::FATAL, \ + iox::log::LogLevel::Fatal, \ location.file << ":" << location.line << " " << msg_stream) /// @brief Log a panic invocation. diff --git a/iceoryx_hoofs/reporting/include/iox/log/building_blocks/logger.hpp b/iceoryx_hoofs/reporting/include/iox/log/building_blocks/logger.hpp index 08821e841a..699abdb534 100644 --- a/iceoryx_hoofs/reporting/include/iox/log/building_blocks/logger.hpp +++ b/iceoryx_hoofs/reporting/include/iox/log/building_blocks/logger.hpp @@ -89,7 +89,7 @@ class Logger : public BaseLogger /// @note The function uses 'getenv' which is not thread safe and can result in undefined behavior when it is called /// from multiple threads or the env variable is changed while the function holds a pointer to the data. For this /// reason the function should only be used in the startup phase of the application and only in the main thread. - static void init(const LogLevel logLevel = logLevelFromEnvOr(LogLevel::INFO)) noexcept; + static void init(const LogLevel logLevel = logLevelFromEnvOr(LogLevel::Info)) noexcept; /// @brief Replaces the default logger with the specified one /// @param[in] newLogger is the logger which shall be used after the call diff --git a/iceoryx_hoofs/reporting/include/iox/log/logstream.hpp b/iceoryx_hoofs/reporting/include/iox/log/logstream.hpp index 1387e57aa3..3ad63ef39e 100644 --- a/iceoryx_hoofs/reporting/include/iox/log/logstream.hpp +++ b/iceoryx_hoofs/reporting/include/iox/log/logstream.hpp @@ -366,7 +366,7 @@ class LogStream /// @tparam[in] Callable with a signature 'iox::log::LogStream&(iox::log::LogStream&)' /// @param[in] c is the callable which receives a LogStream object for the actual logging /// @code - /// IOX_LOG(INFO, [] (auto& stream) -> auto& { + /// IOX_LOG(Info, [] (auto& stream) -> auto& { /// for(const auto& num: {13, 37, 42, 73}) { /// stream << num << " "; /// } diff --git a/iceoryx_hoofs/reporting/include/iox/logging.hpp b/iceoryx_hoofs/reporting/include/iox/logging.hpp index 110e97ea63..6322dc2f3a 100644 --- a/iceoryx_hoofs/reporting/include/iox/logging.hpp +++ b/iceoryx_hoofs/reporting/include/iox/logging.hpp @@ -57,7 +57,7 @@ inline bool isLogLevelActive(LogLevel logLevel) noexcept /// @param[in] level is the log level to be used for the log message /// @param[in] msg_stream is the log message stream; multiple items can be logged by using the '<<' operator /// @code -/// IOX_LOG(INFO, "Hello" << " World"); +/// IOX_LOG(Info, "Hello" << " World"); /// @endcode // AXIVION Next Construct AutosarC++19_03-A16.0.1 needed for source code location, safely wrapped in macro // AXIVION Next Construct AutosarC++19_03-M16.0.6 brackets around macro parameter would lead to compile time failures in this case diff --git a/iceoryx_hoofs/reporting/source/console_logger.cpp b/iceoryx_hoofs/reporting/source/console_logger.cpp index 8f7ed35a72..75dd50e5f6 100644 --- a/iceoryx_hoofs/reporting/source/console_logger.cpp +++ b/iceoryx_hoofs/reporting/source/console_logger.cpp @@ -31,7 +31,7 @@ namespace log { // NOLINTJUSTIFICATION See at declaration in header // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) -concurrent::Atomic ConsoleLogger::s_activeLogLevel{LogLevel::INFO}; +concurrent::Atomic ConsoleLogger::s_activeLogLevel{LogLevel::Info}; ConsoleLogger::ThreadLocalData& ConsoleLogger::getThreadLocalData() noexcept { diff --git a/iceoryx_hoofs/reporting/source/logger.cpp b/iceoryx_hoofs/reporting/source/logger.cpp index 57df4d77ca..1027e469b5 100644 --- a/iceoryx_hoofs/reporting/source/logger.cpp +++ b/iceoryx_hoofs/reporting/source/logger.cpp @@ -37,31 +37,31 @@ LogLevel logLevelFromEnvOr(const LogLevel logLevel) noexcept { if (equalStrings(logLevelString, "off")) { - specifiedLogLevel = LogLevel::OFF; + specifiedLogLevel = LogLevel::Off; } else if (equalStrings(logLevelString, "fatal")) { - specifiedLogLevel = LogLevel::FATAL; + specifiedLogLevel = LogLevel::Fatal; } else if (equalStrings(logLevelString, "error")) { - specifiedLogLevel = LogLevel::ERROR; + specifiedLogLevel = LogLevel::Error; } else if (equalStrings(logLevelString, "warn")) { - specifiedLogLevel = LogLevel::WARN; + specifiedLogLevel = LogLevel::Warn; } else if (equalStrings(logLevelString, "info")) { - specifiedLogLevel = LogLevel::INFO; + specifiedLogLevel = LogLevel::Info; } else if (equalStrings(logLevelString, "debug")) { - specifiedLogLevel = LogLevel::DEBUG; + specifiedLogLevel = LogLevel::Debug; } else if (equalStrings(logLevelString, "trace")) { - specifiedLogLevel = LogLevel::TRACE; + specifiedLogLevel = LogLevel::Trace; } else { diff --git a/iceoryx_hoofs/reporting/source/logging.cpp b/iceoryx_hoofs/reporting/source/logging.cpp index d7754b4caa..88a7613c7c 100644 --- a/iceoryx_hoofs/reporting/source/logging.cpp +++ b/iceoryx_hoofs/reporting/source/logging.cpp @@ -23,32 +23,32 @@ namespace iox::log::internal void platform_log_backend( const char* file, int line, const char* function, IceoryxPlatformLogLevel log_level, const char* msg) { - auto level = LogLevel::TRACE; + auto level = LogLevel::Trace; switch (log_level) { case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_OFF: - level = LogLevel::OFF; + level = LogLevel::Off; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_FATAL: - level = LogLevel::FATAL; + level = LogLevel::Fatal; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_ERROR: - level = LogLevel::ERROR; + level = LogLevel::Error; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_WARN: - level = LogLevel::WARN; + level = LogLevel::Warn; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_INFO: - level = LogLevel::INFO; + level = LogLevel::Info; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_DEBUG: - level = LogLevel::DEBUG; + level = LogLevel::Debug; break; case IceoryxPlatformLogLevel::IOX_PLATFORM_LOG_LEVEL_TRACE: - level = LogLevel::TRACE; + level = LogLevel::Trace; break; default: - level = LogLevel::TRACE; + level = LogLevel::Trace; } IOX_LOG_INTERNAL(file, line, function, level, msg); } diff --git a/iceoryx_hoofs/test/moduletests/test_filesystem_file_reader.cpp b/iceoryx_hoofs/test/moduletests/test_filesystem_file_reader.cpp index 8e79ae96b8..f7133811ad 100644 --- a/iceoryx_hoofs/test/moduletests/test_filesystem_file_reader.cpp +++ b/iceoryx_hoofs/test/moduletests/test_filesystem_file_reader.cpp @@ -142,7 +142,7 @@ TEST_F(FileReader_test, errorIgnoreMode) iox::FileReader reader("FileNotAvailable.readme", "PathThatNeverHasBeen", iox::FileReader::ErrorMode::Ignore); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Eq(0U)); }); + iox::log::LogLevel::Error, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Eq(0U)); }); } TEST_F(FileReader_test, errorInformMode) @@ -153,7 +153,7 @@ TEST_F(FileReader_test, errorInformMode) const std::string expectedOutput = "Could not open file 'FileNotFound.abc' from path 'TheInfamousPath'."; iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [&](const auto& logMessages) { + iox::log::LogLevel::Error, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Eq(1U)); EXPECT_THAT(logMessages[0], HasSubstr(expectedOutput)); }); @@ -171,7 +171,7 @@ TEST_F(FileReader_test, errorTerminateMode) const std::string expectedOutput = "Could not open file 'ISaidNo!' from path 'InTheMiddleOfNowhere'!"; iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::FATAL, [&](const auto& logMessages) { + iox::log::LogLevel::Fatal, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Gt(1U)); EXPECT_THAT(logMessages[0], HasSubstr(expectedOutput)); }); diff --git a/iceoryx_hoofs/test/moduletests/test_posix_access_rights.cpp b/iceoryx_hoofs/test/moduletests/test_posix_access_rights.cpp index 1bebd4760c..94cc0bce2a 100644 --- a/iceoryx_hoofs/test/moduletests/test_posix_access_rights.cpp +++ b/iceoryx_hoofs/test/moduletests/test_posix_access_rights.cpp @@ -40,7 +40,7 @@ class PosixAccessRights_test : public Test IOX_POSIX_CALL(system) (("groups > " + TestFileName).c_str()).failureReturnValue(-1).evaluate().or_else([](auto& r) { - IOX_LOG(ERROR, "system call failed with error: " << r.getHumanReadableErrnum()); + IOX_LOG(Error, "system call failed with error: " << r.getHumanReadableErrnum()); std::terminate(); }); } @@ -49,7 +49,7 @@ class PosixAccessRights_test : public Test { if (std::remove(TestFileName.c_str()) != 0) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Failed to remove temporary file '" << TestFileName << "'. You'll have to remove it by yourself."); } } diff --git a/iceoryx_hoofs/test/moduletests/test_posix_ipc_unix_domain_sockets.cpp b/iceoryx_hoofs/test/moduletests/test_posix_ipc_unix_domain_sockets.cpp index 45d661362f..609db100f4 100644 --- a/iceoryx_hoofs/test/moduletests/test_posix_ipc_unix_domain_sockets.cpp +++ b/iceoryx_hoofs/test/moduletests/test_posix_ipc_unix_domain_sockets.cpp @@ -104,12 +104,12 @@ class UnixDomainSocket_test : public Test .failureReturnValue(ERROR_CODE) .evaluate() .or_else([&](auto&) { - IOX_LOG(ERROR, "unable to bind socket"); + IOX_LOG(Error, "unable to bind socket"); socketCreationSuccess = false; }); }) .or_else([&](auto&) { - IOX_LOG(ERROR, "unable to create socket"); + IOX_LOG(Error, "unable to create socket"); socketCreationSuccess = false; }); return socketCreationSuccess; @@ -300,8 +300,7 @@ TEST_F(UnixDomainSocket_test, SuccessfulCommunicationOfNonEmptyMessageWithSendAn TEST_F(UnixDomainSocket_test, SuccessfulCommunicationOfEmptyMessageWithSendAndReceive) { ::testing::Test::RecordProperty("TEST_ID", "1cbb2b57-5bde-4d36-b11d-879f55a313c0"); - successfulSendAndReceive( - {""}, [&](auto& msg) { return client.send(msg); }, [&]() { return server.receive(); }); + successfulSendAndReceive({""}, [&](auto& msg) { return client.send(msg); }, [&]() { return server.receive(); }); } TEST_F(UnixDomainSocket_test, SuccessfulCommunicationOfEmptyMessageWithTimedSendAndReceive) diff --git a/iceoryx_hoofs/test/moduletests/test_posix_posix_call.cpp b/iceoryx_hoofs/test/moduletests/test_posix_posix_call.cpp index d97f582d7e..55714be7d3 100644 --- a/iceoryx_hoofs/test/moduletests/test_posix_posix_call.cpp +++ b/iceoryx_hoofs/test/moduletests/test_posix_posix_call.cpp @@ -72,7 +72,7 @@ TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValue_GoodCase) .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValue_BadCase) @@ -96,7 +96,7 @@ TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValue_BadCase) // verified since it depends on the target and where the source code is // stored iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValue_GoodCase) @@ -117,7 +117,7 @@ TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValue_GoodCase) .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValue_BadCase) @@ -141,7 +141,7 @@ TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValue_BadCase) // verified since it depends on the target and where the source code is // stored iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValueAndIgnoredErrno_GoodCase) @@ -163,7 +163,7 @@ TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValueAndIgnoredErrno_Good .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValueAndIgnoredErrno_BadCase) @@ -188,7 +188,7 @@ TEST_F(PosixCall_test, CallingFunctionWithSuccessReturnValueAndIgnoredErrno_BadC // verified since it depends on the target and where the source code is // stored iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValueAndIgnoredErrno_GoodCase) @@ -210,7 +210,7 @@ TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValueAndIgnoredErrno_Good .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValueAndIgnoredErrno_BadCase) @@ -235,7 +235,7 @@ TEST_F(PosixCall_test, CallingFunctionWithFailureReturnValueAndIgnoredErrno_BadC // verified since it depends on the target and where the source code is // stored iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringMultipleErrnosWorks) @@ -257,7 +257,7 @@ TEST_F(PosixCall_test, IgnoringMultipleErrnosWorks) .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsNotListedFails) @@ -279,7 +279,7 @@ TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsNotListedFails }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsFirstInListSucceeds) @@ -301,7 +301,7 @@ TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsFirstInListSuc .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsLastInListSucceeds) @@ -323,7 +323,7 @@ TEST_F(PosixCall_test, IgnoringMultipleErrnosWhereOccurringErrnoIsLastInListSucc .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIsFirst) @@ -347,7 +347,7 @@ TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIs .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIsMiddle) @@ -371,7 +371,7 @@ TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIs .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIsLast) @@ -395,7 +395,7 @@ TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsWorksWhenErrnoIs .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsFails) @@ -419,7 +419,7 @@ TEST_F(PosixCall_test, IgnoringErrnosByMultipleIgnoreErrnosCallsFails) }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingWithNonPresentErrnoPrintsErrorMessage) @@ -441,7 +441,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingWithNonPresentErrnoPrintsErrorMessage }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingWithPresentErrnoDoesNotPrintErrorMessage) @@ -463,7 +463,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingWithPresentErrnoDoesNotPrintErrorMess }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressMultipleErrnoLoggingWithNoPresentErrnoPrintsErrorMessage) @@ -485,7 +485,7 @@ TEST_F(PosixCall_test, SuppressMultipleErrnoLoggingWithNoPresentErrnoPrintsError }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressMultipleErrnoLoggingWithPresentErrnoDoesNotPrintErrorMessage) @@ -507,7 +507,7 @@ TEST_F(PosixCall_test, SuppressMultipleErrnoLoggingWithPresentErrnoDoesNotPrintE }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingByMultipleCallsWithNonPresentErrnoPrintsErrorMessage) @@ -531,7 +531,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingByMultipleCallsWithNonPresentErrnoPri }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingByMultipleCallsWithPresentErrnoDoesNotPrintErrorMessage) @@ -555,7 +555,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingByMultipleCallsWithPresentErrnoDoesNo }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingOfIgnoredErrnoDoesNotPrintErrorMessage) @@ -578,7 +578,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingOfIgnoredErrnoDoesNotPrintErrorMessag .or_else([&](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, SuppressErrnoLoggingOfNotIgnoredErrnoDoesNotPrintErrorMessage) @@ -601,7 +601,7 @@ TEST_F(PosixCall_test, SuppressErrnoLoggingOfNotIgnoredErrnoDoesNotPrintErrorMes }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, RecallingFunctionWithEintrWorks) @@ -620,7 +620,7 @@ TEST_F(PosixCall_test, RecallingFunctionWithEintrWorks) EXPECT_THAT(eintrRepetition, Eq(0)); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } @@ -637,7 +637,7 @@ TEST_F(PosixCall_test, FunctionReturnsEINTRTooOftenResultsInFailure) EXPECT_THAT(eintrRepetition, Eq(1)); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodValueIsFirst) @@ -658,7 +658,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodVa .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodValueIsCenter) @@ -679,7 +679,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodVa .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodValueIsLast) @@ -700,7 +700,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodVa .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodValueIsNotPresent) @@ -721,7 +721,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleSuccessReturnValuesWhereGoodVa }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailureValueIsFirst) @@ -742,7 +742,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailur }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailureValueIsCenter) @@ -763,7 +763,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailur }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailureValueIsLast) @@ -784,7 +784,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailur }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailureValueIsNotPresent) @@ -805,7 +805,7 @@ TEST_F(PosixCall_test, CallingFunctionWithMultipleFailureReturnValuesWhereFailur .or_else([](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, ErrnoIsSetFromReturnValueWhenFunctionHandlesErrnosInReturnValue_GoodCase) @@ -825,7 +825,7 @@ TEST_F(PosixCall_test, ErrnoIsSetFromReturnValueWhenFunctionHandlesErrnosInRetur .or_else([&](auto&) { EXPECT_TRUE(false); }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_EQ(logMessages.size(), 0); }); } TEST_F(PosixCall_test, ErrnoIsSetFromReturnValueWhenFunctionHandlesErrnosInReturnValue_BadCase) @@ -845,5 +845,5 @@ TEST_F(PosixCall_test, ErrnoIsSetFromReturnValueWhenFunctionHandlesErrnosInRetur }); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); + iox::log::LogLevel::Error, [](const auto& logMessages) { ASSERT_GT(logMessages.size(), 0); }); } diff --git a/iceoryx_hoofs/test/moduletests/test_reporting_console_logger.cpp b/iceoryx_hoofs/test/moduletests/test_reporting_console_logger.cpp index 95a89786fa..250ed8753b 100644 --- a/iceoryx_hoofs/test/moduletests/test_reporting_console_logger.cpp +++ b/iceoryx_hoofs/test/moduletests/test_reporting_console_logger.cpp @@ -48,7 +48,7 @@ TEST(ConsoleLogger_test, TestOutput) TEST(ConsoleLogger_test, SettingTheLogLevelWorks) { ::testing::Test::RecordProperty("TEST_ID", "e8225d29-ee35-4864-8528-b1e290a83311"); - constexpr auto LOG_LEVEL{iox::log::LogLevel::INFO}; + constexpr auto LOG_LEVEL{iox::log::LogLevel::Info}; EXPECT_THAT(LoggerSUT::getLogLevel(), Ne(LOG_LEVEL)); LoggerSUT::setLogLevel(LOG_LEVEL); diff --git a/iceoryx_hoofs/test/moduletests/test_reporting_logging.cpp b/iceoryx_hoofs/test/moduletests/test_reporting_logging.cpp index 05c11884cb..6c4d6e210e 100644 --- a/iceoryx_hoofs/test/moduletests/test_reporting_logging.cpp +++ b/iceoryx_hoofs/test/moduletests/test_reporting_logging.cpp @@ -41,12 +41,12 @@ void testLogLevelThreshold(const iox::log::LogLevel loggerLogLevel, std::string string; }; - const std::initializer_list logEntryLogLevels{{iox::log::LogLevel::FATAL, "Fatal"}, - {iox::log::LogLevel::ERROR, "Error"}, - {iox::log::LogLevel::WARN, "Warn"}, - {iox::log::LogLevel::INFO, "Info"}, - {iox::log::LogLevel::DEBUG, "Debug"}, - {iox::log::LogLevel::TRACE, "Trace"}}; + const std::initializer_list logEntryLogLevels{{iox::log::LogLevel::Fatal, "Fatal"}, + {iox::log::LogLevel::Error, "Error"}, + {iox::log::LogLevel::Warn, "Warn"}, + {iox::log::LogLevel::Info, "Info"}, + {iox::log::LogLevel::Debug, "Debug"}, + {iox::log::LogLevel::Trace, "Trace"}}; for (const auto& logEntryLogLevel : logEntryLogLevels) { @@ -77,13 +77,13 @@ void testLogLevelThreshold(const iox::log::LogLevel loggerLogLevel, TEST(LoggingLogLevelThreshold_test, LogLevel) { ::testing::Test::RecordProperty("TEST_ID", "829a6634-43be-4fa4-94bf-18d53ce816a9"); - for (const auto loggerLogLevel : {iox::log::LogLevel::OFF, - iox::log::LogLevel::FATAL, - iox::log::LogLevel::ERROR, - iox::log::LogLevel::WARN, - iox::log::LogLevel::INFO, - iox::log::LogLevel::DEBUG, - iox::log::LogLevel::TRACE}) + for (const auto loggerLogLevel : {iox::log::LogLevel::Off, + iox::log::LogLevel::Fatal, + iox::log::LogLevel::Error, + iox::log::LogLevel::Warn, + iox::log::LogLevel::Info, + iox::log::LogLevel::Debug, + iox::log::LogLevel::Trace}) { SCOPED_TRACE(std::string("Logger LogLevel: ") + iox::log::asStringLiteral(loggerLogLevel)); @@ -94,13 +94,13 @@ TEST(LoggingLogLevelThreshold_test, LogLevel) TEST(LoggingLogLevelThreshold_test, LogLevelForPlatform) { ::testing::Test::RecordProperty("TEST_ID", "574007ac-62ed-4cd1-95e8-e18a9f20e1e1"); - for (const auto loggerLogLevel : {iox::log::LogLevel::OFF, - iox::log::LogLevel::FATAL, - iox::log::LogLevel::ERROR, - iox::log::LogLevel::WARN, - iox::log::LogLevel::INFO, - iox::log::LogLevel::DEBUG, - iox::log::LogLevel::TRACE}) + for (const auto loggerLogLevel : {iox::log::LogLevel::Off, + iox::log::LogLevel::Fatal, + iox::log::LogLevel::Error, + iox::log::LogLevel::Warn, + iox::log::LogLevel::Info, + iox::log::LogLevel::Debug, + iox::log::LogLevel::Trace}) { SCOPED_TRACE(std::string("Logger LogLevel: ") + iox::log::asStringLiteral(loggerLogLevel)); diff --git a/iceoryx_hoofs/test/moduletests/test_reporting_logstream.cpp b/iceoryx_hoofs/test/moduletests/test_reporting_logstream.cpp index 8c67968eb2..86dfde4ac0 100644 --- a/iceoryx_hoofs/test/moduletests/test_reporting_logstream.cpp +++ b/iceoryx_hoofs/test/moduletests/test_reporting_logstream.cpp @@ -41,7 +41,7 @@ TEST_F(IoxLogStream_test, CTorDelegatesParameterToLogger) constexpr const char* EXPECTED_FILE{"hypnotoad.hpp"}; constexpr const char* EXPECTED_FUNCTION{"void all_glory_to_the_hypnotoad()"}; constexpr int EXPECTED_LINE{42}; - constexpr auto EXPECTED_LOG_LEVEL{iox::log::LogLevel::WARN}; + constexpr auto EXPECTED_LOG_LEVEL{iox::log::LogLevel::Warn}; iox::log::LogStream(loggerMock, EXPECTED_FILE, EXPECTED_LINE, EXPECTED_FUNCTION, EXPECTED_LOG_LEVEL) << ""; ASSERT_THAT(loggerMock.logs.size(), Eq(1U)); @@ -159,10 +159,10 @@ TEST_F(IoxLogStream_test, StreamOperatorLogLevel) { ::testing::Test::RecordProperty("TEST_ID", "d85b7ef4-35de-4e11-b0fd-f0de6581a9e6"); std::string logValue{"This is the iceoryx logger!"}; - const auto logLevel = iox::log::LogLevel::WARN; + const auto logLevel = iox::log::LogLevel::Warn; LogStreamSut(loggerMock) << logValue << logLevel; - EXPECT_THAT(loggerMock.logs[0].message, StrEq("This is the iceoryx logger!LogLevel::WARN")); + EXPECT_THAT(loggerMock.logs[0].message, StrEq("This is the iceoryx logger!LogLevel::Warn")); } constexpr bool isBigEndian() diff --git a/iceoryx_hoofs/test/moduletests/test_reporting_logstream.hpp b/iceoryx_hoofs/test/moduletests/test_reporting_logstream.hpp index 33c6956d74..2877f6d2b9 100644 --- a/iceoryx_hoofs/test/moduletests/test_reporting_logstream.hpp +++ b/iceoryx_hoofs/test/moduletests/test_reporting_logstream.hpp @@ -29,7 +29,7 @@ class LogStreamSut : public iox::log::LogStream { public: explicit LogStreamSut(iox::log::Logger& logger) - : iox::log::LogStream(logger, "file", 42, "function", iox::log::LogLevel::TRACE) + : iox::log::LogStream(logger, "file", 42, "function", iox::log::LogLevel::Trace) { } }; diff --git a/iceoryx_hoofs/test/moduletests/test_utility_convert.cpp b/iceoryx_hoofs/test/moduletests/test_utility_convert.cpp index d227a84090..444c97a4b1 100644 --- a/iceoryx_hoofs/test/moduletests/test_utility_convert.cpp +++ b/iceoryx_hoofs/test/moduletests/test_utility_convert.cpp @@ -36,25 +36,25 @@ class LongDouble public: static bool Eq(long double a, long double b) { - IOX_LOG(DEBUG, "a: " << a << ", b: " << b); + IOX_LOG(Debug, "a: " << a << ", b: " << b); long double min_val = std::min(std::fabs(a), std::fabs(b)); long double epsilon = std::fabs(min_val - std::nextafter(min_val, static_cast(0))); - IOX_LOG(DEBUG, "epsilon from min_val: " << epsilon); - IOX_LOG(DEBUG, "abs min_val: " << min_val); + IOX_LOG(Debug, "epsilon from min_val: " << epsilon); + IOX_LOG(Debug, "abs min_val: " << min_val); if (epsilon <= 0 || epsilon < std::numeric_limits::min()) { epsilon = std::numeric_limits::min(); } - IOX_LOG(DEBUG, "epsilon: " << epsilon); + IOX_LOG(Debug, "epsilon: " << epsilon); long double abs_diff = std::fabs(a - b); - IOX_LOG(DEBUG, "fabs result: " << abs_diff); + IOX_LOG(Debug, "fabs result: " << abs_diff); bool is_equal = abs_diff <= epsilon; - IOX_LOG(DEBUG, "<< a and b " << ((is_equal) ? "IS" : "IS NOT") << " considered equal! >>"); + IOX_LOG(Debug, "<< a and b " << ((is_equal) ? "IS" : "IS NOT") << " considered equal! >>"); return is_equal; } diff --git a/iceoryx_hoofs/test/stresstests/sofi/test_stress_spsc_sofi.cpp b/iceoryx_hoofs/test/stresstests/sofi/test_stress_spsc_sofi.cpp index 1760c8a4dc..ca6ff1b34a 100644 --- a/iceoryx_hoofs/test/stresstests/sofi/test_stress_spsc_sofi.cpp +++ b/iceoryx_hoofs/test/stresstests/sofi/test_stress_spsc_sofi.cpp @@ -58,7 +58,7 @@ class SpscSofiStress : public Test auto retVal = pthread_setaffinity_np(nativeHandle, sizeof(cpu_set_t), &cpuset); if (retVal != 0) { - IOX_LOG(ERROR, "Error calling pthread_setaffinity_np: " << retVal << "; errno: " << errno); + IOX_LOG(Error, "Error calling pthread_setaffinity_np: " << retVal << "; errno: " << errno); return false; } #else @@ -198,8 +198,8 @@ TEST_F(SpscSofiStress, SimultaneouslyPushAndPopOnEmptySoFi) << "There should be at least 4 times as many trys to pop as actual pops!"; EXPECT_THAT(pushCounter, Eq(popCounter)) << "Push and Pop Counter should be Equal after the Test!"; - IOX_LOG(INFO, "try pop counter: " << tryPopCounter); - IOX_LOG(INFO, "pop counter : " << pushCounter); + IOX_LOG(Info, "try pop counter: " << tryPopCounter); + IOX_LOG(Info, "pop counter : " << pushCounter); } /// @brief This tests a fast pusher and slow popper. @@ -395,8 +395,8 @@ TEST_F(SpscSofiStress, PopFromContinuouslyOverflowingSoFi) EXPECT_THAT(pushCounter / 4, Gt(popCounter)) << "There should be at least 4 times as many pushes as pops!"; EXPECT_THAT(pushCounter, Eq(dataCounter)) << "Push and Data Counter should be Equal after the Test!"; - IOX_LOG(INFO, "push counter: " << pushCounter); - IOX_LOG(INFO, "pop counter : " << popCounter); + IOX_LOG(Info, "push counter: " << pushCounter); + IOX_LOG(Info, "pop counter : " << popCounter); } /// @brief This tests a fast pusher and fast popper. @@ -545,7 +545,7 @@ TEST_F(SpscSofiStress, PushAndPopFromNonOverflowingNonEmptySoFi) << "There should be at least 1000 pushes per millisecond!"; EXPECT_THAT(pushCounter.load(), Eq(popCounter.load())) << "Push and Pop Counter should be Equal after the Test!"; - IOX_LOG(INFO, "push & pop counter: " << pushCounter.load()); + IOX_LOG(Info, "push & pop counter: " << pushCounter.load()); } int main(int argc, char* argv[]) diff --git a/iceoryx_hoofs/test/stresstests/test_mpmc_lockfree_queue_stresstest.cpp b/iceoryx_hoofs/test/stresstests/test_mpmc_lockfree_queue_stresstest.cpp index d21f6f1c26..8325a3a7f0 100644 --- a/iceoryx_hoofs/test/stresstests/test_mpmc_lockfree_queue_stresstest.cpp +++ b/iceoryx_hoofs/test/stresstests/test_mpmc_lockfree_queue_stresstest.cpp @@ -48,7 +48,7 @@ struct Data void print() const { - IOX_LOG(INFO, "data id " << id << " count " << count); + IOX_LOG(Info, "data id " << id << " count " << count); } }; @@ -205,13 +205,13 @@ bool checkTwoConsumerResult(std::list& consumed1, if (!isStrictlyMonotonic(filtered1) || !isStrictlyMonotonic(filtered2)) { - IOX_LOG(INFO, "id " << id << " not strictly monotonic"); + IOX_LOG(Info, "id " << id << " not strictly monotonic"); return false; } if (!isComplete(filtered1, filtered2, static_cast(expectedFinalCount))) { - IOX_LOG(INFO, "id " << id << " incomplete"); + IOX_LOG(Info, "id " << id << " incomplete"); return false; } } diff --git a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/fatal_failure.inl b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/fatal_failure.inl index 6e6e95ee90..d6f6ca0150 100644 --- a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/fatal_failure.inl +++ b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/fatal_failure.inl @@ -41,7 +41,7 @@ inline bool IOX_EXPECT_FATAL_FAILURE(const function_ref testFunction, hasExpectedError = hasPanicked; if (!hasExpectedError) { - IOX_LOG(ERROR, "Expected '" << iox::er::FatalKind::name << "' but it did not happen!"); + IOX_LOG(Error, "Expected '" << iox::er::FatalKind::name << "' but it did not happen!"); } } else if constexpr (std::is_same_v) @@ -49,7 +49,7 @@ inline bool IOX_EXPECT_FATAL_FAILURE(const function_ref testFunction, hasExpectedError = iox::testing::hasEnforceViolation(); if (!hasExpectedError) { - IOX_LOG(ERROR, "Expected '" << iox::er::EnforceViolationKind::name << "' but it did not happen!"); + IOX_LOG(Error, "Expected '" << iox::er::EnforceViolationKind::name << "' but it did not happen!"); } } else if constexpr (std::is_same_v) @@ -57,7 +57,7 @@ inline bool IOX_EXPECT_FATAL_FAILURE(const function_ref testFunction, hasExpectedError = iox::testing::hasAssertViolation(); if (!hasExpectedError) { - IOX_LOG(ERROR, "Expected '" << iox::er::AssertViolationKind::name << "' but it did not happen!"); + IOX_LOG(Error, "Expected '" << iox::er::AssertViolationKind::name << "' but it did not happen!"); } } else @@ -65,7 +65,7 @@ inline bool IOX_EXPECT_FATAL_FAILURE(const function_ref testFunction, hasExpectedError = iox::testing::hasError(expectedError); if (!hasExpectedError) { - IOX_LOG(ERROR, "Expected an '" << expectedError << "' error but it did not happen!"); + IOX_LOG(Error, "Expected an '" << expectedError << "' error but it did not happen!"); } } diff --git a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/logger_mock.hpp b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/logger_mock.hpp index 26afa66b99..6474870fdd 100644 --- a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/logger_mock.hpp +++ b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/logger_mock.hpp @@ -30,7 +30,7 @@ namespace testing { // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) required to be able to easily test custom types #define IOX_LOGSTREAM_MOCK(logger) \ - iox::log::LogStream((logger), "file", 42, "function", iox::log::LogLevel::TRACE).self() + iox::log::LogStream((logger), "file", 42, "function", iox::log::LogLevel::Trace).self() /// @brief This mock can be used to test implementations of LogStream::operator<< for custom types. It should be used /// with the 'IOX_LOGSTREAM_MOCK' macro @@ -55,7 +55,7 @@ class Logger_Mock : public log::TestingLoggerBase std::string file; int line{0}; std::string function; - log::LogLevel logLevel{iox::log::LogLevel::OFF}; + log::LogLevel logLevel{iox::log::LogLevel::Off}; std::string message; }; diff --git a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/testing_logger.hpp b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/testing_logger.hpp index 694af10718..7b4bbfb182 100644 --- a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/testing_logger.hpp +++ b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/testing_logger.hpp @@ -34,7 +34,7 @@ namespace testing /// also be used to check for the occurrence on specific log messages, e.g. when a function is expected to log an error. /// @code /// callToFunctionWhichLogsAnError(); -/// iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported(iox::log::LogLevel::ERROR, [](const auto& +/// iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported(iox::log::LogLevel::Error, [](const auto& /// logMessages){ /// ASSERT_THAT(logMessages.size(), Eq(1U)); /// EXPECT_THAT(logMessages[0], HasSubstr(expectedOutput)); diff --git a/iceoryx_hoofs/testing/testing_logger.cpp b/iceoryx_hoofs/testing/testing_logger.cpp index 73f1589193..952835f4e9 100644 --- a/iceoryx_hoofs/testing/testing_logger.cpp +++ b/iceoryx_hoofs/testing/testing_logger.cpp @@ -36,7 +36,7 @@ void TestingLogger::init() noexcept { static TestingLogger logger; log::Logger::setActiveLogger(logger); - log::Logger::init(log::logLevelFromEnvOr(log::LogLevel::TRACE)); + log::Logger::init(log::logLevelFromEnvOr(log::LogLevel::Trace)); // disable logger output only after initializing the logger to get error messages from initialization // JUSTIFICATION getenv is required for the functionality of the testing logger and will be called only once in main // NOLINTNEXTLINE(concurrency-mt-unsafe) @@ -130,8 +130,8 @@ static void sigHandler(int sig, siginfo_t*, void*) { constexpr const char* COLOR_RESET{"\033[m"}; - std::cout << iox::log::logLevelDisplayColor(iox::log::LogLevel::WARN) - << "Catched signal: " << iox::log::logLevelDisplayColor(iox::log::LogLevel::FATAL); + std::cout << iox::log::logLevelDisplayColor(iox::log::LogLevel::Warn) + << "Catched signal: " << iox::log::logLevelDisplayColor(iox::log::LogLevel::Fatal); switch (sig) { case SIGSEGV: @@ -153,7 +153,7 @@ static void sigHandler(int sig, siginfo_t*, void*) dynamic_cast(log::Logger::get()).printLogBuffer(); std::cout << "\n" - << iox::log::logLevelDisplayColor(iox::log::LogLevel::WARN) + << iox::log::logLevelDisplayColor(iox::log::LogLevel::Warn) << "Aborting execution by causing a SIGSEV with 'longjmp' to prevent triggering the signal handler again!" << COLOR_RESET << "\n" << std::flush; @@ -167,7 +167,7 @@ static void sigHandler(int sig, siginfo_t*, void*) void LogPrinter::OnTestStart(const ::testing::TestInfo&) { dynamic_cast(log::Logger::get()).clearLogBuffer(); - TestingLogger::setLogLevel(log::LogLevel::TRACE); + TestingLogger::setLogLevel(log::LogLevel::Trace); std::set_terminate([]() { std::cout << "Terminate called\n" << std::flush; diff --git a/iceoryx_hoofs/time/include/iox/duration.hpp b/iceoryx_hoofs/time/include/iox/duration.hpp index 1f5bc56912..66c35d7941 100644 --- a/iceoryx_hoofs/time/include/iox/duration.hpp +++ b/iceoryx_hoofs/time/include/iox/duration.hpp @@ -76,9 +76,9 @@ constexpr Duration operator"" _d(unsigned long long int value) noexcept; /// using namespace units::duration_literals; /// auto someDays = 2 * 7_d + 5_ns; /// auto someSeconds = 42_s + 500_ms; -/// IOX_LOG(INFO, someDays); -/// IOX_LOG(INFO, someDays.nanoSeconds() << " ns"); -/// IOX_LOG(INFO, someSeconds.milliSeconds() << " ms"); +/// IOX_LOG(Info, someDays); +/// IOX_LOG(Info, someDays.nanoSeconds() << " ns"); +/// IOX_LOG(Info, someSeconds.milliSeconds() << " ms"); /// @endcode class Duration { diff --git a/iceoryx_hoofs/time/source/duration.cpp b/iceoryx_hoofs/time/source/duration.cpp index 5cc437629e..c552020a5f 100644 --- a/iceoryx_hoofs/time/source/duration.cpp +++ b/iceoryx_hoofs/time/source/duration.cpp @@ -37,7 +37,7 @@ struct timespec Duration::timespec(const TimeSpecReference reference) const noex static_assert(sizeof(uint64_t) >= sizeof(SEC_TYPE), "casting might alter result"); if (this->m_seconds > static_cast(std::numeric_limits::max())) { - IOX_LOG(TRACE, ": Result of conversion would overflow, clamping to max value!"); + IOX_LOG(Trace, ": Result of conversion would overflow, clamping to max value!"); return {std::numeric_limits::max(), NANOSECS_PER_SEC - 1U}; } @@ -63,7 +63,7 @@ struct timespec Duration::timespec(const TimeSpecReference reference) const noex // AXIVION Next Construct AutosarC++19_03-M0.1.2, AutosarC++19_03-M0.1.9, FaultDetection-DeadBranches : False positive! Branching depends on input parameter if (targetTime.m_seconds > static_cast(std::numeric_limits::max())) { - IOX_LOG(TRACE, ": Result of conversion would overflow, clamping to max value!"); + IOX_LOG(Trace, ": Result of conversion would overflow, clamping to max value!"); return {std::numeric_limits::max(), NANOSECS_PER_SEC - 1U}; } diff --git a/iceoryx_hoofs/utility/include/iox/detail/convert.inl b/iceoryx_hoofs/utility/include/iox/detail/convert.inl index 329e594a89..ea6c4d34e0 100644 --- a/iceoryx_hoofs/utility/include/iox/detail/convert.inl +++ b/iceoryx_hoofs/utility/include/iox/detail/convert.inl @@ -84,7 +84,7 @@ inline iox::optional convert::from_string(const char* v) noexcept { if (strlen(v) != 1U) { - IOX_LOG(DEBUG, v << " is not a char"); + IOX_LOG(Debug, v << " is not a char"); return iox::nullopt; } @@ -342,14 +342,14 @@ inline bool convert::is_valid_input(const char* end_ptr, const char* v, const So // invalid string if (v == end_ptr && source_val == 0) { - IOX_LOG(DEBUG, "invalid input"); + IOX_LOG(Debug, "invalid input"); return false; } // end_ptr is not '\0' which means conversion failure at end_ptr if (end_ptr != nullptr && v != end_ptr && *end_ptr != '\0') { - IOX_LOG(DEBUG, "conversion failed at " << end_ptr - v << " : " << *end_ptr); + IOX_LOG(Debug, "conversion failed at " << end_ptr - v << " : " << *end_ptr); return false; } @@ -380,7 +380,7 @@ inline bool convert::is_within_range(const SourceType& source_val) noexcept // out of range (upper bound) if (source_val > std::numeric_limits::max()) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, source_val << " is out of range (upper bound), should be less than " << std::numeric_limits::max()); return false; @@ -388,7 +388,7 @@ inline bool convert::is_within_range(const SourceType& source_val) noexcept // out of range (lower bound) if (source_val < std::numeric_limits::lowest()) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, source_val << " is out of range (lower bound), should be larger than " << std::numeric_limits::lowest()); return false; @@ -417,19 +417,19 @@ inline bool convert::is_valid_errno(decltype(errno) errno_cache, const char* v) { if (errno_cache == ERANGE) { - IOX_LOG(DEBUG, "ERANGE triggered during conversion of string: '" << v << "'"); + IOX_LOG(Debug, "ERANGE triggered during conversion of string: '" << v << "'"); return false; } if (errno_cache == EINVAL) { - IOX_LOG(DEBUG, "EINVAL triggered during conversion of string: " << v); + IOX_LOG(Debug, "EINVAL triggered during conversion of string: " << v); return false; } if (errno_cache != 0) { - IOX_LOG(DEBUG, "Unexpected errno: " << errno_cache << ". The input string is: " << v); + IOX_LOG(Debug, "Unexpected errno: " << errno_cache << ". The input string is: " << v); return false; } diff --git a/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp b/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp index 0c0d1460b7..5fd58f247a 100644 --- a/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp +++ b/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp @@ -33,7 +33,7 @@ namespace iox /// 5:hello3:1236:123.01 /// @code /// auto serial = iox::Serialization::create("fuu", 123, 12.12f, 'c'); -/// IOX_LOG(INFO, serial.toString()); +/// IOX_LOG(Info, serial.toString()); /// /// std::string v1; /// int v2; diff --git a/iceoryx_hoofs/vocabulary/include/iox/detail/semantic_string.inl b/iceoryx_hoofs/vocabulary/include/iox/detail/semantic_string.inl index a6ab402686..e84d007265 100644 --- a/iceoryx_hoofs/vocabulary/include/iox/detail/semantic_string.inl +++ b/iceoryx_hoofs/vocabulary/include/iox/detail/semantic_string.inl @@ -45,7 +45,7 @@ SemanticString Capacity) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Unable to create semantic string since the value \"" << value << "\" exceeds the maximum valid length of " << Capacity << "."); return err(SemanticStringError::ExceedsMaximumLength); @@ -55,14 +55,14 @@ SemanticString::string(TruncateToCapacity_t, const char* const other, c m_rawstring[Capacity] = '\0'; m_rawstringSize = Capacity; - IOX_LOG(WARN, + IOX_LOG(Warn, "Constructor truncates the last " << count - Capacity << " characters of " << other << ", because the char array length is larger than the capacity."); } @@ -177,7 +177,7 @@ inline string& string::operator=(const char (&rhs)[N]) noexc m_rawstringSize = Capacity; IOX_LOG( - WARN, + Warn, "iox::string: Assignment of array which is not zero-terminated! Last value of array overwritten with 0!"); } @@ -229,7 +229,7 @@ inline bool string::unsafe_assign(const char* const str) noexcept const uint64_t strSize{strnlen(str, Capacity + 1U)}; if (Capacity < strSize) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Assignment failed. The given cstring is larger (" << strSize << ") than the capacity (" << Capacity << ") of the fixed string."); return false; @@ -414,7 +414,7 @@ inline IsStringOrCharArrayOrChar string::unsafe_append(const if (tSize > clampedTSize) { - IOX_LOG(DEBUG, "Appending failed because the sum of sizes exceeds this' capacity."); + IOX_LOG(Debug, "Appending failed because the sum of sizes exceeds this' capacity."); return false; } @@ -438,7 +438,7 @@ inline IsStringOrCharArrayOrChar&> string::append( std::memcpy(&(m_rawstring[m_rawstringSize]), tData, static_cast(clampedTSize)); if (tSize > clampedTSize) { - IOX_LOG(WARN, + IOX_LOG(Warn, "The last " << (tSize - clampedTSize) << " characters of " << tData << " are truncated, because the length is larger than the capacity."); } @@ -455,7 +455,7 @@ inline string& string::append(TruncateToCapacity_t, char cst { if (m_rawstringSize == Capacity) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Appending of " << static_cast(cstr) << " failed because this' capacity would be exceeded."); return *this; diff --git a/iceoryx_hoofs/vocabulary/include/iox/detail/variant.inl b/iceoryx_hoofs/vocabulary/include/iox/detail/variant.inl index 0957ca7fa6..537dd48a0a 100644 --- a/iceoryx_hoofs/vocabulary/include/iox/detail/variant.inl +++ b/iceoryx_hoofs/vocabulary/include/iox/detail/variant.inl @@ -304,7 +304,7 @@ template // AXIVION Next Construct AutosarC++19_03-A3.9.1 : see at declaration in header inline void variant::error_message(const char* source, const char* msg) noexcept { - IOX_LOG(ERROR, source << " ::: " << msg); + IOX_LOG(Error, source << " ::: " << msg); } template diff --git a/iceoryx_hoofs/vocabulary/include/iox/expected.hpp b/iceoryx_hoofs/vocabulary/include/iox/expected.hpp index 62c079c70e..e3caf17e33 100644 --- a/iceoryx_hoofs/vocabulary/include/iox/expected.hpp +++ b/iceoryx_hoofs/vocabulary/include/iox/expected.hpp @@ -289,7 +289,7 @@ class [[nodiscard]] expected final : public FunctionalInterface frodo(ok(45)); /// *frodo += 12; - /// IOX_LOG(INFO, *frodo); // prints 57 + /// IOX_LOG(Info, *frodo); // prints 57 /// @endcode template enable_if_non_void_t& operator*() noexcept; @@ -302,7 +302,7 @@ class [[nodiscard]] expected final : public FunctionalInterface frodo(ok(45)); /// *frodo += 12; - /// IOX_LOG(INFO, *frodo); // prints 57 + /// IOX_LOG(Info, *frodo); // prints 57 /// @endcode template const enable_if_non_void_t& operator*() const noexcept; diff --git a/iceoryx_hoofs/vocabulary/include/iox/variant.hpp b/iceoryx_hoofs/vocabulary/include/iox/variant.hpp index fba2f16432..9761f527c3 100644 --- a/iceoryx_hoofs/vocabulary/include/iox/variant.hpp +++ b/iceoryx_hoofs/vocabulary/include/iox/variant.hpp @@ -90,17 +90,17 @@ static constexpr uint64_t INVALID_VARIANT_INDEX{std::numeric_limits::m /// else if ( someVariant.index() == 1) /// { /// auto blubb = someVariant.template get_at_index<1>(); -/// IOX_LOG(INFO, *blubb); +/// IOX_LOG(Info, *blubb); /// /// auto sameAsBlubb = someVariant.get(); -/// IOX_LOG(INFO, *sameAsBlubb); +/// IOX_LOG(Info, *sameAsBlubb); /// } /// /// // .. do stuff /// /// int defaultValue = 123; /// int * fuu = someVariant.get_if(&defaultValue); -/// IOX_LOG(INFO, *fuu); +/// IOX_LOG(Info, *fuu); /// /// @endcode template diff --git a/iceoryx_posh/experimental/source/node.cpp b/iceoryx_posh/experimental/source/node.cpp index e9a9d56d2b..75699b03e0 100644 --- a/iceoryx_posh/experimental/source/node.cpp +++ b/iceoryx_posh/experimental/source/node.cpp @@ -47,7 +47,7 @@ NodeBuilder&& NodeBuilder::domain_id_from_env() && noexcept .evaluate(); if (result.has_error() && result.error().errnum == ERANGE) { - IOX_LOG(INFO, + IOX_LOG(Info, "Invalid value for 'IOX_DOMAIN_ID' environment variable! Must be in the range of '0' to '65535'!"); } @@ -66,8 +66,8 @@ NodeBuilder&& NodeBuilder::domain_id_from_env() && noexcept iox::convert::from_string(domain_id_string.c_str()) .and_then([this](const auto& env_domain_id) { m_domain_id.emplace(env_domain_id); }) .or_else([&domain_id_string]() { - IOX_LOG(INFO, "Invalid value for 'IOX_DOMAIN_ID' environment variable!'"); - IOX_LOG(INFO, "Found: '" << domain_id_string << "'! Allowed are integer from '0' to '65535'!"); + IOX_LOG(Info, "Invalid value for 'IOX_DOMAIN_ID' environment variable!'"); + IOX_LOG(Info, "Found: '" << domain_id_string << "'! Allowed are integer from '0' to '65535'!"); }); } return std::move(*this); @@ -78,7 +78,7 @@ NodeBuilder&& NodeBuilder::domain_id_from_env_or(const DomainId domainId) && noe std::move(*this).domain_id_from_env(); if (!m_domain_id.has_value()) { - IOX_LOG(INFO, + IOX_LOG(Info, "Could not get domain ID from 'IOX_DOMAIN_ID' and using '" << static_cast(domainId) << "' as fallback!"); m_domain_id.emplace(domainId); @@ -134,9 +134,9 @@ Node::Node(const NodeName_t& name, runtime::IpcRuntimeInterface&& runtime_interface, optional&& ipc_interface) noexcept : m_runtime(unique_ptr{ - new runtime::PoshRuntimeImpl{make_optional(&name), - {std::move(runtime_interface), std::move(ipc_interface)}}, - [&](auto* const rt) { delete rt; }}) + new runtime::PoshRuntimeImpl{make_optional(&name), + {std::move(runtime_interface), std::move(ipc_interface)}}, + [&](auto* const rt) { delete rt; }}) { } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl index 1186ca18ce..f4a194de51 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl @@ -80,7 +80,7 @@ inline SharedMemoryObjectType MePooSegment ShmName_t::capacity()) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "The payload segment with the name '" << writerGroup.getName().size() << "' would exceed the maximum allowed size when used with the '" << shmName @@ -106,7 +106,7 @@ inline SharedMemoryObjectType MePooSegmentm_segmentId = static_cast(maybeSegmentId.value()); this->m_segmentSize = sharedMemoryObject.get_size().expect("Failed to get SHM size."); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Roudi registered payload data segment " << iox::log::hex(sharedMemoryObject.getBaseAddress()) << " with size " << m_segmentSize << " to id " << m_segmentId); diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/segment_manager.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/segment_manager.inl index 6f1e9cac7d..aed340cb8f 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/segment_manager.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/segment_manager.inl @@ -35,7 +35,7 @@ inline SegmentManager::SegmentManager(const SegmentConfig& segmentC { if (segmentConfig.m_sharedMemorySegments.capacity() > m_segmentContainer.capacity()) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Trying to add " << segmentConfig.m_sharedMemorySegments.capacity() << " segments while the 'SegmentManager' can manage only " << m_segmentContainer.capacity()); diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl index 31e9db48d9..b56405931d 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl @@ -108,7 +108,7 @@ inline void BaseClient::enableState(TriggerHandleT&& trig if (m_trigger) { IOX_LOG( - WARN, + Warn, "The client is already attached with either the ClientState::HAS_RESPONSE or " "ClientEvent::RESPONSE_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with ClientState::HAS_RESPONSE. Best practice is to call detach first."); @@ -157,7 +157,7 @@ inline void BaseClient::enableEvent(TriggerHandleT&& trig case ClientEvent::RESPONSE_RECEIVED: if (m_trigger) { - IOX_LOG(WARN, + IOX_LOG(Warn, "The client is already attached with either the ClientState::HAS_RESPONSE or " "ClientEvent::RESPONSE_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with ClientEvent::RESPONSE_RECEIVED. Best practice is to call detach " diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_server.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_server.inl index d271dae8ec..4f6c47076f 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_server.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_server.inl @@ -112,7 +112,7 @@ inline void BaseServer::enableState(TriggerHandleT&& trig if (m_trigger) { IOX_LOG( - WARN, + Warn, "The server is already attached with either the ServerState::HAS_REQUEST or " "ServerEvent::REQUEST_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with ServerState::HAS_REQUEST. Best practice is to call detach first."); @@ -161,7 +161,7 @@ inline void BaseServer::enableEvent(TriggerHandleT&& trig case ServerEvent::REQUEST_RECEIVED: if (m_trigger) { - IOX_LOG(WARN, + IOX_LOG(Warn, "The server is already attached with either the ServerState::HAS_REQUEST or " "ServerEvent::REQUEST_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with ServerEvent::REQUEST_RECEIVED. Best practice is to call detach " diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl index 409754f6f0..8d9803900e 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_subscriber.inl @@ -41,7 +41,7 @@ template inline BaseSubscriber::BaseSubscriber(const capro::ServiceDescription& service, const SubscriberOptions& subscriberOptions) noexcept : BaseSubscriber( - port_t{iox::runtime::PoshRuntime::getInstance().getMiddlewareSubscriber(service, subscriberOptions)}) + port_t{iox::runtime::PoshRuntime::getInstance().getMiddlewareSubscriber(service, subscriberOptions)}) { } @@ -126,7 +126,7 @@ inline void BaseSubscriber::enableState(iox::popo::TriggerHandle&& trigg if (m_trigger) { IOX_LOG( - WARN, + Warn, "The subscriber is already attached with either the SubscriberState::HAS_DATA or " "SubscriberEvent::DATA_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with SubscriberState::HAS_DATA. Best practice is to call detach first."); @@ -175,7 +175,7 @@ inline void BaseSubscriber::enableEvent(iox::popo::TriggerHandle&& trigg case SubscriberEvent::DATA_RECEIVED: if (m_trigger) { - IOX_LOG(WARN, + IOX_LOG(Warn, "The subscriber is already attached with either the SubscriberState::HAS_DATA or " "SubscriberEvent::DATA_RECEIVED to a WaitSet/Listener. Detaching it from previous one and " "attaching it to the new one with SubscriberEvent::DATA_RECEIVED. Best practice is to call detach " diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor.inl index 9ad0349923..7db5a0bcc3 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor.inl @@ -71,7 +71,7 @@ ChunkDistributor::tryAddQueue(not_null getMembers()->m_historyCapacity) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Chunk history request exceeds history capacity! Request is " << requestedHistory << ". Capacity is " << getMembers()->m_historyCapacity << "."); } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.inl index cfff234dc6..1dcc1ad2d5 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.inl @@ -42,7 +42,7 @@ inline ChunkDistributorData ChunkQueuePopper::tryPop auto receivedChunkHeaderVersion = chunk.getChunkHeader()->chunkHeaderVersion(); if (receivedChunkHeaderVersion != mepoo::ChunkHeader::CHUNK_HEADER_VERSION) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Received chunk with CHUNK_HEADER_VERSION '" << receivedChunkHeaderVersion << "' but expected '" << mepoo::ChunkHeader::CHUNK_HEADER_VERSION << "'! Dropping chunk!"); diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp index c5de76cb24..e69d830fa5 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/variant_queue.hpp @@ -59,12 +59,12 @@ enum class VariantQueueTypes : uint64_t /// // overflow case /// auto status = nonOverflowingQueue.push(123); /// if ( !status ) { -/// IOX_LOG(INFO, "queue is full"); +/// IOX_LOG(Info, "queue is full"); /// } /// /// auto overriddenElement = overflowingQueue.push(123); /// if ( overriddenElement->has_value() ) { -/// IOX_LOG(INFO, "element " << overriddenElement->value() << " was overridden"); +/// IOX_LOG(Info, "element " << overriddenElement->value() << " was overridden"); /// } /// @endcode template diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl index bf9f8445cf..605de75bc2 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl @@ -34,7 +34,7 @@ inline expected Request::send() noexcept } else { - IOX_LOG(ERROR, "Tried to send empty Request! Might be an already sent or moved Request!"); + IOX_LOG(Error, "Tried to send empty Request! Might be an already sent or moved Request!"); IOX_REPORT(PoshError::POSH__SENDING_EMPTY_REQUEST, iox::er::RUNTIME_ERROR); return err(ClientSendError::INVALID_REQUEST); } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/response.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/response.inl index 828dece13c..5e92ce357f 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/response.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/response.inl @@ -34,7 +34,7 @@ inline expected Response::send() noexcept } else { - IOX_LOG(ERROR, "Tried to send empty Response! Might be an already sent or moved Response!"); + IOX_LOG(Error, "Tried to send empty Response! Might be an already sent or moved Response!"); IOX_REPORT(PoshError::POSH__SENDING_EMPTY_RESPONSE, iox::er::RUNTIME_ERROR); return err(ServerSendError::INVALID_RESPONSE); } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl index b5f696e861..4f16b6583e 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/sample.inl @@ -34,7 +34,7 @@ void Sample::publish() noexcept } else { - IOX_LOG(ERROR, "Tried to publish empty Sample! Might be an already published or moved Sample!"); + IOX_LOG(Error, "Tried to publish empty Sample! Might be an already published or moved Sample!"); IOX_REPORT(PoshError::POSH__PUBLISHING_EMPTY_SAMPLE, iox::er::RUNTIME_ERROR); } } diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/mempool_introspection.inl b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/mempool_introspection.inl index b7a568b9f3..2d20a2596a 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/mempool_introspection.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/mempool_introspection.inl @@ -93,7 +93,7 @@ inline void MemPoolIntrospection:: CHUNK_NO_USER_HEADER_ALIGNMENT); if (maybeChunkHeader.has_error()) { - IOX_LOG(WARN, "Cannot allocate chunk for mempool introspection!"); + IOX_LOG(Warn, "Cannot allocate chunk for mempool introspection!"); IOX_REPORT(PoshError::MEPOO__CANNOT_ALLOCATE_CHUNK, iox::er::RUNTIME_ERROR); return; } @@ -124,7 +124,7 @@ inline void MemPoolIntrospection:: } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "Mempool Introspection Container full, Mempool Introspection Data not fully updated! " << (id + 1U) << " of " << m_segmentManager->m_segmentContainer.size() << " memory segments sent."); @@ -136,7 +136,7 @@ inline void MemPoolIntrospection:: } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "Mempool Introspection Container full, Mempool Introspection Data not fully updated! " << (id + 1U) << " of " << m_segmentManager->m_segmentContainer.size() << " memory segments sent."); diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp index ee11585a3c..41dc6f54a4 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi.hpp @@ -121,7 +121,7 @@ class RouDi ScopeGuard m_roudiMemoryManagerCleaner{[this]() { if (this->m_roudiMemoryInterface->destroyMemory().has_error()) { - IOX_LOG(WARN, "unable to cleanup roudi memory interface"); + IOX_LOG(Warn, "unable to cleanup roudi memory interface"); }; }}; PortManager* m_portManager{nullptr}; diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_message.inl b/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_message.inl index 5935ffd6fb..556a52ea86 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_message.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_message.inl @@ -31,7 +31,7 @@ void IpcMessage::addEntry(const T& entry) noexcept if (!isValidEntry(newEntry.str())) { - IOX_LOG(ERROR, "\'" << newEntry.str().c_str() << "\' is an invalid IPC channel entry"); + IOX_LOG(Error, "\'" << newEntry.str().c_str() << "\' is an invalid IPC channel entry"); m_isValid = false; } else diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp b/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp index 7baa25b098..aadbf61b49 100644 --- a/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp +++ b/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp @@ -35,7 +35,7 @@ struct RouDiConfig /// RouDiEnv bool sharesAddressSpaceWithApplications{false}; /// @brief the log level used by RouDi - iox::log::LogLevel logLevel{iox::log::LogLevel::INFO}; + iox::log::LogLevel logLevel{iox::log::LogLevel::Info}; /// @brief Specifies whether RouDi monitors the process for abnormal termination roudi::MonitoringMode monitoringMode{roudi::MonitoringMode::OFF}; /// @brief Specifies to which level the compatibility of applications trying to register with RouDi should be diff --git a/iceoryx_posh/source/gateway/toml_gateway_config_parser.cpp b/iceoryx_posh/source/gateway/toml_gateway_config_parser.cpp index da272cdd53..36858e9cd4 100644 --- a/iceoryx_posh/source/gateway/toml_gateway_config_parser.cpp +++ b/iceoryx_posh/source/gateway/toml_gateway_config_parser.cpp @@ -33,7 +33,7 @@ iox::config::TomlGatewayConfigParser::parse(const roudi::ConfigFilePathString_t& // Set defaults if no path provided. if (path.size() == 0) { - IOX_LOG(WARN, "Invalid file path provided. Falling back to built-in config."); + IOX_LOG(Warn, "Invalid file path provided. Falling back to built-in config."); config.setDefaults(); return iox::ok(config); } @@ -42,17 +42,17 @@ iox::config::TomlGatewayConfigParser::parse(const roudi::ConfigFilePathString_t& iox::FileReader configFile(into(path), "", FileReader::ErrorMode::Ignore); if (!configFile.isOpen()) { - IOX_LOG(WARN, "Gateway config file not found at: '" << path << "'. Falling back to built-in config."); + IOX_LOG(Warn, "Gateway config file not found at: '" << path << "'. Falling back to built-in config."); config.setDefaults(); return iox::ok(config); } - IOX_LOG(INFO, "Using gateway config at: " << path); + IOX_LOG(Info, "Using gateway config at: " << path); std::ifstream fileStream{path.c_str()}; if (!fileStream.is_open()) { - IOX_LOG(ERROR, "Could not open config file from path '" << path << "'"); + IOX_LOG(Error, "Could not open config file from path '" << path << "'"); return iox::err(iox::config::TomlGatewayConfigParseError::FILE_OPEN_FAILED); } @@ -91,7 +91,7 @@ iox::config::TomlGatewayConfigParser::parse(std::istream& stream, GatewayConfig& { auto parserError = iox::config::TomlGatewayConfigParseError::EXCEPTION_IN_PARSER; auto errorStringIndex = static_cast(parserError); - IOX_LOG(WARN, + IOX_LOG(Warn, iox::config::TOML_GATEWAY_CONFIG_FILE_PARSE_ERROR_STRINGS[errorStringIndex] << ": " << parserException.what()); diff --git a/iceoryx_posh/source/mepoo/mem_pool.cpp b/iceoryx_posh/source/mepoo/mem_pool.cpp index f2c074267c..da60994266 100644 --- a/iceoryx_posh/source/mepoo/mem_pool.cpp +++ b/iceoryx_posh/source/mepoo/mem_pool.cpp @@ -64,7 +64,7 @@ MemPool::MemPool(const greater_or_equal chunkS } else { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Chunk size must be multiple of '" << CHUNK_MEMORY_ALIGNMENT << "'! Requested size is " << chunkSize << " for " << numberOfChunks << " chunks!"); IOX_REPORT_FATAL(PoshError::MEPOO__MEMPOOL_CHUNKSIZE_MUST_BE_MULTIPLE_OF_CHUNK_MEMORY_ALIGNMENT); @@ -88,7 +88,7 @@ void* MemPool::getChunk() noexcept uint32_t index{0U}; if (!m_freeIndices.pop(index)) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Mempool [m_chunkSize = " << m_chunkSize << ", numberOfChunks = " << m_numberOfChunks << ", used_chunks = " << m_usedChunks.load() << " ] has no more space left"); return nullptr; @@ -115,7 +115,7 @@ MemPool::pointerToIndex(const void* const chunk, const uint64_t chunkSize, const static_cast(static_cast(chunk) - static_cast(rawMemoryBase)); if (offset % chunkSize != 0) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Trying to convert a pointer to an index which is not aligned to the array! Base address: " << iox::log::hex(rawMemoryBase) << "; item size: " << chunkSize << "; pointer address: " << iox::log::hex(chunk)); @@ -132,7 +132,7 @@ void MemPool::freeChunk(const void* chunk) noexcept const auto offsetToLastChunk = m_chunkSize * (m_numberOfChunks - 1U); if (chunk < memPoolStartAddress) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Try to free chunk with address " << iox::log::hex(chunk) << " while the memory pool starts at address " << iox::log::hex(memPoolStartAddress)); IOX_PANIC("Invalid chunk to free"); @@ -140,7 +140,7 @@ void MemPool::freeChunk(const void* chunk) noexcept if (chunk > static_cast(memPoolStartAddress) + offsetToLastChunk) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Try to free chunk with address " << iox::log::hex(chunk) << " while the last valid memory pool address is " << iox::log::hex(memPoolStartAddress)); diff --git a/iceoryx_posh/source/mepoo/memory_manager.cpp b/iceoryx_posh/source/mepoo/memory_manager.cpp index 38a8bbf59c..85e96f3e18 100644 --- a/iceoryx_posh/source/mepoo/memory_manager.cpp +++ b/iceoryx_posh/source/mepoo/memory_manager.cpp @@ -46,13 +46,13 @@ void MemoryManager::addMemPool(BumpAllocator& managementAllocator, uint64_t adjustedChunkSize = sizeWithChunkHeaderStruct(static_cast(chunkPayloadSize)); if (m_denyAddMemPool) { - IOX_LOG(FATAL, "After the generation of the chunk management pool you are not allowed to create new mempools."); + IOX_LOG(Fatal, "After the generation of the chunk management pool you are not allowed to create new mempools."); IOX_REPORT_FATAL(iox::PoshError::MEPOO__MEMPOOL_ADDMEMPOOL_AFTER_GENERATECHUNKMANAGEMENTPOOL); } else if (m_memPoolVector.size() > 0 && adjustedChunkSize <= m_memPoolVector.back().getChunkSize()) { IOX_LOG( - FATAL, + Fatal, "The following mempools were already added to the mempool handler:" << [this](auto& log) -> auto& { this->printMemPoolVector(log); return log; @@ -165,7 +165,7 @@ expected MemoryManager::getChunk(const ChunkS if (m_memPoolVector.size() == 0) { - IOX_LOG(ERROR, "There are no mempools available!"); + IOX_LOG(Error, "There are no mempools available!"); IOX_REPORT(iox::PoshError::MEPOO__MEMPOOL_GETCHUNK_CHUNK_WITHOUT_MEMPOOL, iox::er::RUNTIME_ERROR); return err(Error::NO_MEMPOOLS_AVAILABLE); @@ -173,7 +173,7 @@ expected MemoryManager::getChunk(const ChunkS else if (memPoolPointer == nullptr) { IOX_LOG( - ERROR, + Error, "The following mempools are available:" << [this](auto& log) -> auto& { this->printMemPoolVector(log); return log; @@ -186,7 +186,7 @@ expected MemoryManager::getChunk(const ChunkS else if (chunk == nullptr) { IOX_LOG( - ERROR, + Error, "MemoryManager: unable to acquire a chunk with a chunk-payload size of " << chunkSettings.userPayloadSize() << "The following mempools are available:" << [this](auto& log) -> auto& { diff --git a/iceoryx_posh/source/mepoo/mepoo_config.cpp b/iceoryx_posh/source/mepoo/mepoo_config.cpp index 3d3627dfb4..a225bf2a3c 100644 --- a/iceoryx_posh/source/mepoo/mepoo_config.cpp +++ b/iceoryx_posh/source/mepoo/mepoo_config.cpp @@ -36,7 +36,7 @@ void MePooConfig::addMemPool(MePooConfig::Entry entry) noexcept } else { - IOX_LOG(FATAL, "Maxmimum number of mempools reached, no more mempools available"); + IOX_LOG(Fatal, "Maxmimum number of mempools reached, no more mempools available"); IOX_REPORT_FATAL(PoshError::MEPOO__MAXIMUM_NUMBER_OF_MEMPOOLS_REACHED); } } diff --git a/iceoryx_posh/source/popo/building_blocks/condition_notifier.cpp b/iceoryx_posh/source/popo/building_blocks/condition_notifier.cpp index 4b1c07d768..7174331f4c 100644 --- a/iceoryx_posh/source/popo/building_blocks/condition_notifier.cpp +++ b/iceoryx_posh/source/popo/building_blocks/condition_notifier.cpp @@ -29,7 +29,7 @@ ConditionNotifier::ConditionNotifier(ConditionVariableData& condVarDataRef, cons { if (index >= MAX_NUMBER_OF_NOTIFIERS) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "The provided index " << index << " is too large. The index has to be in the range of [0, " << MAX_NUMBER_OF_NOTIFIERS << "[."); IOX_REPORT_FATAL(PoshError::POPO__CONDITION_NOTIFIER_INDEX_TOO_LARGE); diff --git a/iceoryx_posh/source/popo/building_blocks/locking_policy.cpp b/iceoryx_posh/source/popo/building_blocks/locking_policy.cpp index 36066c4609..f33bf54afe 100644 --- a/iceoryx_posh/source/popo/building_blocks/locking_policy.cpp +++ b/iceoryx_posh/source/popo/building_blocks/locking_policy.cpp @@ -36,7 +36,7 @@ void ThreadSafePolicy::lock() const noexcept { if (!m_lock->lock()) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Locking of an inter-process mutex failed! This indicates that the application holding the lock " "was terminated or the resources were cleaned up by RouDi due to an unresponsive application."); IOX_REPORT_FATAL(PoshError::POPO__CHUNK_LOCKING_ERROR); @@ -47,7 +47,7 @@ void ThreadSafePolicy::unlock() const noexcept { if (!m_lock->unlock()) { - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Unlocking of an inter-process mutex failed! This indicates that the resources were cleaned up " "by RouDi due to an unresponsive application."); IOX_REPORT_FATAL(PoshError::POPO__CHUNK_UNLOCKING_ERROR); diff --git a/iceoryx_posh/source/popo/ports/client_port_roudi.cpp b/iceoryx_posh/source/popo/ports/client_port_roudi.cpp index 35e1e47bb2..076a09ad68 100644 --- a/iceoryx_posh/source/popo/ports/client_port_roudi.cpp +++ b/iceoryx_posh/source/popo/ports/client_port_roudi.cpp @@ -113,7 +113,7 @@ ClientPortRouDi::dispatchCaProMessageAndGetPossibleResponse(const capro::CaproMe void ClientPortRouDi::handleCaProProtocolViolation(const iox::capro::CaproMessageType messageType) noexcept { // this shouldn't be reached - IOX_LOG(FATAL, + IOX_LOG(Fatal, "CaPro Protocol Violation! Got '" << messageType << "' in '" << getMembers()->m_connectionState.load(std::memory_order_relaxed) << "'"); IOX_REPORT_FATAL(PoshError::POPO__CAPRO_PROTOCOL_ERROR); diff --git a/iceoryx_posh/source/popo/ports/client_port_user.cpp b/iceoryx_posh/source/popo/ports/client_port_user.cpp index 29cc110809..3ddf8f24d8 100644 --- a/iceoryx_posh/source/popo/ports/client_port_user.cpp +++ b/iceoryx_posh/source/popo/ports/client_port_user.cpp @@ -72,7 +72,7 @@ expected ClientPortUser::sendRequest(RequestHeader* const { if (requestHeader == nullptr) { - IOX_LOG(ERROR, "Attempted to send a nullptr request!"); + IOX_LOG(Error, "Attempted to send a nullptr request!"); IOX_REPORT(PoshError::POPO__CLIENT_PORT_INVALID_REQUEST_TO_SEND_FROM_USER, iox::er::RUNTIME_ERROR); return err(ClientSendError::INVALID_REQUEST); } @@ -81,14 +81,14 @@ expected ClientPortUser::sendRequest(RequestHeader* const if (!connectRequested) { releaseRequest(requestHeader); - IOX_LOG(WARN, "Try to send request without being connected!"); + IOX_LOG(Warn, "Try to send request without being connected!"); return err(ClientSendError::NO_CONNECT_REQUESTED); } auto numberOfReceiver = m_chunkSender.send(requestHeader->getChunkHeader()); if (numberOfReceiver == 0U) { - IOX_LOG(WARN, "Try to send request but server is not available!"); + IOX_LOG(Warn, "Try to send request but server is not available!"); return err(ClientSendError::SERVER_NOT_AVAILABLE); } diff --git a/iceoryx_posh/source/popo/ports/server_port_roudi.cpp b/iceoryx_posh/source/popo/ports/server_port_roudi.cpp index 1d91fe5dad..bb45078322 100644 --- a/iceoryx_posh/source/popo/ports/server_port_roudi.cpp +++ b/iceoryx_posh/source/popo/ports/server_port_roudi.cpp @@ -92,7 +92,7 @@ ServerPortRouDi::dispatchCaProMessageAndGetPossibleResponse(const capro::CaproMe void ServerPortRouDi::handleCaProProtocolViolation(const capro::CaproMessageType messageType) const noexcept { // this shouldn't be reached - IOX_LOG(FATAL, + IOX_LOG(Fatal, "CaPro Protocol Violation! Got '" << messageType << "' with offer state '" << (getMembers()->m_offered ? "OFFERED" : "NOT OFFERED") << "'!"); IOX_REPORT_FATAL(PoshError::POPO__CAPRO_PROTOCOL_ERROR); @@ -114,7 +114,7 @@ ServerPortRouDi::handleCaProMessageForStateOffered(const capro::CaproMessage& ca case capro::CaproMessageType::CONNECT: if (caProMessage.m_chunkQueueData == nullptr) { - IOX_LOG(WARN, "No client response queue passed to server"); + IOX_LOG(Warn, "No client response queue passed to server"); IOX_REPORT(PoshError::POPO__SERVER_PORT_NO_CLIENT_RESPONSE_QUEUE_TO_CONNECT, iox::er::RUNTIME_ERROR); } else diff --git a/iceoryx_posh/source/popo/ports/server_port_user.cpp b/iceoryx_posh/source/popo/ports/server_port_user.cpp index 193935ab1c..d242d803f7 100644 --- a/iceoryx_posh/source/popo/ports/server_port_user.cpp +++ b/iceoryx_posh/source/popo/ports/server_port_user.cpp @@ -64,7 +64,7 @@ void ServerPortUser::releaseRequest(const RequestHeader* const requestHeader) no } else { - IOX_LOG(ERROR, "Provided RequestHeader is a nullptr"); + IOX_LOG(Error, "Provided RequestHeader is a nullptr"); IOX_REPORT(PoshError::POPO__SERVER_PORT_INVALID_REQUEST_TO_RELEASE_FROM_USER, iox::er::RUNTIME_ERROR); } } @@ -118,7 +118,7 @@ void ServerPortUser::releaseResponse(const ResponseHeader* const responseHeader) } else { - IOX_LOG(ERROR, "Provided ResponseHeader is a nullptr"); + IOX_LOG(Error, "Provided ResponseHeader is a nullptr"); IOX_REPORT(PoshError::POPO__SERVER_PORT_INVALID_RESPONSE_TO_FREE_FROM_USER, iox::er::RUNTIME_ERROR); } } @@ -127,7 +127,7 @@ expected ServerPortUser::sendResponse(ResponseHeader* con { if (responseHeader == nullptr) { - IOX_LOG(ERROR, "Provided ResponseHeader is a nullptr"); + IOX_LOG(Error, "Provided ResponseHeader is a nullptr"); IOX_REPORT(PoshError::POPO__SERVER_PORT_INVALID_RESPONSE_TO_SEND_FROM_USER, iox::er::RUNTIME_ERROR); return err(ServerSendError::INVALID_RESPONSE); } @@ -136,7 +136,7 @@ expected ServerPortUser::sendResponse(ResponseHeader* con if (!offerRequested) { releaseResponse(responseHeader); - IOX_LOG(WARN, "Try to send response without having offered!"); + IOX_LOG(Warn, "Try to send response without having offered!"); return err(ServerSendError::NOT_OFFERED); } @@ -151,7 +151,7 @@ expected ServerPortUser::sendResponse(ResponseHeader* con if (!responseSent) { - IOX_LOG(WARN, "Could not deliver to client! Client not available anymore!"); + IOX_LOG(Warn, "Could not deliver to client! Client not available anymore!"); return err(ServerSendError::CLIENT_NOT_AVAILABLE); } diff --git a/iceoryx_posh/source/roudi/application/roudi_app.cpp b/iceoryx_posh/source/roudi/application/roudi_app.cpp index 1bebc9da8f..fc7b54f48d 100644 --- a/iceoryx_posh/source/roudi/application/roudi_app.cpp +++ b/iceoryx_posh/source/roudi/application/roudi_app.cpp @@ -41,17 +41,17 @@ RouDiApp::RouDiApp(const IceoryxConfig& config) noexcept iox::log::Logger::setLogLevel(m_config.logLevel); auto& roudiConfig = static_cast(m_config); - IOX_LOG(TRACE, "RouDi config is:"); - IOX_LOG(TRACE, " Domain ID = " << static_cast(roudiConfig.domainId)); - IOX_LOG(TRACE, + IOX_LOG(Trace, "RouDi config is:"); + IOX_LOG(Trace, " Domain ID = " << static_cast(roudiConfig.domainId)); + IOX_LOG(Trace, " Unique RouDi ID = " << static_cast(roudiConfig.uniqueRouDiId)); - IOX_LOG(TRACE, " Monitoring Mode = " << roudiConfig.monitoringMode); - IOX_LOG(TRACE, " Shares Address Space With Applications = " << roudiConfig.sharesAddressSpaceWithApplications); - IOX_LOG(TRACE, " Process Termination Delay = " << roudiConfig.processTerminationDelay); - IOX_LOG(TRACE, " Process Kill Delay = " << roudiConfig.processKillDelay); - IOX_LOG(TRACE, " Compatibility Check Level = " << roudiConfig.compatibilityCheckLevel); - IOX_LOG(TRACE, " Introspection Chunk Count = " << roudiConfig.introspectionChunkCount); - IOX_LOG(TRACE, " Discovery Chunk Count = " << roudiConfig.discoveryChunkCount); + IOX_LOG(Trace, " Monitoring Mode = " << roudiConfig.monitoringMode); + IOX_LOG(Trace, " Shares Address Space With Applications = " << roudiConfig.sharesAddressSpaceWithApplications); + IOX_LOG(Trace, " Process Termination Delay = " << roudiConfig.processTerminationDelay); + IOX_LOG(Trace, " Process Kill Delay = " << roudiConfig.processKillDelay); + IOX_LOG(Trace, " Compatibility Check Level = " << roudiConfig.compatibilityCheckLevel); + IOX_LOG(Trace, " Introspection Chunk Count = " << roudiConfig.introspectionChunkCount); + IOX_LOG(Trace, " Discovery Chunk Count = " << roudiConfig.discoveryChunkCount); } } @@ -59,7 +59,7 @@ bool RouDiApp::checkAndOptimizeConfig(const IceoryxConfig& config) noexcept { if (config.m_sharedMemorySegments.empty()) { - IOX_LOG(ERROR, "A IceoryxConfig without segments was specified! Please provide a valid config!"); + IOX_LOG(Error, "A IceoryxConfig without segments was specified! Please provide a valid config!"); return false; } @@ -67,7 +67,7 @@ bool RouDiApp::checkAndOptimizeConfig(const IceoryxConfig& config) noexcept { if (segment.m_mempoolConfig.m_mempoolConfig.empty()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "A IceoryxConfig with segments without mempools was specified! Please provide a valid config!"); return false; } diff --git a/iceoryx_posh/source/roudi/application/roudi_main.cpp b/iceoryx_posh/source/roudi/application/roudi_main.cpp index 9444f374dd..c038d442d5 100644 --- a/iceoryx_posh/source/roudi/application/roudi_main.cpp +++ b/iceoryx_posh/source/roudi/application/roudi_main.cpp @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) noexcept auto cmdLineArgs = cmdLineParser.parse(argc, argv); if (cmdLineArgs.has_error()) { - IOX_LOG(FATAL, "Unable to parse command line arguments!"); + IOX_LOG(Fatal, "Unable to parse command line arguments!"); return EXIT_FAILURE; } @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) noexcept if (config.has_error()) { auto errorStringIndex = static_cast(config.error()); - IOX_LOG(FATAL, + IOX_LOG(Fatal, "Couldn't parse config file. Error: " << iox::roudi::ROUDI_CONFIG_FILE_PARSE_ERROR_STRINGS[errorStringIndex]); return EXIT_FAILURE; diff --git a/iceoryx_posh/source/roudi/iceoryx_roudi_components.cpp b/iceoryx_posh/source/roudi/iceoryx_roudi_components.cpp index 9f35482a7c..aa1ca6a015 100644 --- a/iceoryx_posh/source/roudi/iceoryx_roudi_components.cpp +++ b/iceoryx_posh/source/roudi/iceoryx_roudi_components.cpp @@ -32,7 +32,7 @@ IceOryxRouDiComponents::IceOryxRouDiComponents(const IceoryxConfig& config) noex runtime::IpcInterfaceBase::cleanupOutdatedIpcChannel(roudi::IPC_CHANNEL_ROUDI_NAME); rouDiMemoryManager.createAndAnnounceMemory().or_else([](RouDiMemoryManagerError error) { - IOX_LOG(FATAL, "Could not create SharedMemory! Error: " << error); + IOX_LOG(Fatal, "Could not create SharedMemory! Error: " << error); IOX_REPORT_FATAL(PoshError::ROUDI_COMPONENTS__SHARED_MEMORY_UNAVAILABLE); }); return &rouDiMemoryManager; diff --git a/iceoryx_posh/source/roudi/memory/iceoryx_roudi_memory_manager.cpp b/iceoryx_posh/source/roudi/memory/iceoryx_roudi_memory_manager.cpp index 9f51c538e5..254b3f314f 100644 --- a/iceoryx_posh/source/roudi/memory/iceoryx_roudi_memory_manager.cpp +++ b/iceoryx_posh/source/roudi/memory/iceoryx_roudi_memory_manager.cpp @@ -24,23 +24,23 @@ namespace roudi { IceOryxRouDiMemoryManager::IceOryxRouDiMemoryManager(const IceoryxConfig& config) noexcept : m_fileLock(std::move( - FileLockBuilder() - .name(concatenate(iceoryxResourcePrefix(config.domainId, ResourceType::ICEORYX_DEFINED), ROUDI_LOCK_NAME)) - .permission(iox::perms::owner_read | iox::perms::owner_write) - .create() - .or_else([](auto& error) { - if (error == FileLockError::LOCKED_BY_OTHER_PROCESS) - { - IOX_LOG(FATAL, "Could not acquire lock, is RouDi still running?"); - IOX_REPORT_FATAL(PoshError::ICEORYX_ROUDI_MEMORY_MANAGER__ROUDI_STILL_RUNNING); - } - else - { - IOX_LOG(FATAL, "Error occurred while acquiring file lock named " << ROUDI_LOCK_NAME); - IOX_REPORT_FATAL(PoshError::ICEORYX_ROUDI_MEMORY_MANAGER__COULD_NOT_ACQUIRE_FILE_LOCK); - } - }) - .value())) + FileLockBuilder() + .name(concatenate(iceoryxResourcePrefix(config.domainId, ResourceType::ICEORYX_DEFINED), ROUDI_LOCK_NAME)) + .permission(iox::perms::owner_read | iox::perms::owner_write) + .create() + .or_else([](auto& error) { + if (error == FileLockError::LOCKED_BY_OTHER_PROCESS) + { + IOX_LOG(Fatal, "Could not acquire lock, is RouDi still running?"); + IOX_REPORT_FATAL(PoshError::ICEORYX_ROUDI_MEMORY_MANAGER__ROUDI_STILL_RUNNING); + } + else + { + IOX_LOG(Fatal, "Error occurred while acquiring file lock named " << ROUDI_LOCK_NAME); + IOX_REPORT_FATAL(PoshError::ICEORYX_ROUDI_MEMORY_MANAGER__COULD_NOT_ACQUIRE_FILE_LOCK); + } + }) + .value())) , m_portPoolBlock(config.uniqueRouDiId) , m_defaultMemory(config) { diff --git a/iceoryx_posh/source/roudi/memory/memory_provider.cpp b/iceoryx_posh/source/roudi/memory/memory_provider.cpp index 15342fa532..003ab70f14 100644 --- a/iceoryx_posh/source/roudi/memory/memory_provider.cpp +++ b/iceoryx_posh/source/roudi/memory/memory_provider.cpp @@ -91,7 +91,7 @@ expected MemoryProvider::create() noexcept } m_segmentId = maybeSegmentId.value(); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Registered memory segment " << iox::log::hex(m_memory) << " with size " << m_size << " to id " << m_segmentId); diff --git a/iceoryx_posh/source/roudi/memory/posix_shm_memory_provider.cpp b/iceoryx_posh/source/roudi/memory/posix_shm_memory_provider.cpp index 93d6f3ff9c..5e53275152 100644 --- a/iceoryx_posh/source/roudi/memory/posix_shm_memory_provider.cpp +++ b/iceoryx_posh/source/roudi/memory/posix_shm_memory_provider.cpp @@ -47,7 +47,7 @@ PosixShmMemoryProvider::~PosixShmMemoryProvider() noexcept { if (isAvailable()) { - destroy().or_else([](auto) { IOX_LOG(WARN, "failed to cleanup POSIX shared memory provider resources"); }); + destroy().or_else([](auto) { IOX_LOG(Warn, "failed to cleanup POSIX shared memory provider resources"); }); } } diff --git a/iceoryx_posh/source/roudi/memory/roudi_memory_manager.cpp b/iceoryx_posh/source/roudi/memory/roudi_memory_manager.cpp index ae7dbcdc2b..9489e40ff4 100644 --- a/iceoryx_posh/source/roudi/memory/roudi_memory_manager.cpp +++ b/iceoryx_posh/source/roudi/memory/roudi_memory_manager.cpp @@ -49,7 +49,7 @@ iox::log::LogStream& operator<<(iox::log::LogStream& logstream, const RouDiMemor RouDiMemoryManager::~RouDiMemoryManager() noexcept { - destroyMemory().or_else([](auto) { IOX_LOG(WARN, "Failed to cleanup RouDiMemoryManager in destructor."); }); + destroyMemory().or_else([](auto) { IOX_LOG(Warn, "Failed to cleanup RouDiMemoryManager in destructor."); }); } expected RouDiMemoryManager::addMemoryProvider(MemoryProvider* memoryProvider) noexcept @@ -74,7 +74,7 @@ expected RouDiMemoryManager::createAndAnnounceMem if (result.has_error()) { IOX_LOG( - ERROR, + Error, "Could not create memory: MemoryProviderError = " << MemoryProvider::getErrorString(result.error())); return err(RouDiMemoryManagerError::MEMORY_CREATION_FAILED); } @@ -96,7 +96,7 @@ expected RouDiMemoryManager::destroyMemory() noex auto destructionResult = memoryProvider->destroy(); if (destructionResult.has_error() && destructionResult.error() != MemoryProviderError::MEMORY_NOT_AVAILABLE) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not destroy memory provider! Error: " << static_cast(destructionResult.error())); /// @note do not return on first error but try to cleanup the remaining resources if (!result.has_error()) diff --git a/iceoryx_posh/source/roudi/port_manager.cpp b/iceoryx_posh/source/roudi/port_manager.cpp index 65768be8ff..9d64fcf8a3 100644 --- a/iceoryx_posh/source/roudi/port_manager.cpp +++ b/iceoryx_posh/source/roudi/port_manager.cpp @@ -35,7 +35,7 @@ capro::Interfaces StringToCaProInterface(const capro::IdString_t& str) noexcept auto result = convert::from_string(str.c_str()); if (!result.has_value()) { - IOX_LOG(WARN, "conversion failure"); + IOX_LOG(Warn, "conversion failure"); return capro::Interfaces::INTERNAL; } @@ -43,7 +43,7 @@ capro::Interfaces StringToCaProInterface(const capro::IdString_t& str) noexcept if (i >= static_cast(capro::Interfaces::INTERFACE_END)) { - IOX_LOG(WARN, "invalid enum (out of range: " << i << ")"); + IOX_LOG(Warn, "invalid enum (out of range: " << i << ")"); return capro::Interfaces::INTERNAL; } return static_cast(i); @@ -56,7 +56,7 @@ PortManager::PortManager(RouDiMemoryInterface* roudiMemoryInterface) noexcept auto maybePortPool = m_roudiMemoryInterface->portPool(); if (!maybePortPool.has_value()) { - IOX_LOG(FATAL, "Could not get PortPool!"); + IOX_LOG(Fatal, "Could not get PortPool!"); IOX_REPORT_FATAL(PoshError::PORT_MANAGER__PORT_POOL_UNAVAILABLE); } m_portPool = maybePortPool.value(); @@ -64,7 +64,7 @@ PortManager::PortManager(RouDiMemoryInterface* roudiMemoryInterface) noexcept auto maybeDiscoveryMemoryManager = m_roudiMemoryInterface->discoveryMemoryManager(); if (!maybeDiscoveryMemoryManager.has_value()) { - IOX_LOG(FATAL, "Could not get MemoryManager for discovery!"); + IOX_LOG(Fatal, "Could not get MemoryManager for discovery!"); IOX_REPORT_FATAL(PoshError::PORT_MANAGER__DISCOVERY_MEMORY_MANAGER_UNAVAILABLE); } auto& discoveryMemoryManager = maybeDiscoveryMemoryManager.value(); @@ -87,7 +87,7 @@ PortManager::PortManager(RouDiMemoryInterface* roudiMemoryInterface) noexcept auto maybeIntrospectionMemoryManager = m_roudiMemoryInterface->introspectionMemoryManager(); if (!maybeIntrospectionMemoryManager.has_value()) { - IOX_LOG(FATAL, "Could not get MemoryManager for introspection!"); + IOX_LOG(Fatal, "Could not get MemoryManager for introspection!"); IOX_REPORT_FATAL(PoshError::PORT_MANAGER__INTROSPECTION_MEMORY_MANAGER_UNAVAILABLE); } auto& introspectionMemoryManager = maybeIntrospectionMemoryManager.value(); @@ -167,7 +167,7 @@ void PortManager::doDiscoveryForPublisherPort(PublisherPortRouDiType& publisherP } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "CaPro protocol error for publisher from runtime '" << publisherPort.getRuntimeName() << "' and with service description '" << publisherPort.getCaProServiceDescription() << "'! Cannot handle CaProMessageType '" @@ -211,21 +211,21 @@ void PortManager::doDiscoveryForSubscriberPort(SubscriberPortType& subscriberPor m_portIntrospection.reportMessage(caproMessage, subscriberPort.getUniqueID()); if (!this->sendToAllMatchingPublisherPorts(caproMessage, subscriberPort)) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, "capro::SUB/UNSUB, no matching publisher for subscriber from runtime '" << subscriberPort.getRuntimeName() << "' and with service description '" << caproMessage.m_serviceDescription << "'!"); capro::CaproMessage nackMessage(capro::CaproMessageType::NACK, subscriberPort.getCaProServiceDescription()); subscriberPort.dispatchCaProMessageAndGetPossibleResponse(nackMessage).and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on NACK messages"); }); } } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "CaPro protocol error for subscriber from runtime '" << subscriberPort.getRuntimeName() << "' and with service description '" << subscriberPort.getCaProServiceDescription() << "'! Cannot handle CaProMessageType '" @@ -258,7 +258,7 @@ void PortManager::destroyClientPort(popo::ClientPortData* const clientPortData) /// @todo iox-#1128 remove from to port introspection - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Destroy client port from runtime '" << clientPortData->m_runtimeName << "' and with service description '" << clientPortData->m_serviceDescription << "'"); @@ -295,20 +295,20 @@ void PortManager::doDiscoveryForClientPort(popo::ClientPortRouDi& clientPort) no /// @todo iox-#1128 report to port introspection if (!this->sendToAllMatchingServerPorts(caproMessage, clientPort)) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, "capro::CONNECT/DISCONNECT, no matching server for client from runtime '" << clientPort.getRuntimeName() << "' and with service description '" << caproMessage.m_serviceDescription << "'!"); capro::CaproMessage nackMessage(capro::CaproMessageType::NACK, clientPort.getCaProServiceDescription()); clientPort.dispatchCaProMessageAndGetPossibleResponse(nackMessage).and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on NACK messages"); }); } } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "CaPro protocol error for client from runtime '" << clientPort.getRuntimeName() << "' and with service description '" << clientPort.getCaProServiceDescription() << "'! Cannot handle CaProMessageType '" @@ -356,7 +356,7 @@ void PortManager::destroyServerPort(popo::ServerPortData* const serverPortData) /// @todo iox-#1128 remove from port introspection - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Destroy server port from runtime '" << serverPortData->m_runtimeName << "' and with service description '" << serverPortData->m_serviceDescription << "'"); @@ -399,7 +399,7 @@ void PortManager::doDiscoveryForServerPort(popo::ServerPortRouDi& serverPort) no } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "CaPro protocol error for server from runtime '" << serverPort.getRuntimeName() << "' and with service description '" << serverPort.getCaProServiceDescription() << "'! Cannot handle CaProMessageType '" @@ -433,7 +433,7 @@ void PortManager::handleInterfaces() noexcept // check if we have to destroy this interface port if (currentPort->m_toBeDestroyed.load(std::memory_order_relaxed)) { - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Destroy interface port from runtime '" << currentPort->m_runtimeName << "' and with service description '" << currentPort->m_serviceDescription << "'"); @@ -497,7 +497,7 @@ void PortManager::handleConditionVariables() noexcept auto currentCondVar = condVar++; if (currentCondVar->m_toBeDestroyed.load(std::memory_order_relaxed)) { - IOX_LOG(DEBUG, "Destroy ConditionVariableData from runtime '" << currentCondVar->m_runtimeName << "'"); + IOX_LOG(Debug, "Destroy ConditionVariableData from runtime '" << currentCondVar->m_runtimeName << "'"); m_portPool->removeConditionVariableData(currentCondVar.to_ptr()); } } @@ -550,7 +550,7 @@ bool PortManager::sendToAllMatchingPublisherPorts(const capro::CaproMessage& mes // send response to subscriber port subscriberSource.dispatchCaProMessageAndGetPossibleResponse(publisherResponse.value()) .and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on ACK or NACK messages"); }); @@ -600,7 +600,7 @@ void PortManager::sendToAllMatchingSubscriberPorts(const capro::CaproMessage& me // sende responsee to subscriber port subscriberPort.dispatchCaProMessageAndGetPossibleResponse(publisherResponse.value()) .and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on ACK or NACK messages"); }); @@ -655,7 +655,7 @@ void PortManager::sendToAllMatchingClientPorts(const capro::CaproMessage& messag // send response to client port clientPort.dispatchCaProMessageAndGetPossibleResponse(serverResponse.value()) .and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on ACK or NACK messages"); }); @@ -684,7 +684,7 @@ bool PortManager::sendToAllMatchingServerPorts(const capro::CaproMessage& messag // send response to client port clientSource.dispatchCaProMessageAndGetPossibleResponse(serverResponse.value()) .and_then([](auto& response) { - IOX_LOG(FATAL, "Got response '" << response.m_type << "'"); + IOX_LOG(Fatal, "Got response '" << response.m_type << "'"); IOX_PANIC("Expected no response on ACK or NACK messages"); }); @@ -813,7 +813,7 @@ void PortManager::deletePortsOfProcess(const RuntimeName_t& runtimeName) noexcep popo::InterfacePort interface(currentPort.to_ptr()); if (runtimeName == interface.getRuntimeName()) { - IOX_LOG(DEBUG, "Deleted Interface of application " << runtimeName); + IOX_LOG(Debug, "Deleted Interface of application " << runtimeName); m_portPool->removeInterfacePort(currentPort.to_ptr()); } } @@ -825,7 +825,7 @@ void PortManager::deletePortsOfProcess(const RuntimeName_t& runtimeName) noexcep auto currentCondVar = condVar++; if (runtimeName == currentCondVar->m_runtimeName) { - IOX_LOG(DEBUG, "Deleted condition variable of application" << runtimeName); + IOX_LOG(Debug, "Deleted condition variable of application" << runtimeName); m_portPool->removeConditionVariableData(currentCondVar.to_ptr()); } } @@ -853,7 +853,7 @@ void PortManager::destroyPublisherPort(PublisherPortRouDiType::MemberType_t* con m_portIntrospection.removePublisher(publisherPortUser); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Destroy publisher port from runtime '" << publisherPortData->m_runtimeName << "' and with service description '" << publisherPortData->m_serviceDescription << "'"); @@ -881,7 +881,7 @@ void PortManager::destroySubscriberPort(SubscriberPortType::MemberType_t* const m_portIntrospection.removeSubscriber(subscriberPortUser); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Destroy subscriber port from runtime '" << subscriberPortData->m_runtimeName << "' and with service description '" << subscriberPortData->m_serviceDescription << "'"); @@ -914,7 +914,7 @@ PortManager::acquirePublisherPortDataWithoutDiscovery(const capro::ServiceDescri if (doesViolateCommunicationPolicy(service).and_then([&](const auto& usedByProcess) { IOX_LOG( - WARN, + Warn, "Process '" << runtimeName << "' violates the communication policy by requesting a PublisherPort which is already used by '" @@ -959,7 +959,7 @@ PortManager::acquireInternalPublisherPortData(const capro::ServiceDescription& s return acquirePublisherPortDataWithoutDiscovery( service, publisherOptions, IPC_CHANNEL_ROUDI_NAME, payloadDataSegmentMemoryManager, PortConfigInfo()) .or_else([&service](auto&) { - IOX_LOG(FATAL, "Could not create PublisherPort for internal service " << service); + IOX_LOG(Fatal, "Could not create PublisherPort for internal service " << service); IOX_REPORT_FATAL(PoshError::PORT_MANAGER__NO_PUBLISHER_PORT_FOR_INTERNAL_SERVICE); }) .and_then([&](auto publisherPortData) { @@ -978,7 +978,7 @@ PublisherPortRouDiType::MemberType_t* PortManager::acquireInternalPublisherPortD return acquirePublisherPortDataWithoutDiscovery( service, publisherOptions, IPC_CHANNEL_ROUDI_NAME, payloadDataSegmentMemoryManager, PortConfigInfo()) .or_else([&service](auto&) { - IOX_LOG(FATAL, "Could not create PublisherPort for internal service " << service); + IOX_LOG(Fatal, "Could not create PublisherPort for internal service " << service); IOX_REPORT_FATAL(PoshError::PORT_MANAGER__NO_PUBLISHER_PORT_FOR_INTERNAL_SERVICE); }) .value(); @@ -1049,7 +1049,7 @@ PortManager::acquireServerPortData(const capro::ServiceDescription& service, destroyServerPort(currentPort.to_ptr()); continue; } - IOX_LOG(WARN, + IOX_LOG(Warn, "Process '" << runtimeName << "' violates the communication policy by requesting a ServerPort which is already used by '" @@ -1098,7 +1098,7 @@ void PortManager::publishServiceRegistry() noexcept { // should not happen (except during RouDi shutdown) // the port always exists, otherwise we would terminate during startup - IOX_LOG(WARN, "Could not publish service registry!"); + IOX_LOG(Warn, "Could not publish service registry!"); return; } PublisherPortUserType publisher(m_serviceRegistryPublisherPortData.value()); @@ -1113,7 +1113,7 @@ void PortManager::publishServiceRegistry() noexcept publisher.sendChunk(chunk); }) - .or_else([](auto&) { IOX_LOG(WARN, "Could not allocate a chunk for the service registry!"); }); + .or_else([](auto&) { IOX_LOG(Warn, "Could not allocate a chunk for the service registry!"); }); } const ServiceRegistry& PortManager::serviceRegistry() const noexcept @@ -1124,7 +1124,7 @@ const ServiceRegistry& PortManager::serviceRegistry() const noexcept void PortManager::addPublisherToServiceRegistry(const capro::ServiceDescription& service) noexcept { m_serviceRegistry.addPublisher(service).or_else([&](auto&) { - IOX_LOG(WARN, "Could not add publisher with service description '" << service << "' to service registry!"); + IOX_LOG(Warn, "Could not add publisher with service description '" << service << "' to service registry!"); IOX_REPORT(PoshError::POSH__PORT_MANAGER_COULD_NOT_ADD_SERVICE_TO_REGISTRY, iox::er::RUNTIME_ERROR); }); } @@ -1137,7 +1137,7 @@ void PortManager::removePublisherFromServiceRegistry(const capro::ServiceDescrip void PortManager::addServerToServiceRegistry(const capro::ServiceDescription& service) noexcept { m_serviceRegistry.addServer(service).or_else([&](auto&) { - IOX_LOG(WARN, "Could not add server with service description '" << service << "' to service registry!"); + IOX_LOG(Warn, "Could not add server with service description '" << service << "' to service registry!"); IOX_REPORT(PoshError::POSH__PORT_MANAGER_COULD_NOT_ADD_SERVICE_TO_REGISTRY, iox::er::RUNTIME_ERROR); }); } diff --git a/iceoryx_posh/source/roudi/port_pool.cpp b/iceoryx_posh/source/roudi/port_pool.cpp index d34ba58737..b7207e8d45 100644 --- a/iceoryx_posh/source/roudi/port_pool.cpp +++ b/iceoryx_posh/source/roudi/port_pool.cpp @@ -45,7 +45,7 @@ expected PortPool::addInterfacePort(con getInterfacePortDataList().emplace(runtimeName, m_portPoolData->m_uniqueRouDiId, interface); if (interfacePortData == getInterfacePortDataList().end()) { - IOX_LOG(WARN, "Out of interface ports! Requested by runtime '" << runtimeName << "'"); + IOX_LOG(Warn, "Out of interface ports! Requested by runtime '" << runtimeName << "'"); IOX_REPORT(PoshError::PORT_POOL__INTERFACELIST_OVERFLOW, iox::er::RUNTIME_ERROR); return err(PortPoolError::INTERFACE_PORT_LIST_FULL); } @@ -58,7 +58,7 @@ PortPool::addConditionVariableData(const RuntimeName_t& runtimeName) noexcept auto conditionVariableData = getConditionVariableDataList().emplace(runtimeName); if (conditionVariableData == getConditionVariableDataList().end()) { - IOX_LOG(WARN, "Out of condition variables! Requested by runtime '" << runtimeName << "'"); + IOX_LOG(Warn, "Out of condition variables! Requested by runtime '" << runtimeName << "'"); IOX_REPORT(PoshError::PORT_POOL__CONDITION_VARIABLE_LIST_OVERFLOW, iox::er::RUNTIME_ERROR); return err(PortPoolError::CONDITION_VARIABLE_LIST_FULL); } @@ -96,7 +96,7 @@ PortPool::addPublisherPort(const capro::ServiceDescription& serviceDescription, serviceDescription, runtimeName, m_portPoolData->m_uniqueRouDiId, memoryManager, publisherOptions, memoryInfo); if (publisherPortData == getPublisherPortDataList().end()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Out of publisher ports! Requested by runtime '" << runtimeName << "' and with service description '" << serviceDescription << "'"); IOX_REPORT(PoshError::PORT_POOL__PUBLISHERLIST_OVERFLOW, iox::er::RUNTIME_ERROR); @@ -115,7 +115,7 @@ PortPool::addSubscriberPort(const capro::ServiceDescription& serviceDescription, serviceDescription, runtimeName, m_portPoolData->m_uniqueRouDiId, subscriberOptions, memoryInfo); if (subscriberPortData == nullptr) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Out of subscriber ports! Requested by runtime '" << runtimeName << "' and with service description '" << serviceDescription << "'"); IOX_REPORT(PoshError::PORT_POOL__SUBSCRIBERLIST_OVERFLOW, iox::er::RUNTIME_ERROR); @@ -145,7 +145,7 @@ PortPool::addClientPort(const capro::ServiceDescription& serviceDescription, serviceDescription, runtimeName, m_portPoolData->m_uniqueRouDiId, clientOptions, memoryManager, memoryInfo); if (clientPortData == getClientPortDataList().end()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Out of client ports! Requested by runtime '" << runtimeName << "' and with service description '" << serviceDescription << "'"); IOX_REPORT(PoshError::PORT_POOL__CLIENTLIST_OVERFLOW, iox::er::RUNTIME_ERROR); @@ -165,7 +165,7 @@ PortPool::addServerPort(const capro::ServiceDescription& serviceDescription, serviceDescription, runtimeName, m_portPoolData->m_uniqueRouDiId, serverOptions, memoryManager, memoryInfo); if (serverPortData == getServerPortDataList().end()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Out of server ports! Requested by runtime '" << runtimeName << "' and with service description '" << serviceDescription << "'"); IOX_REPORT(PoshError::PORT_POOL__SERVERLIST_OVERFLOW, iox::er::RUNTIME_ERROR); diff --git a/iceoryx_posh/source/roudi/process.cpp b/iceoryx_posh/source/roudi/process.cpp index 565a6ff31f..ce40e521bb 100644 --- a/iceoryx_posh/source/roudi/process.cpp +++ b/iceoryx_posh/source/roudi/process.cpp @@ -55,7 +55,7 @@ void Process::sendViaIpcChannel(const runtime::IpcMessage& data) noexcept bool sendSuccess = m_ipcChannel.send(data); if (!sendSuccess) { - IOX_LOG(WARN, "Process cannot send message over communication channel"); + IOX_LOG(Warn, "Process cannot send message over communication channel"); IOX_REPORT(PoshError::POSH__ROUDI_PROCESS_SEND_VIA_IPC_CHANNEL_FAILED, iox::er::RUNTIME_ERROR); } } diff --git a/iceoryx_posh/source/roudi/process_manager.cpp b/iceoryx_posh/source/roudi/process_manager.cpp index f93abc071d..dfccfc7224 100644 --- a/iceoryx_posh/source/roudi/process_manager.cpp +++ b/iceoryx_posh/source/roudi/process_manager.cpp @@ -52,7 +52,7 @@ ProcessManager::ProcessManager(RouDiMemoryInterface& roudiMemoryInterface, auto maybeSegmentManager = m_roudiMemoryInterface.segmentManager(); if (!maybeSegmentManager.has_value()) { - IOX_LOG(FATAL, "Invalid state! Could not obtain SegmentManager!"); + IOX_LOG(Fatal, "Invalid state! Could not obtain SegmentManager!"); fatalError = true; } else @@ -63,7 +63,7 @@ ProcessManager::ProcessManager(RouDiMemoryInterface& roudiMemoryInterface, auto maybeIntrospectionMemoryManager = m_roudiMemoryInterface.introspectionMemoryManager(); if (!maybeIntrospectionMemoryManager.has_value()) { - IOX_LOG(FATAL, "Invalid state! Could not obtain MemoryManager for instrospection!"); + IOX_LOG(Fatal, "Invalid state! Could not obtain MemoryManager for instrospection!"); fatalError = true; } else @@ -74,7 +74,7 @@ ProcessManager::ProcessManager(RouDiMemoryInterface& roudiMemoryInterface, auto maybeMgmtSegmentId = m_roudiMemoryInterface.mgmtMemoryProvider()->segmentId(); if (!maybeMgmtSegmentId.has_value()) { - IOX_LOG(FATAL, "Invalid state! Could not obtain SegmentId for iceoryx management segment!"); + IOX_LOG(Fatal, "Invalid state! Could not obtain SegmentId for iceoryx management segment!"); fatalError = true; } else @@ -85,7 +85,7 @@ ProcessManager::ProcessManager(RouDiMemoryInterface& roudiMemoryInterface, auto maybeHeartbeatPool = m_roudiMemoryInterface.heartbeatPool(); if (!maybeHeartbeatPool.has_value()) { - IOX_LOG(FATAL, "Invalid state! Could not obtain HeartbeatPool!"); + IOX_LOG(Fatal, "Invalid state! Could not obtain HeartbeatPool!"); fatalError = true; } else @@ -110,7 +110,7 @@ void ProcessManager::handleProcessShutdownPreparationRequest(const RuntimeName_t sendBuffer << runtime::IpcMessageTypeToString(runtime::IpcMessageType::PREPARE_APP_TERMINATION_ACK); process->sendViaIpcChannel(sendBuffer); }) - .or_else([&]() { IOX_LOG(WARN, "Unknown application " << name << " requested shutdown preparation."); }); + .or_else([&]() { IOX_LOG(Warn, "Unknown application " << name << " requested shutdown preparation."); }); } void ProcessManager::requestShutdownOfAllProcesses() noexcept @@ -118,7 +118,7 @@ void ProcessManager::requestShutdownOfAllProcesses() noexcept // send SIG_TERM to all running applications and wait for processes to answer with TERMINATION for (auto& process : m_processList) { - IOX_LOG(DEBUG, "Sending SIGTERM to Process ID " << process.getPid() << " named '" << process.getName()); + IOX_LOG(Debug, "Sending SIGTERM to Process ID " << process.getPid() << " named '" << process.getName()); requestShutdownOfProcess(process, ShutdownPolicy::SIG_TERM); } @@ -147,7 +147,7 @@ void ProcessManager::killAllProcesses() noexcept { for (auto& process : m_processList) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Process ID " << process.getPid() << " named '" << process.getName() << "' is still running after SIGTERM was sent. RouDi is sending SIGKILL now."); requestShutdownOfProcess(process, ShutdownPolicy::SIG_KILL); @@ -158,7 +158,7 @@ void ProcessManager::printWarningForRegisteredProcessesAndClearProcessList() noe { for (auto& process : m_processList) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Process ID " << process.getPid() << " named '" << process.getName() << "' is still running after SIGKILL was sent. RouDi is ignoring this process."); } @@ -202,7 +202,7 @@ void ProcessManager::evaluateKillError(const Process& process, { if ((errnum == EINVAL) || (errnum == EPERM) || (errnum == ESRCH)) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Process ID " << process.getPid() << " named '" << process.getName() << "' could not be killed with " << (shutdownPolicy == ShutdownPolicy::SIG_KILL ? "SIGKILL" : "SIGTERM") << ", because the command failed with the following error: " << errorString @@ -211,7 +211,7 @@ void ProcessManager::evaluateKillError(const Process& process, } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "Process ID " << process.getPid() << " named '" << process.getName() << "' could not be killed with" << (shutdownPolicy == ShutdownPolicy::SIG_KILL ? "SIGKILL" : "SIGTERM") << " for unknown reason: '" << errorString << "'"); @@ -238,11 +238,11 @@ bool ProcessManager::registerProcess(const RuntimeName_t& name, if (process->isMonitored()) { - IOX_LOG(WARN, "Received register request, but termination of " << name << " not detected yet"); + IOX_LOG(Warn, "Received register request, but termination of " << name << " not detected yet"); } // process exists, we expect that the existing process crashed - IOX_LOG(WARN, + IOX_LOG(Warn, "Application '" << name << "' is still registered but it seems it has been terminated without RouDi " "recognizing it. Re-registering application"); @@ -251,7 +251,7 @@ bool ProcessManager::registerProcess(const RuntimeName_t& name, constexpr TerminationFeedback TERMINATION_FEEDBACK{TerminationFeedback::DO_NOT_SEND_ACK_TO_PROCESS}; if (!this->searchForProcessAndRemoveIt(name, TERMINATION_FEEDBACK)) { - IOX_LOG(WARN, "Application " << name << " could not be removed"); + IOX_LOG(Warn, "Application " << name << " could not be removed"); return; } else @@ -280,7 +280,7 @@ bool ProcessManager::addProcess(const RuntimeName_t& name, if (!version::VersionInfo::getCurrentVersion().checkCompatibility(versionInfo, m_compatibilityCheckLevel)) { IOX_LOG( - ERROR, + Error, "Version mismatch from '" << name << "'! Please build your app and RouDi against the same iceoryx version (version & commitID). RouDi: " @@ -291,7 +291,7 @@ bool ProcessManager::addProcess(const RuntimeName_t& name, // overflow check if (m_processList.size() >= MAX_PROCESS_NUMBER) { - IOX_LOG(ERROR, "Could not register process '" << name << "' - too many processes"); + IOX_LOG(Error, "Could not register process '" << name << "' - too many processes"); return false; } @@ -318,7 +318,7 @@ bool ProcessManager::addProcess(const RuntimeName_t& name, m_processIntrospection->addProcess(static_cast(pid), name); - IOX_LOG(DEBUG, "Registered new application " << name); + IOX_LOG(Debug, "Registered new application " << name); return true; } @@ -327,7 +327,7 @@ bool ProcessManager::unregisterProcess(const RuntimeName_t& name) noexcept constexpr TerminationFeedback FEEDBACK{TerminationFeedback::SEND_ACK_TO_PROCESS}; if (!searchForProcessAndRemoveIt(name, FEEDBACK)) { - IOX_LOG(ERROR, "Application " << name << " could not be unregistered!"); + IOX_LOG(Error, "Application " << name << " could not be unregistered!"); return false; } return true; @@ -344,7 +344,7 @@ bool ProcessManager::searchForProcessAndRemoveIt(const RuntimeName_t& name, cons { if (removeProcessAndDeleteRespectiveSharedMemoryObjects(it, feedback)) { - IOX_LOG(DEBUG, "Removed existing application " << name); + IOX_LOG(Debug, "Removed existing application " << name); } return true; // we can assume there are no other processes with this name } @@ -395,9 +395,9 @@ void ProcessManager::addInterfaceForProcess(const RuntimeName_t& name, capro::In << convert::toString(offset) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, "Created new interface for application " << name); + IOX_LOG(Debug, "Created new interface for application " << name); }) - .or_else([&]() { IOX_LOG(WARN, "Unknown application " << name << " requested an interface."); }); + .or_else([&]() { IOX_LOG(Warn, "Unknown application " << name << " requested an interface."); }); } void ProcessManager::sendMessageNotSupportedToRuntime(const RuntimeName_t& name) noexcept @@ -407,7 +407,7 @@ void ProcessManager::sendMessageNotSupportedToRuntime(const RuntimeName_t& name) sendBuffer << runtime::IpcMessageTypeToString(runtime::IpcMessageType::MESSAGE_NOT_SUPPORTED); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(ERROR, "Application " << name << " sent a message, which is not supported by this RouDi"); + IOX_LOG(Error, "Application " << name << " sent a message, which is not supported by this RouDi"); }); } @@ -432,7 +432,7 @@ void ProcessManager::addSubscriberForProcess(const RuntimeName_t& name, << convert::toString(offset) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Created new SubscriberPort for application '" << name << "' with service description '" << service << "'"); } @@ -442,13 +442,13 @@ void ProcessManager::addSubscriberForProcess(const RuntimeName_t& name, sendBuffer << runtime::IpcMessageTypeToString(runtime::IpcMessageType::ERROR); sendBuffer << runtime::IpcMessageErrorTypeToString(runtime::IpcMessageErrorType::SUBSCRIBER_LIST_FULL); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not create SubscriberPort for application '" << name << "' with service description '" << service << "'"); } }) .or_else([&]() { - IOX_LOG(WARN, + IOX_LOG(Warn, "Unknown application '" << name << "' requested a SubscriberPort with service description '" << service << "'"); }); @@ -487,7 +487,7 @@ void ProcessManager::addPublisherForProcess(const RuntimeName_t& name, << convert::toString(offset) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Created new PublisherPort for application '" << name << "' with service description '" << service << "'"); } @@ -519,13 +519,13 @@ void ProcessManager::addPublisherForProcess(const RuntimeName_t& name, sendBuffer << error; process->sendViaIpcChannel(sendBuffer); - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not create PublisherPort for application '" << name << "' with service description '" << service << "'"); } }) .or_else([&]() { - IOX_LOG(WARN, + IOX_LOG(Warn, "Unknown application '" << name << "' requested a PublisherPort with service description '" << service << "'"); }); @@ -563,7 +563,7 @@ void ProcessManager::addClientForProcess(const RuntimeName_t& name, << convert::toString(relativePtrToClientPort) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Created new ClientPort for application '" << name << "' with service description '" << service << "'"); }) @@ -573,13 +573,13 @@ void ProcessManager::addClientForProcess(const RuntimeName_t& name, sendBuffer << runtime::IpcMessageErrorTypeToString(runtime::IpcMessageErrorType::CLIENT_LIST_FULL); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not create ClientPort for application '" << name << "' with service description '" << service << "'"); }); }) .or_else([&]() { - IOX_LOG(WARN, + IOX_LOG(Warn, "Unknown application '" << name << "' requested a ClientPort with service description '" << service << "'"); }); @@ -617,7 +617,7 @@ void ProcessManager::addServerForProcess(const RuntimeName_t& name, << convert::toString(relativePtrToServerPort) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, + IOX_LOG(Debug, "Created new ServerPort for application '" << name << "' with service description '" << service << "'"); }) @@ -627,13 +627,13 @@ void ProcessManager::addServerForProcess(const RuntimeName_t& name, sendBuffer << runtime::IpcMessageErrorTypeToString(runtime::IpcMessageErrorType::SERVER_LIST_FULL); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not create ServerPort for application '" << name << "' with service description '" << service << "'"); }); }) .or_else([&]() { - IOX_LOG(WARN, + IOX_LOG(Warn, "Unknown application '" << name << "' requested a ServerPort with service description '" << service << "'"); }); @@ -653,7 +653,7 @@ void ProcessManager::addConditionVariableForProcess(const RuntimeName_t& runtime << convert::toString(offset) << convert::toString(m_mgmtSegmentId); process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, "Created new ConditionVariable for application " << runtimeName); + IOX_LOG(Debug, "Created new ConditionVariable for application " << runtimeName); }) .or_else([&](PortPoolError error) { runtime::IpcMessage sendBuffer; @@ -665,10 +665,10 @@ void ProcessManager::addConditionVariableForProcess(const RuntimeName_t& runtime } process->sendViaIpcChannel(sendBuffer); - IOX_LOG(DEBUG, "Could not create new ConditionVariable for application " << runtimeName); + IOX_LOG(Debug, "Could not create new ConditionVariable for application " << runtimeName); }); }) - .or_else([&]() { IOX_LOG(WARN, "Unknown application " << runtimeName << " requested a ConditionVariable."); }); + .or_else([&]() { IOX_LOG(Warn, "Unknown application " << runtimeName << " requested a ConditionVariable."); }); } void ProcessManager::initIntrospection(ProcessIntrospectionType* processIntrospection) noexcept @@ -726,7 +726,7 @@ void ProcessManager::monitorProcesses() noexcept continue; } - IOX_LOG(WARN, + IOX_LOG(Warn, "Application " << processIterator->getName() << " not responding (last response " << elapsedMilliseconds << " milliseconds ago) --> removing it"); @@ -736,7 +736,7 @@ void ProcessManager::monitorProcesses() noexcept } if (!removed) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not find application for corresponding heartbeat! HeartbeatPoolIndex: " << currentHeartbeatIterator.to_index()); m_heartbeatPool->erase(currentHeartbeatIterator); diff --git a/iceoryx_posh/source/roudi/roudi.cpp b/iceoryx_posh/source/roudi/roudi.cpp index 096ef0dc47..eaf7c048fd 100644 --- a/iceoryx_posh/source/roudi/roudi.cpp +++ b/iceoryx_posh/source/roudi/roudi.cpp @@ -52,7 +52,7 @@ RouDi::RouDi(RouDiMemoryInterface& roudiMemoryInterface, { if (detail::isCompiledOn32BitSystem()) { - IOX_LOG(WARN, "Runnning RouDi on 32-bit architectures is experimental! Use at your own risk!"); + IOX_LOG(Warn, "Runnning RouDi on 32-bit architectures is experimental! Use at your own risk!"); } m_processIntrospection.registerPublisherPort( PublisherPortUserType(m_prcMgr->addIntrospectionPublisherPort(IntrospectionProcessService))); @@ -106,9 +106,9 @@ void RouDi::shutdown() noexcept // wait for the monitoring and discovery thread to stop if (m_monitoringAndDiscoveryThread.joinable()) { - IOX_LOG(DEBUG, "Joining 'Mon+Discover' thread..."); + IOX_LOG(Debug, "Joining 'Mon+Discover' thread..."); m_monitoringAndDiscoveryThread.join(); - IOX_LOG(DEBUG, "...'Mon+Discover' thread joined."); + IOX_LOG(Debug, "...'Mon+Discover' thread joined."); } if (!m_roudiConfig.sharesAddressSpaceWithApplications) @@ -120,7 +120,7 @@ void RouDi::shutdown() noexcept { if (remainingDurationForInfoPrint > terminationDelayTimer.remainingTime()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Some applications seem to be still running! Time until graceful shutdown: " << terminationDelayTimer.remainingTime().toSeconds() << "s!"); remainingDurationForInfoPrint = remainingDurationForInfoPrint - 5_s; @@ -136,7 +136,7 @@ void RouDi::shutdown() noexcept { if (remainingDurationForWarnPrint > finalKillTimer.remainingTime()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Some applications seem to not shutdown gracefully! Time until hard shutdown: " << finalKillTimer.remainingTime().toSeconds() << "s!"); remainingDurationForWarnPrint = remainingDurationForWarnPrint - 5_s; @@ -163,9 +163,9 @@ void RouDi::shutdown() noexcept if (m_handleRuntimeMessageThread.joinable()) { - IOX_LOG(DEBUG, "Joining 'IPC-msg-process' thread..."); + IOX_LOG(Debug, "Joining 'IPC-msg-process' thread..."); m_handleRuntimeMessageThread.join(); - IOX_LOG(DEBUG, "...'IPC-msg-process' thread joined."); + IOX_LOG(Debug, "...'IPC-msg-process' thread joined."); } } @@ -183,7 +183,7 @@ void RouDi::triggerDiscoveryLoopAndWaitToFinish(units::Duration timeout) noexcep .and_then([&decrementSemaphoreCount](const auto& countNonZero) { decrementSemaphoreCount = countNonZero; }) .or_else([&decrementSemaphoreCount](const auto& error) { decrementSemaphoreCount = false; - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not decrement count of the semaphore which signals a finished run of the " "discovery loop! Error: " << static_cast(error)); @@ -191,7 +191,7 @@ void RouDi::triggerDiscoveryLoopAndWaitToFinish(units::Duration timeout) noexcep } m_discoveryLoopTrigger.trigger(); m_discoveryFinishedSemaphore->timedWait(timeout).or_else([](const auto& error) { - IOX_LOG(ERROR, + IOX_LOG(Error, "A timed wait on the semaphore which signals a finished run of the " "discovery loop failed! Error: " << static_cast(error)); @@ -225,7 +225,7 @@ void RouDi::monitorAndDiscoveryUpdate() noexcept if (manuallyTriggered) { m_discoveryFinishedSemaphore->post().or_else([](const auto& error) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Could not trigger semaphore to signal a finished run of the discovery loop! Error: " << static_cast(error)); }); @@ -249,9 +249,9 @@ void RouDi::processRuntimeMessages(runtime::IpcInterfaceCreator&& roudiIpcInterf setThreadName("IPC-msg-process"); - IOX_LOG(INFO, "Resource prefix: " << IOX_DEFAULT_RESOURCE_PREFIX); - IOX_LOG(INFO, "Domain ID: " << static_cast(m_roudiConfig.domainId)); - IOX_LOG(INFO, "RouDi is ready for clients"); + IOX_LOG(Info, "Resource prefix: " << IOX_DEFAULT_RESOURCE_PREFIX); + IOX_LOG(Info, "Domain ID: " << static_cast(m_roudiConfig.domainId)); + IOX_LOG(Info, "RouDi is ready for clients"); fflush(stdout); // explicitly flush 'stdout' for 'launch_testing' while (m_runHandleRuntimeMessageThread) @@ -292,7 +292,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (runtimeName.empty()) { - IOX_LOG(ERROR, "Got message with empty runtime name!"); + IOX_LOG(Error, "Got message with empty runtime name!"); return; } @@ -302,7 +302,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, const char separator[2]{s}; if (runtimeName.find(separator).has_value()) { - IOX_LOG(ERROR, "Got message with a runtime name with invalid characters: \"" << runtimeName << "\"!"); + IOX_LOG(Error, "Got message with a runtime name with invalid characters: \"" << runtimeName << "\"!"); return; } } @@ -313,7 +313,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 6) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::REG\" from \"" << runtimeName << "\"received!"); } else @@ -336,7 +336,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 5) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_PUBLISHER\" from \"" << runtimeName << "\"received!"); } @@ -346,7 +346,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, capro::ServiceDescription::deserialize(Serialization(message.getElementAtIndex(2))); if (deserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization failed when '" << message.getElementAtIndex(2).c_str() << "' was provided\n"); break; } @@ -356,7 +356,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, popo::PublisherOptions::deserialize(Serialization(message.getElementAtIndex(3))); if (publisherOptionsDeserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization of 'PublisherOptions' failed when '" << message.getElementAtIndex(3).c_str() << "' was provided\n"); break; @@ -374,7 +374,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 5) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_SUBSCRIBER\" from \"" << runtimeName << "\"received!"); } @@ -384,7 +384,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, capro::ServiceDescription::deserialize(Serialization(message.getElementAtIndex(2))); if (deserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization failed when '" << message.getElementAtIndex(2).c_str() << "' was provided\n"); break; } @@ -395,7 +395,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, popo::SubscriberOptions::deserialize(Serialization(message.getElementAtIndex(3))); if (subscriberOptionsDeserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization of 'SubscriberOptions' failed when '" << message.getElementAtIndex(3).c_str() << "' was provided\n"); break; @@ -413,7 +413,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 5) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_CLIENT\" from \"" << runtimeName << "\"received!"); } @@ -423,7 +423,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, capro::ServiceDescription::deserialize(Serialization(message.getElementAtIndex(2))); if (deserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization failed when '" << message.getElementAtIndex(2).c_str() << "' was provided\n"); break; } @@ -434,7 +434,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, popo::ClientOptions::deserialize(Serialization(message.getElementAtIndex(3))); if (clientOptionsDeserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization of 'ClientOptions' failed when '" << message.getElementAtIndex(3).c_str() << "' was provided\n"); break; @@ -451,7 +451,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 5) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_SERVER\" from \"" << runtimeName << "\"received!"); } @@ -461,7 +461,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, capro::ServiceDescription::deserialize(Serialization(message.getElementAtIndex(2))); if (deserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization failed when '" << message.getElementAtIndex(2).c_str() << "' was provided\n"); break; } @@ -472,7 +472,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, popo::ServerOptions::deserialize(Serialization(message.getElementAtIndex(3))); if (serverOptionsDeserializationResult.has_error()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Deserialization of 'ServerOptions' failed when '" << message.getElementAtIndex(3).c_str() << "' was provided\n"); break; @@ -489,7 +489,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 2) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_CONDITION_VARIABLE\" from \"" << runtimeName << "\"received!"); } @@ -503,7 +503,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 4) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::CREATE_INTERFACE\" from \"" << runtimeName << "\"received!"); } @@ -520,7 +520,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 2) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::PREPARE_APP_TERMINATION\" from \"" << runtimeName << "\"received!"); } @@ -535,7 +535,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, { if (message.getNumberOfElements() != 2) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Wrong number of parameters for \"IpcMessageType::TERMINATION\" from \"" << runtimeName << "\"received!"); } @@ -547,7 +547,7 @@ void RouDi::processMessage(const runtime::IpcMessage& message, } default: { - IOX_LOG(ERROR, "Unknown IPC message command [" << runtime::IpcMessageTypeToString(cmd) << "]"); + IOX_LOG(Error, "Unknown IPC message command [" << runtime::IpcMessageTypeToString(cmd) << "]"); m_prcMgr->sendMessageNotSupportedToRuntime(runtimeName); break; diff --git a/iceoryx_posh/source/roudi/roudi_cmd_line_parser.cpp b/iceoryx_posh/source/roudi/roudi_cmd_line_parser.cpp index 2926a67b54..fe622bdb51 100644 --- a/iceoryx_posh/source/roudi/roudi_cmd_line_parser.cpp +++ b/iceoryx_posh/source/roudi/roudi_cmd_line_parser.cpp @@ -107,7 +107,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm auto maybeValue = convert::from_string(optarg); if (!maybeValue.has_value()) { - IOX_LOG(ERROR, "The domain ID must be in the range of [0, " << MAX_DOMAIN_ID << "]"); + IOX_LOG(Error, "The domain ID must be in the range of [0, " << MAX_DOMAIN_ID << "]"); return err(CmdLineParserResult::INVALID_PARAMETER); } @@ -117,7 +117,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm } else { - IOX_LOG(WARN, + IOX_LOG(Warn, "The domain ID is an experimental feature and iceoryx must be compiled with the " "'IOX_EXPERIMENTAL_POSH' cmake option to use it!"); } @@ -130,7 +130,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm auto maybeValue = convert::from_string(optarg); if (!maybeValue.has_value()) { - IOX_LOG(ERROR, "The RouDi ID must be in the range of [0, " << MAX_ROUDI_ID << "]"); + IOX_LOG(Error, "The RouDi ID must be in the range of [0, " << MAX_ROUDI_ID << "]"); return err(CmdLineParserResult::INVALID_PARAMETER); } @@ -149,7 +149,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm } else { - IOX_LOG(ERROR, "Options for monitoring-mode are 'on' and 'off'!"); + IOX_LOG(Error, "Options for monitoring-mode are 'on' and 'off'!"); return err(CmdLineParserResult::INVALID_PARAMETER); } break; @@ -158,35 +158,35 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm { if (strcmp(optarg, "off") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::OFF; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Off; } else if (strcmp(optarg, "fatal") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::FATAL; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Fatal; } else if (strcmp(optarg, "error") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::ERROR; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Error; } else if (strcmp(optarg, "warning") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::WARN; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Warn; } else if (strcmp(optarg, "info") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::INFO; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Info; } else if (strcmp(optarg, "debug") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::DEBUG; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Debug; } else if (strcmp(optarg, "trace") == 0) { - m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::TRACE; + m_cmdLineArgs.roudiConfig.logLevel = iox::log::LogLevel::Trace; } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "Options for log-level are 'off', 'fatal', 'error', 'warning', 'info', 'debug' and 'trace'!"); return err(CmdLineParserResult::INVALID_PARAMETER); } @@ -198,7 +198,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm auto maybeValue = convert::from_string(optarg); if (!maybeValue.has_value()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "The process termination delay must be in the range of [0, " << MAX_PROCESS_TERMINATION_DELAY << "]"); return err(CmdLineParserResult::INVALID_PARAMETER); @@ -213,7 +213,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm auto maybeValue = convert::from_string(optarg); if (!maybeValue.has_value()) { - IOX_LOG(ERROR, "The process kill delay must be in the range of [0, " << MAX_PROCESS_KILL_DELAY << "]"); + IOX_LOG(Error, "The process kill delay must be in the range of [0, " << MAX_PROCESS_KILL_DELAY << "]"); return err(CmdLineParserResult::INVALID_PARAMETER); } @@ -248,7 +248,7 @@ CmdLineParser::parse(int argc, char* argv[], const CmdLineArgumentParsingMode cm } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "Options for compatibility are 'off', 'major', 'minor', 'patch', 'commitId' and 'buildDate'!"); return err(CmdLineParserResult::INVALID_PARAMETER); } diff --git a/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp b/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp index b393c4f85f..74897d1178 100644 --- a/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp +++ b/iceoryx_posh/source/roudi/roudi_config_toml_file_provider.cpp @@ -46,12 +46,12 @@ TomlRouDiConfigFileProvider::TomlRouDiConfigFileProvider(config::CmdLineArgs_t& FileReader configFile(defaultConfigFilePath, "", FileReader::ErrorMode::Ignore); if (configFile.isOpen()) { - IOX_LOG(INFO, "No config file provided. Using '" << defaultConfigFilePath << "'"); + IOX_LOG(Info, "No config file provided. Using '" << defaultConfigFilePath << "'"); m_customConfigFilePath = defaultConfigFilePath; } else { - IOX_LOG(INFO, + IOX_LOG(Info, "No config file provided and also not found at '" << defaultConfigFilePath << "'. Falling back to built-in config."); } @@ -77,7 +77,7 @@ iox::expected TomlRou std::ifstream fileStream{m_customConfigFilePath.c_str()}; if (!fileStream.is_open()) { - IOX_LOG(ERROR, "Could not open config file from path '" << m_customConfigFilePath << "'"); + IOX_LOG(Error, "Could not open config file from path '" << m_customConfigFilePath << "'"); return iox::err(iox::roudi::RouDiConfigFileParseError::FILE_OPEN_FAILED); } @@ -100,7 +100,7 @@ TomlRouDiConfigFileProvider::parse(std::istream& stream) noexcept { auto parserError = iox::roudi::RouDiConfigFileParseError::EXCEPTION_IN_PARSER; auto errorStringIndex = static_cast(parserError); - IOX_LOG(WARN, + IOX_LOG(Warn, iox::roudi::ROUDI_CONFIG_FILE_PARSE_ERROR_STRINGS[errorStringIndex] << ": " << parserException.what()); return iox::err(parserError); diff --git a/iceoryx_posh/source/runtime/ipc_interface_base.cpp b/iceoryx_posh/source/runtime/ipc_interface_base.cpp index c9ef31ff7f..c52f0bdb9d 100644 --- a/iceoryx_posh/source/runtime/ipc_interface_base.cpp +++ b/iceoryx_posh/source/runtime/ipc_interface_base.cpp @@ -99,7 +99,7 @@ IpcInterface::IpcInterface(const RuntimeName_t& runtimeName, const char separator[2]{s}; if (runtimeName.find(separator).has_value()) { - IOX_LOG(FATAL, "The runtime name '" << runtimeName << "' contains path separators"); + IOX_LOG(Fatal, "The runtime name '" << runtimeName << "' contains path separators"); IOX_PANIC("Invalid characters for runtime name"); } } @@ -110,7 +110,7 @@ IpcInterface::IpcInterface(const RuntimeName_t& runtimeName, m_maxMessageSize = messageSize; if (m_maxMessageSize > platform::IoxIpcChannelType::MAX_MESSAGE_SIZE) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Message size too large, reducing from " << messageSize << " to " << platform::IoxIpcChannelType::MAX_MESSAGE_SIZE); m_maxMessageSize = platform::IoxIpcChannelType::MAX_MESSAGE_SIZE; @@ -122,7 +122,7 @@ bool IpcInterface::receive(IpcMessage& answer) const noexcept { if (!m_ipcChannel.has_value()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Trying to receive data on an non-initialized IPC interface! Interface name: " << m_interfaceName); return false; } @@ -141,7 +141,7 @@ bool IpcInterface::timedReceive(const units::Duration timeout, I { if (!m_ipcChannel.has_value()) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Trying to receive data on an non-initialized IPC interface! Interface name: " << m_interfaceName); return false; } @@ -160,7 +160,7 @@ bool IpcInterface::setMessageFromString(const char* buffer, IpcM answer.setMessage(buffer); if (!answer.isValid()) { - IOX_LOG(ERROR, "The received message " << answer.getMessage() << " is not valid"); + IOX_LOG(Error, "The received message " << answer.getMessage() << " is not valid"); return false; } return true; @@ -171,13 +171,13 @@ bool IpcInterface::send(const IpcMessage& msg) const noexcept { if (!m_ipcChannel.has_value()) { - IOX_LOG(WARN, "Trying to send data on an non-initialized IPC interface! Interface name: " << m_interfaceName); + IOX_LOG(Warn, "Trying to send data on an non-initialized IPC interface! Interface name: " << m_interfaceName); return false; } if (!msg.isValid()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Trying to send the message " << msg.getMessage() << " which " << "does not follow the specified syntax."); return false; @@ -187,7 +187,7 @@ bool IpcInterface::send(const IpcMessage& msg) const noexcept if (error == PosixIpcChannelError::MESSAGE_TOO_LONG) { const uint64_t messageSize = msg.getMessage().size() + platform::IoxIpcChannelType::NULL_TERMINATOR_SIZE; - IOX_LOG(ERROR, "msg size of " << messageSize << " bigger than configured max message size"); + IOX_LOG(Error, "msg size of " << messageSize << " bigger than configured max message size"); } }; return !m_ipcChannel->send(msg.getMessage()).or_else(logLengthError).has_error(); @@ -198,13 +198,13 @@ bool IpcInterface::timedSend(const IpcMessage& msg, units::Durat { if (!m_ipcChannel.has_value()) { - IOX_LOG(WARN, "Trying to send data on an non-initialized IPC interface! Interface name: " << m_interfaceName); + IOX_LOG(Warn, "Trying to send data on an non-initialized IPC interface! Interface name: " << m_interfaceName); return false; } if (!msg.isValid()) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Trying to send the message " << msg.getMessage() << " which " << "does not follow the specified syntax."); return false; @@ -214,7 +214,7 @@ bool IpcInterface::timedSend(const IpcMessage& msg, units::Durat if (error == PosixIpcChannelError::MESSAGE_TOO_LONG) { const uint64_t messageSize = msg.getMessage().size() + platform::IoxIpcChannelType::NULL_TERMINATOR_SIZE; - IOX_LOG(ERROR, "msg size of " << messageSize << " bigger than configured max message size"); + IOX_LOG(Error, "msg size of " << messageSize << " bigger than configured max message size"); } }; return !m_ipcChannel->timedSend(msg.getMessage(), timeout).or_else(logLengthError).has_error(); @@ -248,7 +248,7 @@ bool IpcInterface::openIpcChannel(const PosixIpcChannelSide chan .or_else([this](auto& err) { if (this->m_channelSide == PosixIpcChannelSide::SERVER) { - IOX_LOG(ERROR, + IOX_LOG(Error, "Unable to create ipc channel '" << this->m_interfaceName << "'. Error code: " << static_cast(err)); } @@ -256,8 +256,8 @@ bool IpcInterface::openIpcChannel(const PosixIpcChannelSide chan { // the client opens the channel and tries to do this in a loop when the channel is not available, // therefore resulting in a wall of error messages on the console which leads to missing the important - // one that roudi is not running if this would be LogLevel::ERROR instead of LogLevel::TRACE - IOX_LOG(TRACE, + // one that roudi is not running if this would be LogLevel::Error instead of LogLevel::Trace + IOX_LOG(Trace, "Unable to open ipc channel '" << this->m_interfaceName << "'. Error code: " << static_cast(err)); } @@ -301,7 +301,7 @@ void IpcInterface::cleanupOutdatedIpcChannel(const InterfaceName { if (platform::IoxIpcChannelType::unlinkIfExists(name).value_or(false)) { - IOX_LOG(WARN, "IPC channel still there, doing an unlink of '" << name << "'"); + IOX_LOG(Warn, "IPC channel still there, doing an unlink of '" << name << "'"); } } diff --git a/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp b/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp index d7becf2673..ac4d659d7d 100644 --- a/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp +++ b/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp @@ -35,7 +35,7 @@ expected IpcRuntimeInterface::cre { if (runtimeName.empty()) { - IOX_LOG(DEBUG, "The runtime name must not be empty!"); + IOX_LOG(Debug, "The runtime name must not be empty!"); return err(IpcRuntimeInterfaceError::CANNOT_CREATE_APPLICATION_CHANNEL); } @@ -68,7 +68,7 @@ expected IpcRuntimeInterface::cre if (!roudiIpcInterface.isInitialized() || !roudiIpcInterface.ipcChannelMapsToFile()) { - IOX_LOG(DEBUG, "reopen RouDi's IPC channel!"); + IOX_LOG(Debug, "reopen RouDi's IPC channel!"); roudiIpcInterface.reopen(); regState = RegState::WAIT_FOR_ROUDI; } @@ -136,13 +136,13 @@ expected IpcRuntimeInterface::cre switch (regState) { case RegState::WAIT_FOR_ROUDI: - IOX_LOG(DEBUG, "Timeout while waiting for RouDi"); + IOX_LOG(Debug, "Timeout while waiting for RouDi"); return err(IpcRuntimeInterfaceError::TIMEOUT_WAITING_FOR_ROUDI); case RegState::SEND_REGISTER_REQUEST: - IOX_LOG(DEBUG, "Sending registration request to RouDi failed"); + IOX_LOG(Debug, "Sending registration request to RouDi failed"); return err(IpcRuntimeInterfaceError::SENDING_REQUEST_TO_ROUDI_FAILED); case RegState::WAIT_FOR_REGISTER_ACK: - IOX_LOG(DEBUG, "RouDi did not respond to the registration request"); + IOX_LOG(Debug, "RouDi did not respond to the registration request"); return err(IpcRuntimeInterfaceError::NO_RESPONSE_FROM_ROUDI); break; case RegState::FINISHED: @@ -172,13 +172,13 @@ bool IpcRuntimeInterface::sendRequestToRouDi(const IpcMessage& msg, IpcMessage& { if (!m_RoudiIpcInterface.send(msg)) { - IOX_LOG(ERROR, "Could not send request via RouDi IPC channel interface.\n"); + IOX_LOG(Error, "Could not send request via RouDi IPC channel interface.\n"); return false; } if (!m_AppIpcInterface.receive(answer)) { - IOX_LOG(ERROR, "Could not receive request via App IPC channel interface.\n"); + IOX_LOG(Error, "Could not receive request via App IPC channel interface.\n"); return false; } @@ -201,13 +201,13 @@ void IpcRuntimeInterface::waitForRoudi(IpcInterfaceUser& roudiIpcInterface, dead if (roudiIpcInterface.isInitialized()) { - IOX_LOG(DEBUG, "RouDi IPC Channel found!"); + IOX_LOG(Debug, "RouDi IPC Channel found!"); break; } if (printWaitingWarning) { - IOX_LOG(WARN, "RouDi not found - waiting ..."); + IOX_LOG(Warn, "RouDi not found - waiting ..."); printWaitingWarning = false; printFoundMessage = true; } @@ -224,7 +224,7 @@ void IpcRuntimeInterface::waitForRoudi(IpcInterfaceUser& roudiIpcInterface, dead if (printFoundMessage && roudiIpcInterface.isInitialized()) { - IOX_LOG(WARN, "... RouDi found."); + IOX_LOG(Warn, "... RouDi found."); } } @@ -297,12 +297,12 @@ IpcRuntimeInterface::waitForRegAck(int64_t transmissionTimestamp, } else { - IOX_LOG(WARN, "Received a REG_ACK with an outdated timestamp!"); + IOX_LOG(Warn, "Received a REG_ACK with an outdated timestamp!"); } } else { - IOX_LOG(ERROR, "Wrong response received " << receiveBuffer.getMessage()); + IOX_LOG(Error, "Wrong response received " << receiveBuffer.getMessage()); } } } diff --git a/iceoryx_posh/source/runtime/posh_runtime.cpp b/iceoryx_posh/source/runtime/posh_runtime.cpp index 90970f7778..5ea0ee37a6 100644 --- a/iceoryx_posh/source/runtime/posh_runtime.cpp +++ b/iceoryx_posh/source/runtime/posh_runtime.cpp @@ -71,7 +71,7 @@ void PoshRuntime::setRuntimeFactory(const factory_t& factory) noexcept } else { - IOX_LOG(FATAL, "Cannot set runtime factory. Passed factory must not be empty!"); + IOX_LOG(Fatal, "Cannot set runtime factory. Passed factory must not be empty!"); IOX_REPORT_FATAL(PoshError::POSH__RUNTIME_FACTORY_IS_NOT_SET); } } @@ -123,7 +123,7 @@ PoshRuntime::PoshRuntime(optional name) noexcept { if (detail::isCompiledOn32BitSystem()) { - IOX_LOG(WARN, "Running applications on 32-bit architectures is experimental! Use at your own risk!"); + IOX_LOG(Warn, "Running applications on 32-bit architectures is experimental! Use at your own risk!"); } } @@ -131,12 +131,12 @@ const RuntimeName_t& PoshRuntime::verifyInstanceName(optional name, *this, &PoshRuntimeImpl::sendKeepAliveAndHandleShutdownPreparation); - IOX_LOG(DEBUG, "Resource prefix: " << IOX_DEFAULT_RESOURCE_PREFIX); + IOX_LOG(Debug, "Resource prefix: " << IOX_DEFAULT_RESOURCE_PREFIX); } PoshRuntimeImpl::PoshRuntimeImpl(optional name, @@ -69,7 +69,7 @@ PoshRuntimeImpl::PoshRuntimeImpl(optional name, case IpcRuntimeInterfaceError::CANNOT_CREATE_APPLICATION_CHANNEL: IOX_REPORT_FATAL(PoshError::IPC_INTERFACE__UNABLE_TO_CREATE_APPLICATION_CHANNEL); case IpcRuntimeInterfaceError::TIMEOUT_WAITING_FOR_ROUDI: - IOX_LOG(FATAL, "Timeout registering at RouDi. Is RouDi running?"); + IOX_LOG(Fatal, "Timeout registering at RouDi. Is RouDi running?"); IOX_REPORT_FATAL(PoshError::IPC_INTERFACE__REG_ROUDI_NOT_AVAILABLE); case IpcRuntimeInterfaceError::SENDING_REQUEST_TO_ROUDI_FAILED: IOX_REPORT_FATAL(PoshError::IPC_INTERFACE__REG_UNABLE_TO_WRITE_TO_ROUDI_CHANNEL); @@ -115,7 +115,7 @@ PoshRuntimeImpl::PoshRuntimeImpl(optional name, std::move(shmInterface)}; }()) { - IOX_LOG(INFO, "Domain ID: " << static_cast(domainId)); + IOX_LOG(Info, "Domain ID: " << static_cast(domainId)); } PoshRuntimeImpl::~PoshRuntimeImpl() noexcept @@ -132,18 +132,18 @@ PoshRuntimeImpl::~PoshRuntimeImpl() noexcept if (stringToIpcMessageType(IpcMessage.c_str()) == IpcMessageType::TERMINATION_ACK) { - IOX_LOG(TRACE, "RouDi cleaned up resources of " << m_appName << ". Shutting down gracefully."); + IOX_LOG(Trace, "RouDi cleaned up resources of " << m_appName << ". Shutting down gracefully."); } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "Got wrong response from IPC channel for IpcMessageType::TERMINATION:'" << receiveBuffer.getMessage() << "'"); } } else { - IOX_LOG(ERROR, "Sending IpcMessageType::TERMINATION to RouDi failed:'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Sending IpcMessageType::TERMINATION to RouDi failed:'" << receiveBuffer.getMessage() << "'"); } } @@ -158,7 +158,7 @@ PoshRuntimeImpl::getMiddlewarePublisher(const capro::ServiceDescription& service auto options = publisherOptions; if (options.historyCapacity > MAX_HISTORY_CAPACITY) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested history capacity " << options.historyCapacity << " exceeds the maximum possible one for this publisher" << ", limiting from " << publisherOptions.historyCapacity << " to " << MAX_HISTORY_CAPACITY); @@ -181,24 +181,24 @@ PoshRuntimeImpl::getMiddlewarePublisher(const capro::ServiceDescription& service switch (maybePublisher.error()) { case IpcMessageErrorType::NO_UNIQUE_CREATED: - IOX_LOG(WARN, "Service '" << service << "' already in use by another process."); + IOX_LOG(Warn, "Service '" << service << "' already in use by another process."); IOX_REPORT(PoshError::POSH__RUNTIME_PUBLISHER_PORT_NOT_UNIQUE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::INTERNAL_SERVICE_DESCRIPTION_IS_FORBIDDEN: - IOX_LOG(WARN, "Usage of internal service '" << service << "' is forbidden."); + IOX_LOG(Warn, "Usage of internal service '" << service << "' is forbidden."); IOX_REPORT(PoshError::POSH__RUNTIME_SERVICE_DESCRIPTION_FORBIDDEN, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::PUBLISHER_LIST_FULL: - IOX_LOG(WARN, + IOX_LOG(Warn, "Service '" << service << "' could not be created since we are out of memory for publishers."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_PUBLISHER_LIST_FULL, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_PUBLISHER_INVALID_RESPONSE: - IOX_LOG(WARN, "Service '" << service << "' could not be created. Request publisher got invalid response."); + IOX_LOG(Warn, "Service '" << service << "' could not be created. Request publisher got invalid response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_PUBLISHER_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_PUBLISHER_WRONG_IPC_MESSAGE_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Service '" << service << "' could not be created. Request publisher got wrong IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_PUBLISHER_WRONG_IPC_MESSAGE_RESPONSE, @@ -206,7 +206,7 @@ PoshRuntimeImpl::getMiddlewarePublisher(const capro::ServiceDescription& service break; case IpcMessageErrorType::REQUEST_PUBLISHER_NO_WRITABLE_SHM_SEGMENT: IOX_LOG( - WARN, + Warn, "Service '" << service << "' could not be created. RouDi did not find a writable shared memory segment for the current " @@ -214,7 +214,7 @@ PoshRuntimeImpl::getMiddlewarePublisher(const capro::ServiceDescription& service IOX_REPORT(PoshError::POSH__RUNTIME_NO_WRITABLE_SHM_SEGMENT, iox::er::RUNTIME_ERROR); break; default: - IOX_LOG(WARN, "Unknown error occurred while creating service '" << service << "'."); + IOX_LOG(Warn, "Unknown error occurred while creating service '" << service << "'."); IOX_REPORT(PoshError::POSH__RUNTIME_PUBLISHER_PORT_CREATION_UNKNOWN_ERROR, iox::er::RUNTIME_ERROR); break; } @@ -229,7 +229,7 @@ PoshRuntimeImpl::requestPublisherFromRoudi(const IpcMessage& sendBuffer) noexcep IpcMessage receiveBuffer; if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request publisher got invalid response!"); + IOX_LOG(Error, "Request publisher got invalid response!"); return err(IpcMessageErrorType::REQUEST_PUBLISHER_INVALID_RESPONSE); } else if (receiveBuffer.getNumberOfElements() == 3U) @@ -257,12 +257,12 @@ PoshRuntimeImpl::requestPublisherFromRoudi(const IpcMessage& sendBuffer) noexcep std::string IpcMessage2 = receiveBuffer.getElementAtIndex(1U); if (stringToIpcMessageType(IpcMessage1.c_str()) == IpcMessageType::ERROR) { - IOX_LOG(ERROR, "Request publisher received no valid publisher port from RouDi."); + IOX_LOG(Error, "Request publisher received no valid publisher port from RouDi."); return err(stringToIpcMessageErrorType(IpcMessage2.c_str())); } } - IOX_LOG(ERROR, "Request publisher got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Request publisher got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); return err(IpcMessageErrorType::REQUEST_PUBLISHER_WRONG_IPC_MESSAGE_RESPONSE); } @@ -276,7 +276,7 @@ PoshRuntimeImpl::getMiddlewareSubscriber(const capro::ServiceDescription& servic auto options = subscriberOptions; if (options.queueCapacity > MAX_QUEUE_CAPACITY) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested queue capacity " << options.queueCapacity << " exceeds the maximum possible one for this subscriber" << ", limiting from " << subscriberOptions.queueCapacity << " to " << MAX_QUEUE_CAPACITY); @@ -284,7 +284,7 @@ PoshRuntimeImpl::getMiddlewareSubscriber(const capro::ServiceDescription& servic } else if (0U == options.queueCapacity) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested queue capacity of 0 doesn't make sense as no data would be received," << " the capacity is set to 1"); options.queueCapacity = 1U; @@ -292,7 +292,7 @@ PoshRuntimeImpl::getMiddlewareSubscriber(const capro::ServiceDescription& servic if (subscriberOptions.historyRequest > options.queueCapacity) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested historyRequest for " << service << " is larger than queueCapacity. Clamping historyRequest to queueCapacity!"); options.historyRequest = options.queueCapacity; @@ -315,23 +315,23 @@ PoshRuntimeImpl::getMiddlewareSubscriber(const capro::ServiceDescription& servic switch (maybeSubscriber.error()) { case IpcMessageErrorType::SUBSCRIBER_LIST_FULL: - IOX_LOG(WARN, + IOX_LOG(Warn, "Service '" << service << "' could not be created since we are out of memory for subscribers."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_SUBSCRIBER_LIST_FULL, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_SUBSCRIBER_INVALID_RESPONSE: - IOX_LOG(WARN, "Service '" << service << "' could not be created. Request subscriber got invalid response."); + IOX_LOG(Warn, "Service '" << service << "' could not be created. Request subscriber got invalid response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_SUBSCRIBER_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_SUBSCRIBER_WRONG_IPC_MESSAGE_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Service '" << service << "' could not be created. Request subscriber got wrong IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_SUBSCRIBER_WRONG_IPC_MESSAGE_RESPONSE, iox::er::RUNTIME_ERROR); break; default: - IOX_LOG(WARN, "Unknown error occurred while creating service '" << service << "'."); + IOX_LOG(Warn, "Unknown error occurred while creating service '" << service << "'."); IOX_REPORT(PoshError::POSH__RUNTIME_SUBSCRIBER_PORT_CREATION_UNKNOWN_ERROR, iox::er::RUNTIME_ERROR); break; } @@ -346,7 +346,7 @@ PoshRuntimeImpl::requestSubscriberFromRoudi(const IpcMessage& sendBuffer) noexce IpcMessage receiveBuffer; if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request subscriber got invalid response!"); + IOX_LOG(Error, "Request subscriber got invalid response!"); return err(IpcMessageErrorType::REQUEST_SUBSCRIBER_INVALID_RESPONSE); } else if (receiveBuffer.getNumberOfElements() == 3U) @@ -375,12 +375,12 @@ PoshRuntimeImpl::requestSubscriberFromRoudi(const IpcMessage& sendBuffer) noexce if (stringToIpcMessageType(IpcMessage1.c_str()) == IpcMessageType::ERROR) { - IOX_LOG(ERROR, "Request subscriber received no valid subscriber port from RouDi."); + IOX_LOG(Error, "Request subscriber received no valid subscriber port from RouDi."); return err(stringToIpcMessageErrorType(IpcMessage2.c_str())); } } - IOX_LOG(ERROR, "Request subscriber got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Request subscriber got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); return err(IpcMessageErrorType::REQUEST_SUBSCRIBER_WRONG_IPC_MESSAGE_RESPONSE); } @@ -392,7 +392,7 @@ popo::ClientPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareClient(const c auto options = clientOptions; if (options.responseQueueCapacity > MAX_QUEUE_CAPACITY) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested response queue capacity " << options.responseQueueCapacity << " exceeds the maximum possible one for this client" << ", limiting from " << options.responseQueueCapacity << " to " << MAX_QUEUE_CAPACITY); @@ -400,7 +400,7 @@ popo::ClientPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareClient(const c } else if (options.responseQueueCapacity == 0U) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested response queue capacity of 0 doesn't make sense as no data would be received," << " the capacity is set to 1"); options.responseQueueCapacity = 1U; @@ -417,18 +417,18 @@ popo::ClientPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareClient(const c switch (maybeClient.error()) { case IpcMessageErrorType::CLIENT_LIST_FULL: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create client with service description '" << service << "' as we are out of memory for clients."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_OUT_OF_CLIENTS, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_CLIENT_INVALID_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create client with service description '" << service << "'; received invalid response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_CLIENT_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_CLIENT_WRONG_IPC_MESSAGE_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create client with service description '" << service << "'; received wrong IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_CLIENT_WRONG_IPC_MESSAGE_RESPONSE, @@ -436,7 +436,7 @@ popo::ClientPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareClient(const c break; case IpcMessageErrorType::REQUEST_CLIENT_NO_WRITABLE_SHM_SEGMENT: IOX_LOG( - WARN, + Warn, "Service '" << service << "' could not be created. RouDi did not find a writable shared memory segment for the current " @@ -444,7 +444,7 @@ popo::ClientPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareClient(const c IOX_REPORT(PoshError::POSH__RUNTIME_NO_WRITABLE_SHM_SEGMENT, iox::er::RUNTIME_ERROR); break; default: - IOX_LOG(WARN, "Unknown error occurred while creating client with service description '" << service << "'"); + IOX_LOG(Warn, "Unknown error occurred while creating client with service description '" << service << "'"); IOX_REPORT(PoshError::POSH__RUNTIME_CLIENT_PORT_CREATION_UNKNOWN_ERROR, iox::er::RUNTIME_ERROR); break; } @@ -459,7 +459,7 @@ PoshRuntimeImpl::requestClientFromRoudi(const IpcMessage& sendBuffer) noexcept IpcMessage receiveBuffer; if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request client got invalid response!"); + IOX_LOG(Error, "Request client got invalid response!"); return err(IpcMessageErrorType::REQUEST_CLIENT_INVALID_RESPONSE); } else if (receiveBuffer.getNumberOfElements() == 3U) @@ -487,13 +487,13 @@ PoshRuntimeImpl::requestClientFromRoudi(const IpcMessage& sendBuffer) noexcept std::string IpcMessage2 = receiveBuffer.getElementAtIndex(1U); if (stringToIpcMessageType(IpcMessage1.c_str()) == IpcMessageType::ERROR) { - IOX_LOG(ERROR, "Request client received no valid client port from RouDi."); + IOX_LOG(Error, "Request client received no valid client port from RouDi."); return err(stringToIpcMessageErrorType(IpcMessage2.c_str())); } } - IOX_LOG(ERROR, "Request client got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Request client got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); return err(IpcMessageErrorType::REQUEST_CLIENT_WRONG_IPC_MESSAGE_RESPONSE); } @@ -505,7 +505,7 @@ popo::ServerPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareServer(const c auto options = serverOptions; if (options.requestQueueCapacity > MAX_QUEUE_CAPACITY) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested request queue capacity " << options.requestQueueCapacity << " exceeds the maximum possible one for this server" << ", limiting from " << options.requestQueueCapacity << " to " << MAX_QUEUE_CAPACITY); @@ -513,7 +513,7 @@ popo::ServerPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareServer(const c } else if (options.requestQueueCapacity == 0U) { - IOX_LOG(WARN, + IOX_LOG(Warn, "Requested request queue capacity of 0 doesn't make sense as no data would be received," << " the capacity is set to 1"); options.requestQueueCapacity = 1U; @@ -530,18 +530,18 @@ popo::ServerPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareServer(const c switch (maybeServer.error()) { case IpcMessageErrorType::SERVER_LIST_FULL: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create server with service description '" << service << "' as we are out of memory for servers."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_OUT_OF_SERVERS, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_SERVER_INVALID_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create server with service description '" << service << "'; received invalid response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_SERVER_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_SERVER_WRONG_IPC_MESSAGE_RESPONSE: - IOX_LOG(WARN, + IOX_LOG(Warn, "Could not create server with service description '" << service << "'; received wrong IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_SERVER_WRONG_IPC_MESSAGE_RESPONSE, @@ -549,7 +549,7 @@ popo::ServerPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareServer(const c break; case IpcMessageErrorType::REQUEST_SERVER_NO_WRITABLE_SHM_SEGMENT: IOX_LOG( - WARN, + Warn, "Service '" << service << "' could not be created. RouDi did not find a writable shared memory segment for the current " @@ -557,7 +557,7 @@ popo::ServerPortUser::MemberType_t* PoshRuntimeImpl::getMiddlewareServer(const c IOX_REPORT(PoshError::POSH__RUNTIME_NO_WRITABLE_SHM_SEGMENT, iox::er::RUNTIME_ERROR); break; default: - IOX_LOG(WARN, "Unknown error occurred while creating server with service description '" << service << "'"); + IOX_LOG(Warn, "Unknown error occurred while creating server with service description '" << service << "'"); IOX_REPORT(PoshError::POSH__RUNTIME_SERVER_PORT_CREATION_UNKNOWN_ERROR, iox::er::RUNTIME_ERROR); break; } @@ -572,7 +572,7 @@ PoshRuntimeImpl::requestServerFromRoudi(const IpcMessage& sendBuffer) noexcept IpcMessage receiveBuffer; if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request server got invalid response!"); + IOX_LOG(Error, "Request server got invalid response!"); return err(IpcMessageErrorType::REQUEST_SERVER_INVALID_RESPONSE); } else if (receiveBuffer.getNumberOfElements() == 3U) @@ -600,12 +600,12 @@ PoshRuntimeImpl::requestServerFromRoudi(const IpcMessage& sendBuffer) noexcept std::string IpcMessage2 = receiveBuffer.getElementAtIndex(1U); if (stringToIpcMessageType(IpcMessage1.c_str()) == IpcMessageType::ERROR) { - IOX_LOG(ERROR, "Request server received no valid server port from RouDi."); + IOX_LOG(Error, "Request server received no valid server port from RouDi."); return err(stringToIpcMessageErrorType(IpcMessage2.c_str())); } } - IOX_LOG(ERROR, "Request server got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Request server got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); return err(IpcMessageErrorType::REQUEST_SERVER_WRONG_IPC_MESSAGE_RESPONSE); } @@ -620,7 +620,7 @@ popo::InterfacePortData* PoshRuntimeImpl::getMiddlewareInterface(const capro::In if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request interface got invalid response!"); + IOX_LOG(Error, "Request interface got invalid response!"); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_GET_MW_INTERFACE_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); return nullptr; } @@ -644,7 +644,7 @@ popo::InterfacePortData* PoshRuntimeImpl::getMiddlewareInterface(const capro::In } } - IOX_LOG(ERROR, "Get mw interface got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); + IOX_LOG(Error, "Get mw interface got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_GET_MW_INTERFACE_WRONG_IPC_MESSAGE_RESPONSE, iox::er::RUNTIME_ERROR); return nullptr; } @@ -655,7 +655,7 @@ PoshRuntimeImpl::requestConditionVariableFromRoudi(const IpcMessage& sendBuffer) IpcMessage receiveBuffer; if (sendRequestToRouDi(sendBuffer, receiveBuffer) == false) { - IOX_LOG(ERROR, "Request condition variable got invalid response!"); + IOX_LOG(Error, "Request condition variable got invalid response!"); return err(IpcMessageErrorType::REQUEST_CONDITION_VARIABLE_INVALID_RESPONSE); } else if (receiveBuffer.getNumberOfElements() == 3U) @@ -683,12 +683,12 @@ PoshRuntimeImpl::requestConditionVariableFromRoudi(const IpcMessage& sendBuffer) std::string IpcMessage2 = receiveBuffer.getElementAtIndex(1U); if (stringToIpcMessageType(IpcMessage1.c_str()) == IpcMessageType::ERROR) { - IOX_LOG(ERROR, "Request condition variable received no valid condition variable port from RouDi."); + IOX_LOG(Error, "Request condition variable received no valid condition variable port from RouDi."); return err(stringToIpcMessageErrorType(IpcMessage2.c_str())); } } - IOX_LOG(ERROR, + IOX_LOG(Error, "Request condition variable got wrong response from IPC channel :'" << receiveBuffer.getMessage() << "'"); return err(IpcMessageErrorType::REQUEST_CONDITION_VARIABLE_WRONG_IPC_MESSAGE_RESPONSE); } @@ -704,21 +704,21 @@ popo::ConditionVariableData* PoshRuntimeImpl::getMiddlewareConditionVariable() n switch (maybeConditionVariable.error()) { case IpcMessageErrorType::CONDITION_VARIABLE_LIST_FULL: - IOX_LOG(WARN, "Could not create condition variable as we are out of memory for condition variables."); + IOX_LOG(Warn, "Could not create condition variable as we are out of memory for condition variables."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_CONDITION_VARIABLE_LIST_FULL, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_CONDITION_VARIABLE_INVALID_RESPONSE: - IOX_LOG(WARN, "Could not create condition variables; received invalid IPC channel response."); + IOX_LOG(Warn, "Could not create condition variables; received invalid IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_CONDITION_VARIABLE_INVALID_RESPONSE, iox::er::RUNTIME_ERROR); break; case IpcMessageErrorType::REQUEST_CONDITION_VARIABLE_WRONG_IPC_MESSAGE_RESPONSE: - IOX_LOG(WARN, "Could not create condition variables; received wrong IPC channel response."); + IOX_LOG(Warn, "Could not create condition variables; received wrong IPC channel response."); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_REQUEST_CONDITION_VARIABLE_WRONG_IPC_MESSAGE_RESPONSE, iox::er::RUNTIME_ERROR); break; default: - IOX_LOG(WARN, "Unknown error occurred while creating condition variable"); + IOX_LOG(Warn, "Unknown error occurred while creating condition variable"); IOX_REPORT(PoshError::POSH__RUNTIME_ROUDI_CONDITION_VARIABLE_CREATION_UNKNOWN_ERROR, iox::er::RUNTIME_ERROR); break; @@ -756,18 +756,18 @@ void PoshRuntimeImpl::sendKeepAliveAndHandleShutdownPreparation() noexcept if (stringToIpcMessageType(IpcMessage.c_str()) == IpcMessageType::PREPARE_APP_TERMINATION_ACK) { - IOX_LOG(TRACE, "RouDi unblocked shutdown of " << m_appName << "."); + IOX_LOG(Trace, "RouDi unblocked shutdown of " << m_appName << "."); } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "Got wrong response from IPC channel for PREPARE_APP_TERMINATION:'" << receiveBuffer.getMessage() << "'"); } } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "Sending IpcMessageType::PREPARE_APP_TERMINATION to RouDi failed:'" << receiveBuffer.getMessage() << "'"); } @@ -782,13 +782,13 @@ PoshRuntimeImpl::convert_id_and_offset(IpcMessage& msg) if (!id.has_value()) { - IOX_LOG(ERROR, "segment_id conversion failed"); + IOX_LOG(Error, "segment_id conversion failed"); return err(IpcMessageErrorType::SEGMENT_ID_CONVERSION_FAILURE); } if (!offset.has_value()) { - IOX_LOG(ERROR, "offset conversion failed"); + IOX_LOG(Error, "offset conversion failed"); return err(IpcMessageErrorType::OFFSET_CONVERSION_FAILURE); } diff --git a/iceoryx_posh/source/runtime/posh_runtime_single_process.cpp b/iceoryx_posh/source/runtime/posh_runtime_single_process.cpp index 06b6a52fba..f56f250d12 100644 --- a/iceoryx_posh/source/runtime/posh_runtime_single_process.cpp +++ b/iceoryx_posh/source/runtime/posh_runtime_single_process.cpp @@ -36,7 +36,7 @@ PoshRuntime& singleProcessRuntimeFactory(optional) noexcep PoshRuntimeSingleProcess::PoshRuntimeSingleProcess(const RuntimeName_t& name) noexcept : PoshRuntimeImpl( - make_optional(&name), DEFAULT_DOMAIN_ID, RuntimeLocation::SAME_PROCESS_LIKE_ROUDI) + make_optional(&name), DEFAULT_DOMAIN_ID, RuntimeLocation::SAME_PROCESS_LIKE_ROUDI) { auto currentFactory = PoshRuntime::getRuntimeFactory(); if (currentFactory != nullptr && *currentFactory == PoshRuntime::defaultRuntimeFactory) @@ -46,7 +46,7 @@ PoshRuntimeSingleProcess::PoshRuntimeSingleProcess(const RuntimeName_t& name) no } else { - IOX_LOG(ERROR, + IOX_LOG(Error, "PoshRuntimeSingleProcess can only created once per process and only if the default PoshRuntime " "factory method is set!"); IOX_REPORT_FATAL(PoshError::POSH__RUNTIME_IS_CREATED_MULTIPLE_TIMES); diff --git a/iceoryx_posh/source/runtime/service_discovery.cpp b/iceoryx_posh/source/runtime/service_discovery.cpp index 9dd289ff31..46473e1009 100644 --- a/iceoryx_posh/source/runtime/service_discovery.cpp +++ b/iceoryx_posh/source/runtime/service_discovery.cpp @@ -69,7 +69,7 @@ void ServiceDiscovery::findService(const optional& service, } default: { - IOX_LOG(WARN, "ServiceDiscovery could not perform search due to unknown MessagingPattern!"); + IOX_LOG(Warn, "ServiceDiscovery could not perform search due to unknown MessagingPattern!"); IOX_REPORT(PoshError::POSH__SERVICE_DISCOVERY_UNKNOWN_MESSAGE_PATTERN_PROVIDED, iox::er::RUNTIME_ERROR); } } @@ -86,7 +86,7 @@ void ServiceDiscovery::enableEvent(popo::TriggerHandle&& triggerHandle, const Se } default: { - IOX_LOG(WARN, "ServiceDiscovery::enableEvent() called with unknown event!"); + IOX_LOG(Warn, "ServiceDiscovery::enableEvent() called with unknown event!"); IOX_REPORT(PoshError::POSH__SERVICE_DISCOVERY_UNKNOWN_EVENT_PROVIDED, iox::er::RUNTIME_ERROR); } } @@ -103,7 +103,7 @@ void ServiceDiscovery::disableEvent(const ServiceDiscoveryEvent event) noexcept } default: { - IOX_LOG(WARN, "ServiceDiscovery::disableEvent() called with unknown event!"); + IOX_LOG(Warn, "ServiceDiscovery::disableEvent() called with unknown event!"); IOX_REPORT(PoshError::POSH__SERVICE_DISCOVERY_UNKNOWN_EVENT_PROVIDED, iox::er::RUNTIME_ERROR); } } diff --git a/iceoryx_posh/source/runtime/shared_memory_user.cpp b/iceoryx_posh/source/runtime/shared_memory_user.cpp index 188b053918..37ac3043cb 100644 --- a/iceoryx_posh/source/runtime/shared_memory_user.cpp +++ b/iceoryx_posh/source/runtime/shared_memory_user.cpp @@ -132,7 +132,7 @@ expected SharedMemoryUser::openShmSegment(ShmVector } IOX_LOG( - DEBUG, + Debug, "Application registered " << ((resourceType == ResourceType::ICEORYX_DEFINED) ? "management" : "payload data") << " segment " << iox::log::hex(shm.getBaseAddress()) << " with size " << shm.get_size().expect("Failed to acquire SHM size.") << " to id " << segmentId); diff --git a/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp b/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp index 7336840847..e0d4bd94bf 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp +++ b/iceoryx_posh/test/moduletests/test_roudi_cmd_line_parser.cpp @@ -51,7 +51,7 @@ namespace class CmdLineParser_test : public Test { public: - void SetUp(){}; + void SetUp() {}; void TearDown() { // Reset optind to be able to parse again @@ -246,13 +246,13 @@ TEST_F(CmdLineParser_test, LogLevelOptionsLeadToCorrectLogLevel) { ::testing::Test::RecordProperty("TEST_ID", "25799d7a-9f34-4bcd-bb01-f6dbe270fac3"); constexpr uint8_t NUMBER_OF_ARGS{3U}; - LogLevel loglevelArray[] = {LogLevel::OFF, - LogLevel::FATAL, - LogLevel::ERROR, - LogLevel::WARN, - LogLevel::INFO, - LogLevel::DEBUG, - LogLevel::TRACE}; + LogLevel loglevelArray[] = {LogLevel::Off, + LogLevel::Fatal, + LogLevel::Error, + LogLevel::Warn, + LogLevel::Info, + LogLevel::Debug, + LogLevel::Trace}; char* args[NUMBER_OF_ARGS]; char appName[] = "./foo"; char optionArray[][20] = {"-l", "--log-level"}; diff --git a/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp b/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp index c2137174ed..1d54b44d9b 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp +++ b/iceoryx_posh/test/moduletests/test_roudi_iceoryx_roudi_app.cpp @@ -105,7 +105,7 @@ TEST_F(IceoryxRoudiApp_test, VerifyConstructorIsSuccessful) IceoryxRoudiApp_Child roudi(iox::IceoryxConfig().setDefaults()); EXPECT_TRUE(roudi.getVariableRun()); - EXPECT_EQ(roudi.getLogLevel(), iox::log::LogLevel::INFO); + EXPECT_EQ(roudi.getLogLevel(), iox::log::LogLevel::Info); EXPECT_EQ(roudi.getMonitoringMode(), roudi::MonitoringMode::OFF); } @@ -146,7 +146,7 @@ TEST_F(IceoryxRoudiApp_test, VerifyConstructorWithEmptyConfigSetRunVariableToFal EXPECT_FALSE(roudi.getVariableRun()); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [&](const auto& logMessages) { + iox::log::LogLevel::Error, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Eq(1U)); EXPECT_THAT(logMessages[0], HasSubstr(expectedOutput)); }); @@ -171,7 +171,7 @@ TEST_F(IceoryxRoudiApp_test, VerifyConstructorUsingConfigWithSegmentWithoutMemPo EXPECT_FALSE(roudi.getVariableRun()); iox::testing::TestingLogger::checkLogMessageIfLogLevelIsSupported( - iox::log::LogLevel::ERROR, [&](const auto& logMessages) { + iox::log::LogLevel::Error, [&](const auto& logMessages) { ASSERT_THAT(logMessages.size(), Eq(1U)); EXPECT_THAT(logMessages[0], HasSubstr(expectedOutput)); });