iox-eclipse-iceoryx#1755 Use new log macros in all places

ApexAI · Apr 3, 2023 · 5c94847 · 5c94847
1 parent 207d419
commit 5c94847
Show file tree

Hide file tree

Showing 67 changed files with 464 additions and 474 deletions.
diff --git a/iceoryx_binding_c/source/c2cpp_enum_translation.cpp b/iceoryx_binding_c/source/c2cpp_enum_translation.cpp
@@ -17,6 +17,7 @@
 #include "iceoryx_binding_c/internal/c2cpp_enum_translation.hpp"
 #include "iceoryx_binding_c/error_handling/error_handling.hpp"
 #include "iceoryx_binding_c/internal/c2cpp_binding.h"
+#include "iox/logging.hpp"
 
 namespace c2cpp
 {
@@ -57,7 +58,7 @@ iox::popo::SubscriberEvent subscriberEvent(const iox_SubscriberEvent value) noex
         return iox::popo::SubscriberEvent::DATA_RECEIVED;
     }
 
-    LogFatal() << "invalid iox_SubscriberEvent value";
+    IOX_LOG(FATAL) << "invalid iox_SubscriberEvent value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SUBSCRIBER_EVENT_VALUE);
     return iox::popo::SubscriberEvent::DATA_RECEIVED;
 }
@@ -70,7 +71,7 @@ iox::popo::SubscriberState subscriberState(const iox_SubscriberState value) noex
         return iox::popo::SubscriberState::HAS_DATA;
     }
 
-    LogFatal() << "invalid iox_SubscriberState value";
+    IOX_LOG(FATAL) << "invalid iox_SubscriberState value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SUBSCRIBER_STATE_VALUE);
     return iox::popo::SubscriberState::HAS_DATA;
 }
@@ -83,7 +84,7 @@ iox::popo::ClientEvent clientEvent(const iox_ClientEvent value) noexcept
         return iox::popo::ClientEvent::RESPONSE_RECEIVED;
     }
 
-    LogFatal() << "invalid iox_ClientEvent value";
+    IOX_LOG(FATAL) << "invalid iox_ClientEvent value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_CLIENT_EVENT_VALUE);
     return iox::popo::ClientEvent::RESPONSE_RECEIVED;
 }
@@ -96,7 +97,7 @@ iox::popo::ClientState clientState(const iox_ClientState value) noexcept
         return iox::popo::ClientState::HAS_RESPONSE;
     }
 
-    LogFatal() << "invalid iox_ClientState value";
+    IOX_LOG(FATAL) << "invalid iox_ClientState value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_CLIENT_STATE_VALUE);
     return iox::popo::ClientState::HAS_RESPONSE;
 }
@@ -109,7 +110,7 @@ iox::popo::ServerEvent serverEvent(const iox_ServerEvent value) noexcept
         return iox::popo::ServerEvent::REQUEST_RECEIVED;
     }
 
-    LogFatal() << "invalid iox_ServerEvent value";
+    IOX_LOG(FATAL) << "invalid iox_ServerEvent value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVER_EVENT_VALUE);
     return iox::popo::ServerEvent::REQUEST_RECEIVED;
 }
@@ -122,7 +123,7 @@ iox::popo::ServerState serverState(const iox_ServerState value) noexcept
         return iox::popo::ServerState::HAS_REQUEST;
     }
 
-    LogFatal() << "invalid iox_ServerState value";
+    IOX_LOG(FATAL) << "invalid iox_ServerState value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVER_STATE_VALUE);
     return iox::popo::ServerState::HAS_REQUEST;
 }
@@ -135,7 +136,7 @@ iox::runtime::ServiceDiscoveryEvent serviceDiscoveryEvent(const iox_ServiceDisco
         return iox::runtime::ServiceDiscoveryEvent::SERVICE_REGISTRY_CHANGED;
     }
 
-    LogFatal() << "invalid iox_ServiceDiscoveryEvent value";
+    IOX_LOG(FATAL) << "invalid iox_ServiceDiscoveryEvent value";
     errorHandler(iox::CBindingError::BINDING_C__C2CPP_ENUM_TRANSLATION_INVALID_SERVICE_DISCOVERY_EVENT_VALUE);
     return iox::runtime::ServiceDiscoveryEvent::SERVICE_REGISTRY_CHANGED;
 }
