new publisher parameter api (sync with eclipse-ecal)

build/windows/05_build_pubsub_udp_only.bat

@@ -9,7 +9,7 @@ set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX=_install ^
 -DECAL_CORE_BUILD_TESTS=ON ^
 -DECAL_CORE_CONFIG_INIFILE=OFF ^
 -DECAL_CORE_COMMAND_LINE=OFF ^
--DECAL_CORE_REGISTRATION=OFF ^
+-DECAL_CORE_REGISTRATION=ON ^
 -DECAL_CORE_REGISTRATION_SHM=OFF ^
 -DECAL_CORE_MONITORING=OFF ^
 -DECAL_CORE_PUBLISHER=ON ^

build/windows/06_build_pubsub_tcp_only.bat

@@ -9,7 +9,7 @@ set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX=_install ^
 -DECAL_CORE_BUILD_TESTS=ON ^
 -DECAL_CORE_CONFIG_INIFILE=OFF ^
 -DECAL_CORE_COMMAND_LINE=OFF ^
--DECAL_CORE_REGISTRATION=OFF ^
+-DECAL_CORE_REGISTRATION=ON ^
 -DECAL_CORE_REGISTRATION_SHM=OFF ^
 -DECAL_CORE_MONITORING=OFF ^
 -DECAL_CORE_PUBLISHER=ON ^

ecal/core/CMakeLists.txt

@@ -195,6 +195,7 @@ endif()
 if(ECAL_CORE_PUBLISHER)
   set(ecal_pub_src
       src/pubsub/ecal_publisher.cpp
+      src/pubsub/ecal_publisher_config.cpp
       src/pubsub/ecal_pubgate.cpp
       src/pubsub/ecal_pubgate.h
   )
@@ -222,8 +223,8 @@ if(ECAL_CORE_PUBLISHER)
   )
   if(ECAL_CORE_TRANSPORT_UDP)
     list(APPEND ecal_writer_src
-        src/readwrite/udp/ecal_writer_udp_mc.cpp
-        src/readwrite/udp/ecal_writer_udp_mc.h
+        src/readwrite/udp/ecal_writer_udp.cpp
+        src/readwrite/udp/ecal_writer_udp.h
     )
   endif()
   if(ECAL_CORE_TRANSPORT_TCP)
@@ -249,8 +250,8 @@ if(ECAL_CORE_SUBSCRIBER)
   )
   if(ECAL_CORE_TRANSPORT_UDP)
     list(APPEND ecal_reader_src
-        src/readwrite/udp/ecal_reader_udp_mc.cpp
-        src/readwrite/udp/ecal_reader_udp_mc.h
+        src/readwrite/udp/ecal_reader_udp.cpp
+        src/readwrite/udp/ecal_reader_udp.h
     )
   endif()
   if(ECAL_CORE_TRANSPORT_TCP)
