From 65f858d2a15ef29ee0523dc378162fe3286ffba2 Mon Sep 17 00:00:00 2001 From: Knese Karsten Date: Fri, 25 Oct 2019 16:01:09 -0700 Subject: [PATCH 1/2] whitespace cleanup Signed-off-by: Knese Karsten --- iceoryx_examples/icedelivery/CMakeLists.txt | 12 ++++----- iceoryx_examples/icedelivery/README.md | 16 ++++++------ iceoryx_examples/icedelivery/a_typed_api.hpp | 8 +++--- iceoryx_examples/icedelivery/ice_receiver.cpp | 2 +- .../icedelivery/ice_receiver_simple.cpp | 2 +- iceoryx_examples/icedelivery/ice_sender.cpp | 4 +-- .../icedelivery/ice_sender_simple.cpp | 2 +- iceoryx_posh/CMakeLists.txt | 8 +++--- iceoryx_posh/cmake/iceoryx_versions.hpp.in | 4 +-- iceoryx_posh/cmake/iceoryxversions.cmake | 20 +++++++------- .../internal/popo/receiver_port_data.hpp | 2 +- .../internal/popo/used_chunk_list.hpp | 1 - .../introspection/mempool_introspection.inl | 1 - .../introspection/port_introspection.hpp | 2 +- .../introspection/port_introspection.inl | 1 - .../introspection/process_introspection.hpp | 1 - .../introspection/process_introspection.inl | 1 - .../internal/runtime/runnable_data.hpp | 2 +- .../iceoryx_posh/mepoo/mepoo_config.hpp | 4 +-- .../iceoryx_posh/popo/gateway_discovery.hpp | 2 +- .../iceoryx_posh/popo/gateway_generic.hpp | 3 +-- .../include/iceoryx_posh/popo/subscriber.hpp | 2 +- iceoryx_posh/source/mepoo/mepoo_config.cpp | 4 +-- iceoryx_posh/source/popo/base_port.cpp | 2 +- iceoryx_posh/source/roudi/roudi_process.cpp | 1 - iceoryx_utils/CMakeLists.txt | 8 +++--- .../cmake/IceoryxPackageHelper.cmake | 26 +++++++++---------- tools/iceoryx_build_test.sh | 2 +- 28 files changed, 68 insertions(+), 75 deletions(-) diff --git a/iceoryx_examples/icedelivery/CMakeLists.txt b/iceoryx_examples/icedelivery/CMakeLists.txt index 149058cc32..8988420c42 100644 --- a/iceoryx_examples/icedelivery/CMakeLists.txt +++ b/iceoryx_examples/icedelivery/CMakeLists.txt @@ -6,30 +6,30 @@ include(GNUInstallDirs) find_package(iceoryx_posh CONFIG REQUIRED) -add_executable(ice_sender ./ice_sender.cpp) +add_executable(ice_sender ./ice_sender.cpp) target_link_libraries(ice_sender iceoryx_posh::iceoryx_posh ) -add_executable(ice_receiver ./ice_receiver.cpp) +add_executable(ice_receiver ./ice_receiver.cpp) target_link_libraries(ice_receiver iceoryx_posh::iceoryx_posh ) -add_executable(ice_sender_simple ./ice_sender_simple.cpp) +add_executable(ice_sender_simple ./ice_sender_simple.cpp) target_link_libraries(ice_sender_simple iceoryx_posh::iceoryx_posh ) -add_executable(ice_receiver_simple ./ice_receiver_simple.cpp) +add_executable(ice_receiver_simple ./ice_receiver_simple.cpp) target_link_libraries(ice_receiver_simple iceoryx_posh::iceoryx_posh ) set_target_properties(ice_sender ice_receiver ice_sender_simple ice_receiver_simple - PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/icedelivery") + PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/icedelivery") install( TARGETS ice_sender ice_receiver ice_sender_simple ice_receiver_simple RUNTIME DESTINATION bin -) \ No newline at end of file +) diff --git a/iceoryx_examples/icedelivery/README.md b/iceoryx_examples/icedelivery/README.md index 56b2a883cd..7e9df2dff9 100644 --- a/iceoryx_examples/icedelivery/README.md +++ b/iceoryx_examples/icedelivery/README.md @@ -12,7 +12,7 @@ communication setup but does not actually participate in the communication betwe of RouDi as the switchboard operator of iceoryx. One of his other major tasks is the setup of the shared memory, which the applications are using to talk to each other. We currently use memory pools with different chunk sizes, called in literature a segregated free-list approach. RouDi is delivered pre-built in the Debian package -with a default memory config. We don't support the memory pool configuration with a config file yet, so it has to be +with a default memory config. We don't support the memory pool configuration with a config file yet, so it has to be changed in the source file [mepoo_config.cpp](../../iceoryx_posh/source/mepoo/mepoo_config.cpp). To view the available command line options call `RouDi --help`. @@ -42,9 +42,9 @@ The counter can differ depending on startup of the applications. ### RouDi Reserving 99683360 bytes in the shared memory [/iceoryx_mgmt] - [ Reserving shared memory successful ] + [ Reserving shared memory successful ] Reserving 410709312 bytes in the shared memory [/username] - [ Reserving shared memory successful ] + [ Reserving shared memory successful ] ### Sender @@ -108,12 +108,12 @@ to everyone: The strings inside the first parameter of the constructor of `iox::popo::Publisher` are of the type `capro::ServiceDescription`. `capro` stands for **ca**nionical **pro**tocol and is used to abstract different SoA protocols. `Radar` is the service name, `FrontLeft` an instance of the service `Radar` and the third string the -specific event `Counter` of the instance. This service model comes from AUTOSAR. It is maybe not the best fit for -typical publish/subscribe APIs but it allows us a matching to different technologies. The event can be compared to +specific event `Counter` of the instance. This service model comes from AUTOSAR. It is maybe not the best fit for +typical publish/subscribe APIs but it allows us a matching to different technologies. The event can be compared to a topic in other publish/subscribe approaches. The service is not a single request/response thing but an element -for grouping of events and/or methods that can be discovered as a service. Service and instance are like classes and +for grouping of events and/or methods that can be discovered as a service. Service and instance are like classes and objects in C++. So you always have a specific instance of a service during runtime. In iceoryx a publisher and -a subscriber only match if all the three IDs match. +a subscriber only match if all the three IDs match. Now comes the work mode. Data needs to be created. But hang on.. we need memory first! Let's reserve a chunk of shared memory: @@ -239,7 +239,7 @@ Another difference to the prior sender is the simpler `allocate()` call with the myTypedPublisher.publish(std::move(sample)); Now `allocate()` returns a `std::unique_ptr>` instead of a `void*` , which -automatically frees the memory when going out of scope. For sening the sample the ownership must be transferred +automatically frees the memory when going out of scope. For sening the sample the ownership must be transferred to the middleware with a move operation. ### Receiver (simple) diff --git a/iceoryx_examples/icedelivery/a_typed_api.hpp b/iceoryx_examples/icedelivery/a_typed_api.hpp index 92b655934d..4ca73bbc01 100644 --- a/iceoryx_examples/icedelivery/a_typed_api.hpp +++ b/iceoryx_examples/icedelivery/a_typed_api.hpp @@ -29,7 +29,7 @@ using SamplePtr = std::unique_ptr>; /// @brief A typed publisher that takes the topic type as template argument /// A RAII pattern is used with offering the the publisher in c'tor and stop offering in d'tor /// This class has the limitation that the topic type is a fixed size data structure. -/// I.e. we can get the size of memory to allcoate with the sizeof() operation. +/// I.e. we can get the size of memory to allcoate with the sizeof() operation. /// So the topic type is not allowed to use heap-based members like a std::vector with default allocator /// allocate() returns a unique_ptr to a sample. This must be moved to the publish call for sending /// If the unique_ptr goes out of scope without publishing, the provided custom deleter frees the memory chunk @@ -121,8 +121,8 @@ class TypedSubscriber while (m_subscriber.getChunk(&chunk)) { auto sample = static_cast(chunk); - - // call the provided callback + + // call the provided callback m_callback(*sample); // release the chunk @@ -132,4 +132,4 @@ class TypedSubscriber iox::popo::Subscriber m_subscriber; OnReceiveCallback m_callback; -}; \ No newline at end of file +}; diff --git a/iceoryx_examples/icedelivery/ice_receiver.cpp b/iceoryx_examples/icedelivery/ice_receiver.cpp index 63ff4d4b74..8d87cee356 100644 --- a/iceoryx_examples/icedelivery/ice_receiver.cpp +++ b/iceoryx_examples/icedelivery/ice_receiver.cpp @@ -64,7 +64,7 @@ void receiving() { std::cout << "Not subscribed" << std::endl; } - + // sleep std::this_thread::sleep_for(std::chrono::milliseconds(1000)); } diff --git a/iceoryx_examples/icedelivery/ice_receiver_simple.cpp b/iceoryx_examples/icedelivery/ice_receiver_simple.cpp index 076ce73aa4..f1b9d02f01 100644 --- a/iceoryx_examples/icedelivery/ice_receiver_simple.cpp +++ b/iceoryx_examples/icedelivery/ice_receiver_simple.cpp @@ -45,7 +45,7 @@ void receiving() TypedSubscriber myTypedSubscriber({"Radar", "FrontRight", "Counter"}, myCallback); while (!killswitch) - { + { // sleep std::this_thread::sleep_for(std::chrono::milliseconds(1000)); } diff --git a/iceoryx_examples/icedelivery/ice_sender.cpp b/iceoryx_examples/icedelivery/ice_sender.cpp index 9b6b081b66..7a0e1c08f7 100644 --- a/iceoryx_examples/icedelivery/ice_sender.cpp +++ b/iceoryx_examples/icedelivery/ice_sender.cpp @@ -35,7 +35,7 @@ void sending() // Create a publisher iox::popo::Publisher myPublisher({"Radar", "FrontLeft", "Counter"}); - + // With offer() the publisher gets visible to potential subscribers myPublisher.offer(); @@ -53,7 +53,7 @@ void sending() // Send the sample myPublisher.sendChunk(sample); - + ct++; // Sleep some time diff --git a/iceoryx_examples/icedelivery/ice_sender_simple.cpp b/iceoryx_examples/icedelivery/ice_sender_simple.cpp index aa50879915..b186e4e0b2 100644 --- a/iceoryx_examples/icedelivery/ice_sender_simple.cpp +++ b/iceoryx_examples/icedelivery/ice_sender_simple.cpp @@ -52,7 +52,7 @@ void sending() // pass the ownership to the middleware for sending the sample myTypedPublisher.publish(std::move(sample)); - + ct++; // Sleep some time diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt index ecb863b935..c75d9d015c 100644 --- a/iceoryx_posh/CMakeLists.txt +++ b/iceoryx_posh/CMakeLists.txt @@ -25,8 +25,8 @@ endif( clang-tidy ) ########## set variables for library export ########## # setup_package_name_and_create_files( - NAME ${PROJECT_NAME} - NAMESPACE iceoryx_posh + NAME ${PROJECT_NAME} + NAMESPACE iceoryx_posh PROJECT_PREFIX ${PREFIX} ) @@ -182,7 +182,7 @@ if(PERFORM_CLANG_TIDY) ) endif(PERFORM_CLANG_TIDY) target_link_libraries(RouDi - PRIVATE + PRIVATE ${PROJECT_NAMESPACE}::iceoryx_posh_roudi ) @@ -214,7 +214,7 @@ endif(roudi_environment) ########## exporting library ########## # setup_install_directories_and_export_package( - TARGETS iceoryx_posh iceoryx_posh_roudi RouDi + TARGETS iceoryx_posh iceoryx_posh_roudi RouDi INCLUDE_DIRECTORY include/ ) diff --git a/iceoryx_posh/cmake/iceoryx_versions.hpp.in b/iceoryx_posh/cmake/iceoryx_versions.hpp.in index 188b475050..b29ffa5ce5 100644 --- a/iceoryx_posh/cmake/iceoryx_versions.hpp.in +++ b/iceoryx_posh/cmake/iceoryx_versions.hpp.in @@ -5,7 +5,7 @@ #define ICEORYX_BUILDDATE "@ICEORYX_BUILDDATE@" -#define ICEORYX_PRINT_BUILDINFO() INFO_PRINTF("Built: %s\n",ICEORYX_BUILDDATE); - +#define ICEORYX_PRINT_BUILDINFO() INFO_PRINTF("Built: %s\n",ICEORYX_BUILDDATE); + #endif diff --git a/iceoryx_posh/cmake/iceoryxversions.cmake b/iceoryx_posh/cmake/iceoryxversions.cmake index 12a3ffbe31..52ae41680a 100644 --- a/iceoryx_posh/cmake/iceoryxversions.cmake +++ b/iceoryx_posh/cmake/iceoryxversions.cmake @@ -1,17 +1,17 @@ # Find GIT revisions execute_process(COMMAND - git describe --match=None --always --abbrev=40 --dirty - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - OUTPUT_VARIABLE ICEORYX_SHA1 - OUTPUT_STRIP_TRAILING_WHITESPACE) + git describe --match=None --always --abbrev=40 --dirty + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + OUTPUT_VARIABLE ICEORYX_SHA1 + OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND - date -u -R - OUTPUT_VARIABLE ICEORYX_BUILDDATE - OUTPUT_STRIP_TRAILING_WHITESPACE) + date -u -R + OUTPUT_VARIABLE ICEORYX_BUILDDATE + OUTPUT_STRIP_TRAILING_WHITESPACE) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_versions.hpp.in" - "${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp" @ONLY) + "${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp" @ONLY) install(FILES ${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp - DESTINATION include/${PREFIX} - COMPONENT dev) + DESTINATION include/${PREFIX} + COMPONENT dev) diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port_data.hpp index 82360cfd75..2f2793b51f 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port_data.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/receiver_port_data.hpp @@ -50,7 +50,7 @@ struct ReceiverPortData : public BasePortData mutable std::atomic_bool m_chunkSendCallbackActive{false}; mutable cxx::optional m_chunkSendCallbackMutex = mutex_t::CreateMutex(false); posix::Semaphore* m_chunkSendSemaphore{nullptr}; - + // offer semaphore that is stored in shared memory sem_t m_shmSemaphoreHandle; posix::Semaphore::result_t m_shmSemaphore = posix::Semaphore::create(); diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp index 9a037a2360..fa75f2e533 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/popo/used_chunk_list.hpp @@ -161,6 +161,5 @@ class UsedChunkList std::array m_data; }; - } // namespace popo } // namespace iox 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 a3405e2b83..6de6554635 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 @@ -174,6 +174,5 @@ void MemPoolIntrospection::copyMemPoo } } - } // namespace roudi } // namespace iox diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.hpp index af35bfcfac..ebf1d2eb5a 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace iox { diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.inl b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.inl index 0c371fb867..dbd708b517 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.inl @@ -534,6 +534,5 @@ bool PortIntrospection::removeReceiver(const std::string& name, cons return m_portData.removeReceiver(name, service); } - } // namespace roudi } // namespace iox diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.hpp index 395f07b03f..a051f26f06 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.hpp @@ -136,7 +136,6 @@ class ProcessIntrospection */ using ProcessIntrospectionType = ProcessIntrospection; - } // namespace roudi } // namespace iox diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.inl b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.inl index ca3bf43891..c3296dcf13 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.inl +++ b/iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.inl @@ -224,6 +224,5 @@ void ProcessIntrospection::setSendInterval(unsigned int interval_ms) } } - } // namespace roudi } // namespace iox diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/runnable_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/runnable_data.hpp index f6d8fe63ed..35c7f85e8f 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/runtime/runnable_data.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/runtime/runnable_data.hpp @@ -35,7 +35,7 @@ struct RunnableData iox::cxx::CString100 m_process; - iox::cxx::CString100 m_runnable; + iox::cxx::CString100 m_runnable; uint64_t m_runnableDeviceIdentifier; }; } // namespace runtime diff --git a/iceoryx_posh/include/iceoryx_posh/mepoo/mepoo_config.hpp b/iceoryx_posh/include/iceoryx_posh/mepoo/mepoo_config.hpp index b290e8eeb5..13e89f416e 100644 --- a/iceoryx_posh/include/iceoryx_posh/mepoo/mepoo_config.hpp +++ b/iceoryx_posh/include/iceoryx_posh/mepoo/mepoo_config.hpp @@ -44,7 +44,7 @@ struct MePooConfig using MePooConfigContainerType = cxx::vector; MePooConfigContainerType m_mempoolConfig; - + /// @brief Default constructor to set the configuration for memory pools MePooConfig() = default; @@ -55,7 +55,7 @@ struct MePooConfig /// @brief Function for adding new entry /// @param[in] Entry structure of mempool configuration void addMemPool(Entry f_entry) noexcept; - + /// @brief Function for creating default memory pools MePooConfig& setDefaults() noexcept; diff --git a/iceoryx_posh/include/iceoryx_posh/popo/gateway_discovery.hpp b/iceoryx_posh/include/iceoryx_posh/popo/gateway_discovery.hpp index d7b6f938a4..9e337b07b2 100644 --- a/iceoryx_posh/include/iceoryx_posh/popo/gateway_discovery.hpp +++ b/iceoryx_posh/include/iceoryx_posh/popo/gateway_discovery.hpp @@ -27,7 +27,7 @@ namespace popo { class InterfacePort; - /// @brief Discover the gateway +/// @brief Discover the gateway template class GatewayDiscovery { diff --git a/iceoryx_posh/include/iceoryx_posh/popo/gateway_generic.hpp b/iceoryx_posh/include/iceoryx_posh/popo/gateway_generic.hpp index 950fcd6d66..be0678ffef 100644 --- a/iceoryx_posh/include/iceoryx_posh/popo/gateway_generic.hpp +++ b/iceoryx_posh/include/iceoryx_posh/popo/gateway_generic.hpp @@ -35,7 +35,7 @@ class GatewayGeneric { public: using CaproMessage = capro::CaproMessage; - + /// @brief Constructor for creating generic gateway based on type of interface /// @param[in] f_interface Type of interface GatewayGeneric(const Interfaces f_interface) noexcept; @@ -43,7 +43,6 @@ class GatewayGeneric GatewayGeneric& operator=(const GatewayGeneric& other) = delete; GatewayGeneric(const GatewayGeneric& other) = delete; - /// @brief Get function for type of capro message - service or event or field /// @param[in] msg Type of caro message bool getCaProMessage(CaproMessage& msg) noexcept; diff --git a/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp index a2ee00188c..8956f2d7ae 100644 --- a/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp +++ b/iceoryx_posh/include/iceoryx_posh/popo/subscriber.hpp @@ -42,7 +42,7 @@ class Subscriber using mutex_t = std::mutex; using ReceiveHandler_t = std::function; - /// @brief Constructor + /// @brief Constructor /// @param[in] service Information on service , service, instance, event Id /// @param[in] runnableName optional name of the runnable the subscriber belongs to explicit Subscriber(const capro::ServiceDescription& service, const cxx::CString100& runnableName = "") noexcept; diff --git a/iceoryx_posh/source/mepoo/mepoo_config.cpp b/iceoryx_posh/source/mepoo/mepoo_config.cpp index 3f4b0f0b75..25e03dbdd3 100644 --- a/iceoryx_posh/source/mepoo/mepoo_config.cpp +++ b/iceoryx_posh/source/mepoo/mepoo_config.cpp @@ -50,8 +50,8 @@ MePooConfig& MePooConfig::setDefaults() noexcept m_mempoolConfig.push_back({1024 * 1024 * 2, 20}); m_mempoolConfig.push_back({1024 * 1024 * 4, 10}); m_mempoolConfig.push_back({1024 * 1024 * 8, 10}); - m_mempoolConfig.push_back({1024 * 1024 * 16, 5}); - m_mempoolConfig.push_back({1024 * 1024 * 32, 2}); + m_mempoolConfig.push_back({1024 * 1024 * 16, 10}); + m_mempoolConfig.push_back({1024 * 1024 * 32, 10}); return *this; } diff --git a/iceoryx_posh/source/popo/base_port.cpp b/iceoryx_posh/source/popo/base_port.cpp index 858e3da419..da335c36b9 100644 --- a/iceoryx_posh/source/popo/base_port.cpp +++ b/iceoryx_posh/source/popo/base_port.cpp @@ -21,7 +21,7 @@ namespace popo std::atomic BasePort::MemberType_t::s_uniqueIdCounter{1}; BasePort::BasePort(BasePortData* const f_basePortDataPtr) noexcept - : m_basePortDataPtr(f_basePortDataPtr) + : m_basePortDataPtr(f_basePortDataPtr) { } diff --git a/iceoryx_posh/source/roudi/roudi_process.cpp b/iceoryx_posh/source/roudi/roudi_process.cpp index e5e6bb7811..28dc063f75 100644 --- a/iceoryx_posh/source/roudi/roudi_process.cpp +++ b/iceoryx_posh/source/roudi/roudi_process.cpp @@ -461,7 +461,6 @@ void ProcessManager::addSenderForProcess(const std::string& f_name, l_process->sendToMQ(l_sendBuffer); ERR_PRINTF("Could not create SenderPortImpl for application %s\n", f_name.c_str()); } - } else { diff --git a/iceoryx_utils/CMakeLists.txt b/iceoryx_utils/CMakeLists.txt index b9b76c2edc..3a352faefb 100644 --- a/iceoryx_utils/CMakeLists.txt +++ b/iceoryx_utils/CMakeLists.txt @@ -90,12 +90,12 @@ if(GTest_FOUND) # only GTest_FOUND, just in case someone want's to use iceoryx_u endif(NOT CMAKE_SYSTEM_NAME MATCHES QNX) # install_target_directories_and_header( - # TARGETS iceoryx_utils_testing + # TARGETS iceoryx_utils_testing # INCLUDE_DIRECTORY testutils/ # ) setup_install_directories_and_export_package( - TARGETS iceoryx_utils_testing + TARGETS iceoryx_utils_testing INCLUDE_DIRECTORY testutils/ ) @@ -112,7 +112,7 @@ endif(GTest_FOUND) setup_package_name_and_create_files( NAME ${PROJECT_NAME} - NAMESPACE iceoryx_utils + NAMESPACE iceoryx_utils PROJECT_PREFIX ${PREFIX} ) @@ -189,7 +189,7 @@ endif(PERFORM_CLANG_TIDY) ########## exporting library ########## # setup_install_directories_and_export_package( - TARGETS iceoryx_utils + TARGETS iceoryx_utils INCLUDE_DIRECTORY include/ ) diff --git a/iceoryx_utils/cmake/IceoryxPackageHelper.cmake b/iceoryx_utils/cmake/IceoryxPackageHelper.cmake index bf32a80456..376c5d10a4 100644 --- a/iceoryx_utils/cmake/IceoryxPackageHelper.cmake +++ b/iceoryx_utils/cmake/IceoryxPackageHelper.cmake @@ -1,7 +1,7 @@ # setup_package_name_and_create_files : this macro which is called from other modules which use iceoryx_utils # sets the variables for package version file,config file used for configuration -# this also creates the config files +# this also creates the config files Macro(setup_package_name_and_create_files) set(options ) @@ -9,17 +9,17 @@ Macro(setup_package_name_and_create_files) set(multiValueArgs) cmake_parse_arguments(PARAMS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) - # set variables for library export + # set variables for library export set(PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PARAMS_NAME}ConfigVersion.cmake" ) set(PACKAGE_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PARAMS_NAME}Config.cmake" ) set(TARGETS_EXPORT_NAME "${PARAMS_NAME}Targets" ) set(PROJECT_NAMESPACE ${PARAMS_NAMESPACE} ) - + set(DESTINATION_BINDIR bin ) set(DESTINATION_LIBDIR lib ) set(DESTINATION_INCLUDEDIR include/${PARAMS_PROJECT_PREFIX}) set(DESTINATION_CONFIGDIR lib/cmake/${PARAMS_NAME} ) - + # create package files include(CMakePackageConfigHelpers) write_basic_package_version_file( @@ -30,10 +30,10 @@ Macro(setup_package_name_and_create_files) "cmake/Config.cmake.in" ${PACKAGE_CONFIG_FILE} INSTALL_DESTINATION ${DESTINATION_CONFIGDIR} - ) + ) endMacro() -# setup_install_directories_and_export_package : this macro route the call for installation +# setup_install_directories_and_export_package : this macro route the call for installation # of target and include directory, package version file , config file Macro(setup_install_directories_and_export_package) @@ -41,15 +41,15 @@ Macro(setup_install_directories_and_export_package) set(oneValueArgs INCLUDE_DIRECTORY ) set(multiValueArgs TARGETS) cmake_parse_arguments(INSTALL "${options}" "${oneValueArgs}" - "${multiValueArgs}" ${ARGN} ) + "${multiValueArgs}" ${ARGN} ) install_target_directories_and_header( - TARGETS ${INSTALL_TARGETS} + TARGETS ${INSTALL_TARGETS} INCLUDE_DIRECTORY ${INSTALL_INCLUDE_DIRECTORY} ) - install_package_files_and_export() + install_package_files_and_export() endMacro() -# install_target_directories_and_header : this macro does the installation +# install_target_directories_and_header : this macro does the installation # of target and include directory Macro(install_target_directories_and_header) @@ -66,7 +66,7 @@ Macro(install_target_directories_and_header) LIBRARY DESTINATION ${DESTINATION_LIBDIR} COMPONENT bin ARCHIVE DESTINATION ${DESTINATION_LIBDIR} COMPONENT bin ) - + # header install( DIRECTORY ${INSTALL_INCLUDE_DIRECTORY} @@ -75,7 +75,7 @@ Macro(install_target_directories_and_header) ) endMacro() -# install_package_files_and_export : this macro does the installation +# install_package_files_and_export : this macro does the installation # of package version and config file and also export the package Macro(install_package_files_and_export) @@ -84,7 +84,7 @@ Macro(install_package_files_and_export) FILES ${PACKAGE_VERSION_FILE} ${PACKAGE_CONFIG_FILE} DESTINATION ${DESTINATION_CONFIGDIR} ) - + # package export install( EXPORT ${TARGETS_EXPORT_NAME} diff --git a/tools/iceoryx_build_test.sh b/tools/iceoryx_build_test.sh index 9c9a460b02..7490bb62f1 100755 --- a/tools/iceoryx_build_test.sh +++ b/tools/iceoryx_build_test.sh @@ -116,7 +116,7 @@ for folder in $component_folder; do echo "xml:"$folder"_ComponenttestTestResults.xml not found!" exit 1 fi - + if [ ! -f testresults/"$folder"_IntegrationTestResults.xml ]; then echo "xml:"$folder"_IntegrationTestResults.xml not found!" exit 1 From a204c131c7a05aaececbb74ece4855cdb38b515b Mon Sep 17 00:00:00 2001 From: Knese Karsten Date: Mon, 4 Nov 2019 21:46:55 +0800 Subject: [PATCH 2/2] address review comments Signed-off-by: Knese Karsten --- iceoryx_examples/icedelivery/a_typed_api.hpp | 2 +- iceoryx_posh/source/mepoo/mepoo_config.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iceoryx_examples/icedelivery/a_typed_api.hpp b/iceoryx_examples/icedelivery/a_typed_api.hpp index 4ca73bbc01..7bb3bb0d7c 100644 --- a/iceoryx_examples/icedelivery/a_typed_api.hpp +++ b/iceoryx_examples/icedelivery/a_typed_api.hpp @@ -29,7 +29,7 @@ using SamplePtr = std::unique_ptr>; /// @brief A typed publisher that takes the topic type as template argument /// A RAII pattern is used with offering the the publisher in c'tor and stop offering in d'tor /// This class has the limitation that the topic type is a fixed size data structure. -/// I.e. we can get the size of memory to allcoate with the sizeof() operation. +/// I.e. we can get the size of memory to allocate with the sizeof() operation. /// So the topic type is not allowed to use heap-based members like a std::vector with default allocator /// allocate() returns a unique_ptr to a sample. This must be moved to the publish call for sending /// If the unique_ptr goes out of scope without publishing, the provided custom deleter frees the memory chunk diff --git a/iceoryx_posh/source/mepoo/mepoo_config.cpp b/iceoryx_posh/source/mepoo/mepoo_config.cpp index 25e03dbdd3..0f1942bda2 100644 --- a/iceoryx_posh/source/mepoo/mepoo_config.cpp +++ b/iceoryx_posh/source/mepoo/mepoo_config.cpp @@ -51,7 +51,7 @@ MePooConfig& MePooConfig::setDefaults() noexcept m_mempoolConfig.push_back({1024 * 1024 * 4, 10}); m_mempoolConfig.push_back({1024 * 1024 * 8, 10}); m_mempoolConfig.push_back({1024 * 1024 * 16, 10}); - m_mempoolConfig.push_back({1024 * 1024 * 32, 10}); + m_mempoolConfig.push_back({1024 * 1024 * 32, 5}); return *this; }