@@ -150,7 +151,7 @@ iox::popo::MessagingPattern messagingPattern(const iox_MessagingPattern value) n
         return iox::popo::MessagingPattern::REQ_RES;
     }
 
-    LogFatal() << "invalid iox_MessagingPattern value";
+    IOX_LOG(FATAL) << "invalid iox_MessagingPattern value";
     errorHandler(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_publisher.cpp b/iceoryx_binding_c/source/c_publisher.cpp
@@ -22,6 +22,7 @@
 #include "iceoryx_binding_c/internal/cpp2c_service_description_translation.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
+#include "iox/logging.hpp"
 
 
 using namespace iox;
@@ -41,7 +42,7 @@ void iox_pub_options_init(iox_pub_options_t* options)
 {
     if (options == nullptr)
     {
-        LogWarn() << "publisher options initialization skipped - null pointer provided";
+        IOX_LOG(WARN) << "publisher options initialization skipped - null pointer provided";
         return;
     }
 
@@ -67,7 +68,7 @@ iox_pub_t iox_pub_init(iox_pub_storage_t* self,
 {
     if (self == nullptr)
     {
-        LogWarn() << "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 +81,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
-            LogFatal() << "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";
             errorHandler(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
@@ -15,7 +15,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-
 #include "iceoryx_binding_c/enums.h"
 #include "iceoryx_binding_c/error_handling/error_handling.hpp"
 #include "iceoryx_binding_c/internal/c2cpp_enum_translation.hpp"
@@ -25,6 +24,7 @@
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
+#include "iox/logging.hpp"
 
 
 using namespace iox;
@@ -51,7 +51,7 @@ void iox_sub_options_init(iox_sub_options_t* options)
 {
     if (options == nullptr)
     {
-        LogWarn() << "subscriber options initialization skipped - null pointer provided";
+        IOX_LOG(WARN) << "subscriber options initialization skipped - null pointer provided";
         return;
     }
 
@@ -79,7 +79,7 @@ iox_sub_t iox_sub_init(iox_sub_storage_t* self,
 {
     if (self == nullptr)
     {
-        LogWarn() << "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;
     }
 
@@ -92,7 +92,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
-            LogFatal() << "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";
             errorHandler(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
@@ -17,6 +17,7 @@
 
 #include "iceoryx_binding_c/internal/cpp2c_enum_translation.hpp"
 #include "iceoryx_posh/popo/user_trigger.hpp"
+#include "iox/logging.hpp"
 
 using namespace iox;
 using namespace iox::popo;
@@ -29,7 +30,7 @@ iox_user_trigger_t iox_user_trigger_init(iox_user_trigger_storage_t* self)
 {
     if (self == nullptr)
     {
-        LogWarn() << "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_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() && (cmdLineArgs.get_error() != iox::config::CmdLineParserResult::INFO_OUTPUT_ONLY))
     {
-        LogFatal() << "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
@@ -30,7 +30,7 @@ int main(int argc, char* argv[])
     auto cmdLineArgs = cmdLineParser.parse(argc, argv);
     if (cmdLineArgs.has_error() && (cmdLineArgs.get_error() != iox::config::CmdLineParserResult::INFO_OUTPUT_ONLY))
     {
-        LogFatal() << "Unable to parse command line arguments!";
+        IOX_LOG(FATAL) << "Unable to parse command line arguments!";
         return EXIT_FAILURE;
     }
 

diff --git a/iceoryx_posh/cmake/iceoryx_versions.hpp.in b/iceoryx_posh/cmake/iceoryx_versions.hpp.in
@@ -10,9 +10,9 @@
 #define ICEORYX_BUILDDATE                 "@ICEORYX_BUILDDATE@"
 #define ICEORYX_SHA1                      "@ICEORYX_SHA1@"
 
-#include "iceoryx_posh/internal/log/posh_logging.hpp"
+#include "iox/logging.hpp"
 
-#define ICEORYX_PRINT_BUILDINFO()     iox::LogInfo() << "Built: " << ICEORYX_BUILDDATE;
+#define ICEORYX_PRINT_BUILDINFO()     IOX_LOG(INFO) << "Built: " << ICEORYX_BUILDDATE;
 
 
 #endif
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl b/iceoryx_posh/include/iceoryx_posh/internal/gateway/gateway_generic.inl
@@ -21,7 +21,7 @@
 
 #include "iceoryx_dust/cxx/file_reader.hpp"
 #include "iceoryx_posh/gateway/gateway_generic.hpp"
-#include "iceoryx_posh/internal/log/posh_logging.hpp"
+#include "iox/logging.hpp"
 
 // ================================================== Public ================================================== //
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/log/posh_logging.hpp b/iceoryx_posh/include/iceoryx_posh/internal/log/posh_logging.hpp
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mepoo_segment.inl
@@ -18,10 +18,10 @@
 #define IOX_POSH_MEPOO_MEPOO_SEGMENT_INL
 
 #include "iceoryx_posh/error_handling/error_handling.hpp"
-#include "iceoryx_posh/internal/log/posh_logging.hpp"
 #include "iceoryx_posh/internal/mepoo/mepoo_segment.hpp"
 #include "iceoryx_posh/mepoo/memory_info.hpp"
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
+#include "iox/logging.hpp"
 #include "iox/relative_pointer.hpp"
 
 namespace iox
@@ -84,9 +84,9 @@ inline SharedMemoryObjectType MePooSegment<SharedMemoryObjectType, MemoryManager
                 }
                 this->setSegmentId(static_cast<uint64_t>(maybeSegmentId.value()));
 
-                LogDebug() << "Roudi registered payload data segment "
-                           << iox::log::hex(sharedMemoryObject.getBaseAddress()) << " with size "
-                           << sharedMemoryObject.getSizeInBytes() << " to id " << m_segmentId;
+                IOX_LOG(DEBUG) << "Roudi registered payload data segment "
+                               << iox::log::hex(sharedMemoryObject.getBaseAddress()) << " with size "
+                               << sharedMemoryObject.getSizeInBytes() << " to id " << m_segmentId;
             })
             .or_else([](auto&) { errorHandler(PoshError::MEPOO__SEGMENT_UNABLE_TO_CREATE_SHARED_MEMORY_OBJECT); })
             .value());

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/base_client.inl
@@ -106,7 +106,7 @@ inline void BaseClient<PortT, TriggerHandleT>::enableState(TriggerHandleT&& trig
     case ClientState::HAS_RESPONSE:
         if (m_trigger)
         {
-            LogWarn()
+            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 ClientState::HAS_RESPONSE. Best practice is to call detach first.";
@@ -155,7 +155,7 @@ inline void BaseClient<PortT, TriggerHandleT>::enableEvent(TriggerHandleT&& trig
     case ClientEvent::RESPONSE_RECEIVED:
         if (m_trigger)
         {
-            LogWarn()
+            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
@@ -110,7 +110,7 @@ inline void BaseServer<PortT, TriggerHandleT>::enableState(TriggerHandleT&& trig
     case ServerState::HAS_REQUEST:
         if (m_trigger)
         {
-            LogWarn()
+            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 ServerState::HAS_REQUEST. Best practice is to call detach first.";
@@ -159,7 +159,7 @@ inline void BaseServer<PortT, TriggerHandleT>::enableEvent(TriggerHandleT&& trig
     case ServerEvent::REQUEST_RECEIVED:
         if (m_trigger)
         {
-            LogWarn()
+            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
@@ -118,7 +118,7 @@ inline void BaseSubscriber<port_t>::enableState(iox::popo::TriggerHandle&& trigg
     case SubscriberState::HAS_DATA:
         if (m_trigger)
         {
-            LogWarn()
+            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 SubscriberState::HAS_DATA. Best practice is to call detach first.";
@@ -167,7 +167,7 @@ inline void BaseSubscriber<port_t>::enableEvent(iox::popo::TriggerHandle&& trigg
     case SubscriberEvent::DATA_RECEIVED:
         if (m_trigger)
         {
-            LogWarn()
+            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
@@ -69,8 +69,8 @@ ChunkDistributor<ChunkDistributorDataType>::tryAddQueue(not_null<ChunkQueueData_
 
             if (requestedHistory > getMembers()->m_historyCapacity)
             {
-                LogWarn() << "Chunk history request exceeds history capacity! Request is " << requestedHistory
-                          << ". Capacity is " << getMembers()->m_historyCapacity << ".";
+                IOX_LOG(WARN) << "Chunk history request exceeds history capacity! Request is " << requestedHistory
+                              << ". Capacity is " << getMembers()->m_historyCapacity << ".";
             }
 
             // if the current history is large enough we send the requested number of chunks, else we send the

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor_data.hpp
@@ -19,11 +19,11 @@
 
 #include "iceoryx_hoofs/internal/posix_wrapper/mutex.hpp"
 #include "iceoryx_posh/error_handling/error_handling.hpp"
-#include "iceoryx_posh/internal/log/posh_logging.hpp"
 #include "iceoryx_posh/internal/mepoo/shm_safe_unmanaged_chunk.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_queue_pusher.hpp"
 #include "iceoryx_posh/popo/port_queue_policies.hpp"
 #include "iox/algorithm.hpp"
+#include "iox/logging.hpp"
 #include "iox/relative_pointer.hpp"
 #include "iox/vector.hpp"
 

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
@@ -42,7 +42,7 @@ inline ChunkDistributorData<ChunkDistributorDataProperties, LockingPolicy, Chunk
 {
     if (m_historyCapacity != historyCapacity)
     {
-        LogWarn() << "Chunk history too large, reducing from " << historyCapacity << " to " << m_historyCapacity;
+        IOX_LOG(WARN) << "Chunk history too large, reducing from " << historyCapacity << " to " << m_historyCapacity;
     }
 }
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_popper.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_popper.inl
@@ -17,8 +17,8 @@
 #ifndef IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_QUEUE_POPPER_INL
 #define IOX_POSH_POPO_BUILDING_BLOCKS_CHUNK_QUEUE_POPPER_INL
 
-#include "iceoryx_posh/internal/log/posh_logging.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/chunk_queue_popper.hpp"
+#include "iox/logging.hpp"
 
 namespace iox
 {
@@ -57,8 +57,8 @@ inline optional<mepoo::SharedChunk> ChunkQueuePopper<ChunkQueueDataType>::tryPop
         auto receivedChunkHeaderVersion = chunk.getChunkHeader()->chunkHeaderVersion();
         if (receivedChunkHeaderVersion != mepoo::ChunkHeader::CHUNK_HEADER_VERSION)
         {
-            LogError() << "Received chunk with CHUNK_HEADER_VERSION '" << receivedChunkHeaderVersion
-                       << "' but expected '" << mepoo::ChunkHeader::CHUNK_HEADER_VERSION << "'! Dropping chunk!";
+            IOX_LOG(ERROR) << "Received chunk with CHUNK_HEADER_VERSION '" << receivedChunkHeaderVersion
+                           << "' but expected '" << mepoo::ChunkHeader::CHUNK_HEADER_VERSION << "'! Dropping chunk!";
             errorHandler(PoshError::POPO__CHUNK_QUEUE_POPPER_CHUNK_WITH_INCOMPATIBLE_CHUNK_HEADER_VERSION,
                          ErrorLevel::SEVERE);
             return nullopt_t();

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/request.inl
@@ -33,7 +33,7 @@ inline expected<ClientSendError> Request<T>::send() noexcept
     }
     else
     {
-        LogError() << "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!";
         errorHandler(PoshError::POSH__SENDING_EMPTY_REQUEST, ErrorLevel::MODERATE);
         return error<ClientSendError>(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
@@ -33,7 +33,7 @@ inline expected<ServerSendError> Response<T>::send() noexcept
     }
     else
     {
-        LogError() << "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!";
         errorHandler(PoshError::POSH__SENDING_EMPTY_RESPONSE, ErrorLevel::MODERATE);
         return error<ServerSendError>(ServerSendError::INVALID_RESPONSE);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         if (m_historyCapacity != historyCapacity)
         {
-            LogWarn() << "Chunk history too large, reducing from " << historyCapacity << " to " << m_historyCapacity;
+            IOX_LOG(WARN) << "Chunk history too large, reducing from " << historyCapacity << " to " << m_historyCapacity;
         }
     }
@@ Expand Down @@