@@ -463,6 +464,7 @@ set(ecal_header_cmn
     include/ecal/ecal_process.h
     include/ecal/ecal_process_severity.h
     include/ecal/ecal_publisher.h
+    include/ecal/ecal_publisher_config.h
     include/ecal/ecal_server.h
     include/ecal/ecal_service_info.h
     include/ecal/ecal_subscriber.h

ecal/core/include/ecal/cimpl/ecal_publisher_cimpl.h

@@ -89,26 +89,6 @@ extern "C"
   **/
   ECALC_API int eCAL_Pub_ClearAttribute(ECAL_HANDLE handle_, const char* attr_name_, int attr_name_len_);
 
-  /**
-   * @brief Share topic type.
-   *
-   * @param handle_ Publisher handle. 
-   * @param state_  Set type share mode (none zero == share type).
-   *
-   * @return  None zero if succeeded.
-  **/
-  ECALC_API int eCAL_Pub_ShareType(ECAL_HANDLE handle_, int state_);
-
-  /**
-   * @brief Share topic description.
-   *
-   * @param handle_ Publisher handle. 
-   * @param state_  Set description share mode (none zero == share description).
-   *
-   * @return  None zero if succeeded.
-  **/
-  ECALC_API int eCAL_Pub_ShareDescription(ECAL_HANDLE handle_, int state_);
-
   /**
    * @brief Set the specific topic id.
    *

ecal/core/include/ecal/ecal_publisher.h

@@ -29,6 +29,7 @@
 #include <ecal/ecal_deprecate.h>
 #include <ecal/ecal_os.h>
 #include <ecal/ecal_payload_writer.h>
+#include <ecal/ecal_publisher_config.h>
 #include <ecal/ecal_types.h>
 
 #include <chrono>
@@ -69,7 +70,6 @@ namespace eCAL
   class CPublisher
   {
   public:
-
     ECAL_API static constexpr long long DEFAULT_TIME_ARGUMENT = -1;  /*!< Use DEFAULT_TIME_ARGUMENT in the `Send()` function to let eCAL determine the send timestamp */
 
     /**
@@ -80,17 +80,19 @@ namespace eCAL
     /**
      * @brief Constructor.
      *
-     * @param topic_name_   Unique topic name.
-     * @param topic_info_   Topic information (encoding, type, descriptor)
+     * @param topic_name_      Unique topic name.
+     * @param data_type_info_  Topic data type information (encoding, type, descriptor).
+     * @param config_          Optional configuration parameters.
     **/
-    ECAL_API CPublisher(const std::string& topic_name_, const SDataTypeInformation& topic_info_);
+    ECAL_API CPublisher(const std::string& topic_name_, const SDataTypeInformation& data_type_info_, const Publisher::Configuration& config_ = {});
 
     /**
      * @brief Constructor.
      *
      * @param topic_name_   Unique topic name.
+     * @param config_       Optional configuration parameters.
     **/
-    ECAL_API explicit CPublisher(const std::string& topic_name_);
+    ECAL_API explicit CPublisher(const std::string& topic_name_, const Publisher::Configuration& config_ = {});
 
     /**
      * @brief Destructor. 
@@ -120,12 +122,13 @@ namespace eCAL
     /**
      * @brief Creates this object.
      *
-     * @param topic_name_   Unique topic name.
-     * @param topic_info_   Topic information (encoding, type, descriptor)
+     * @param topic_name_      Unique topic name.
+     * @param data_type_info_  Topic data type information (encoding, type, descriptor).
+     * @param config_          Optional configuration parameters.
      *
      * @return  True if it succeeds, false if it fails.
     **/
-    ECAL_API bool Create(const std::string& topic_name_, const SDataTypeInformation& topic_info_);
+    ECAL_API bool Create(const std::string& topic_name_, const SDataTypeInformation& data_type_info_, const Publisher::Configuration& config_ = {});
 
     /**
      * @brief Creates this object.
@@ -146,11 +149,11 @@ namespace eCAL
     /**
      * @brief Setup topic information.
      *
-     * @param topic_info_  Topic information attributes.
+     * @param data_type_info_  Topic data type information attributes.
      *
      * @return  True if it succeeds, false if it fails.
     **/
-    ECAL_API bool SetDataTypeInformation(const SDataTypeInformation& topic_info_);
+    ECAL_API bool SetDataTypeInformation(const SDataTypeInformation& data_type_info_);
 
     /**
      * @brief Sets publisher attribute. 
@@ -172,24 +175,6 @@ namespace eCAL
     **/
     ECAL_API bool ClearAttribute(const std::string& attr_name_);
 
-    /**
-     * @brief Share topic type.
-     *
-     * @param state_  Set type share mode (true == share type).
-     *
-     * @return  True if it succeeds, false if it fails.
-    **/
-    ECAL_API bool ShareType(bool state_ = true);
-
-    /**
-     * @brief Share topic description.
-     *
-     * @param state_  Set description share mode (true == share description).
-     *
-     * @return  True if it succeeds, false if it fails.
-    **/
-    ECAL_API bool ShareDescription(bool state_ = true);
-
     /**
      * @brief Set the specific topic id.
      *

ecal/core/include/ecal/ecal_publisher_config.h

@@ -0,0 +1,142 @@
+/* ========================= eCAL LICENSE =================================
+ *
+ * Copyright (C) 2016 - 2019 Continental Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================= eCAL LICENSE =================================
+*/
+
+/**
+ * @file   ecal_publisher_config.h
+ * @brief  eCAL publisher configuration
+ * 
+ * This publisher configuration struct can be used to define the behavior of an eCAL publisher. Additional information on 
+ * selected configuration parameters:
+ * 
+ * --------------------------------------------------------------------------------------------------------------
+ * Zero copy shared memory transport mode (SHM::Configuration::zero_copy_mode)
+ * --------------------------------------------------------------------------------------------------------------
+ *
+ * By default, the built-in shared memory layer is configured to make two memory copies
+ * one on the publisher and one on the subscriber side.
+ * 
+ * The intention of this implementation is to free the file as fast as possible after writing and reading
+ * its content to allow other processes to access the content with minimal latency. The publisher and subscribers
+ * are fully decoupled and can access their internal memory copy independently.
+ * 
+ * If the zero copy mode is switched on no memory will be copied at all using the low level binary publish / subscribe API.
+ * On publisher side the memory copy is exectuted into the opened memory file. On the subscriber side the user message 
+ * callback is called right after opening the memory file. A direct pointer to the memory payload is forwarded
+ * and can be processed with no latency. The memory file will be closed after the user callback function
+ * returned.
+ *
+ * The advantage of this configuration is a much higher performance for large payloads (> 1024 kB).
+ * The disadvantage of this configuration is that in the time when the callback is executed the memory file 
+ * is blocked for other subscribers and for writing publishers too. Maybe this can be eliminated
+ * by a better memory file read/write access implementation (lock free read) in future releases.
+ * 
+ * Today, for specific scenarios (1:1 pub/sub connections with large payloads for example) this feature
+ * can increase the performance remarkable. But please keep in mind to return from the message callback function
+ * as fast as possible to not delay subsequent read/write access operations.
+ * 
+ * By using the eCAL::CPayloadWriter API a full zero copy implementation is possible by providing separate methods
+ * for the initialization and the modification of the memory file content (see CPayloadWriter documentation).
+ *
+ * 
+ * --------------------------------------------------------------------------------------------------------------
+ * Subscriber receive acknowledgement with timeout (SHM::Configuration::acknowledge_timeout_ms)
+ * --------------------------------------------------------------------------------------------------------------
+ *
+ * Most applications perform very well with the default behavior. If subscribers are too slow
+ * to process incoming messages then the overall software architecture needs to be checked, software components
+ * need to be optimized or parallelized.
+ *
+ * There may still be cases where it could make sense to synchronize the transfer of the payload from a publisher
+ * to a subscriber by using an additional handshake event. This event is signaled by a subscriber back to the
+ * sending publisher to confirm the complete payload transmission and the processed subscriber callback.
+ *
+ * The publisher will wait up to the specified timeout for the acknowledge signals of all connected subscribers
+ * before sending new content. Finally that means the publishers CPublisher::Send API function call is now blocked
+ * and will not return until all subscriber have read and processed their content or the timeout has been reached.
+ *
+ *
+ * --------------------------------------------------------------------------------------------------------------
+ * Number of handled memory files (SHM::Configuration::memfile_buffer_count)
+ * --------------------------------------------------------------------------------------------------------------
+ *
+ * By default, each publisher creates one memory file to distribute its payload to the subscribers. Since eCAL does not 
+ * currently support a rw lock synchronisation mechanism for interprocess communication, reading subscribers are blocking
+ * the memory file and thus are preventing a publisher from writing the next payload into the file.
+ *
+ * This blocking behavior can be mitigated by using multiple memory files per publisher/subscriber connection. These memory
+ * files are then written in a kind of ring buffer.
+ * 
+ * The disadvantage of this setting (memfile_buffer_count > 1) is the higher consumption of resources (memory files, events..)
+ *
+**/
+
+#pragma once
+
+#include <ecal/ecal_tlayer.h>
+
+#include <cstddef>
+
+namespace eCAL
+{
+  namespace Publisher
+  {
+    namespace SHM
+    {
+      struct ECAL_API Configuration
+      {
+        bool               activate                = false;               //!< activate layer
+        bool               zero_copy_mode          = false;               //!< enable zero copy shared memory transport mode
+        int                acknowledge_timeout_ms  = 0;                   /*!< force connected subscribers to send acknowledge event after processing the message
+                                                                                 the publisher send call is blocked on this event with this timeout (0 == no handshake) */
+        size_t             memfile_min_size_bytes  = 4096;                //!< default memory file size for new publisher
+        size_t             memfile_reserve_percent = 50;                  //!< dynamic file size reserve before recreating memory file if topic size changes
+        size_t             memfile_buffer_count    = 1;                   //!< maximum number of used buffers (needs to be greater than 1, default = 1)
+      };
+    }
+
+    namespace UDP
+    {
+      struct ECAL_API Configuration
+      {
+        bool               activate                = false;               //!< activate layer
+        int                sndbuf_size_bytes       = (5*1024*1024);       //!< udp send buffer size in bytes (default 5MB)
+      };
+    }
+
+    namespace TCP
+    {
+      struct ECAL_API Configuration
+      {
+        bool               activate                = false;               //!< activate layer
+      };
+    }
+
+    struct ECAL_API Configuration
+    {
+      Configuration();
+
+      SHM::Configuration   shm;
+      UDP::Configuration   udp;
+      TCP::Configuration   tcp;
+
+      bool                 share_topic_type        = true;                //!< share topic type via registration
+      bool                 share_topic_description = true;                //!< share topic description via registration
+    };
+  }
+}

ecal/core/include/ecal/ecal_tlayer.h

@@ -53,6 +53,7 @@ namespace eCAL
       smode_auto
     };
 
+    // TODO: Do weed need this ?
     /**
      * @brief eCAL transport layer state struct.
     **/

ecal/core/include/ecal/msg/capnproto/publisher.h

@@ -99,9 +99,10 @@ namespace eCAL
       * @brief  Constructor.
       *
       * @param topic_name_  Unique topic name.
+      * @param config_      Optional configuration parameters.
       **/
-      CPublisher(const std::string& topic_name_)
-        : eCAL::CPublisher(topic_name_, GetDataTypeInformation())
+      CPublisher(const std::string& topic_name_, const eCAL::Publisher::Configuration& config_ = {})
+        : eCAL::CPublisher(topic_name_, GetDataTypeInformation(), config_)
         , builder(std::make_unique<capnp::MallocMessageBuilder>())
         , root_builder(builder->initRoot<message_type>())
       {
@@ -145,12 +146,13 @@ namespace eCAL
       * @brief  Creates this object.
       *
       * @param topic_name_  Unique topic name.
+      * @param config_      Optional configuration parameters.
       *
       * @return  True if it succeeds, false if it fails.
       **/
-      bool Create(const std::string& topic_name_)
+      bool Create(const std::string& topic_name_, const eCAL::Publisher::Configuration& config_ = {})
       {
-        return(eCAL::CPublisher::Create(topic_name_, GetDataTypeInformation()));
+        return(eCAL::CPublisher::Create(topic_name_, GetDataTypeInformation(), config_));
       }
 
       typename message_type::Builder GetBuilder()
@@ -172,11 +174,11 @@ namespace eCAL
       **/
       SDataTypeInformation GetDataTypeInformation() const
       {
-        SDataTypeInformation topic_info;
-        topic_info.encoding   = eCAL::capnproto::EncodingAsString();
-        topic_info.name       = eCAL::capnproto::TypeAsString<message_type>();
-        topic_info.descriptor = eCAL::capnproto::SchemaAsString<message_type>();
-        return topic_info;
+        SDataTypeInformation data_type_info;
+        data_type_info.encoding   = eCAL::capnproto::EncodingAsString();
+        data_type_info.name       = eCAL::capnproto::TypeAsString<message_type>();
+        data_type_info.descriptor = eCAL::capnproto::SchemaAsString<message_type>();
+        return data_type_info;
       }
 
       std::unique_ptr<capnp::MallocMessageBuilder>    builder;