Support region callbacks when no channel is specified

Remove hint parameter from builder
Remove wrong readme file
2025-10-15 09:31:45 +00:00 · 2019-03-08 11:06:30 +01:00 · 2019-03-06 16:35:02 +01:00 · 2019-03-06 16:35:02 +01:00 · 2019-03-06 16:35:02 +01:00 · 2019-03-06 16:35:02 +01:00
322 changed files with 6873 additions and 16873 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +0,0 @@
---
-Checks:          '*,-google-*,-fuchsia-*,-cert-*,-llvm-header-guard,-readability-named-parameter,-misc-non-private-member-variables-in-classes,-*-magic-numbers,-llvm-include-order,-hicpp-no-array-decay,-performance-unnecessary-value-param,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-modernize-use-trailing-return-type,-readability-redundant-member-init'
-HeaderFilterRegex: '/(fairmq/)'
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,3 +1,2 @@
 comment:
  layout: "diff, files"
-  behavior: once
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "extern/googletest"]
-	path = extern/googletest
-	url = https://github.com/google/googletest
-[submodule "extern/asio"]
-	path = extern/asio
-	url = https://github.com/chriskohlhoff/asio
--- a/CMakeGraphVizOptions.cmake
+++ b/CMakeGraphVizOptions.cmake
@@ -1,14 +0,0 @@
-set(GRAPHVIZ_GRAPH_TYPE digraph)
-set(GRAPHVIZ_GRAPH_NAME FairMQ)
-set(GRAPHVIZ_EXECUTABLES ON)
-set(GRAPHVIZ_STATIC_LIBS OFF)
-set(GRAPHVIZ_SHARED_LIBS ON)
-set(GRAPHVIZ_MODULE_LIBS OFF)
-set(GRAPHVIZ_GENERATE_PER_TARGET OFF)
-set(GRAPHVIZ_GENERATE_DEPENDERS OFF)
-set(GRAPHVIZ_IGNORE_TARGETS
-  "fairmq-ex.*"
-  "testsuite_.*"
-  "testhelper_.*"
-  "FairMQPlugin_test_dummy"
-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,19 +6,20 @@
 #                  copied verbatim in the file "LICENSE"                       #
 ################################################################################

-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
-cmake_policy(VERSION 3.12...3.15)
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+

 # Project ######################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FairMQLib)

+set_fairmq_cmake_policies()
 get_git_version()

 project(FairMQ VERSION ${PROJECT_VERSION} LANGUAGES CXX)
 message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")

-if(BUILD_OFI_TRANSPORT OR BUILD_SDK OR BUILD_PMIX_PLUGIN)
+if(BUILD_OFI_TRANSPORT)
  set(PROJECT_MIN_CXX_STANDARD 14)
 else()
  set(PROJECT_MIN_CXX_STANDARD 11)
@@ -31,28 +32,16 @@ include(CTest)


 # Build options ################################################################
-fairmq_build_option(BUILD_FAIRMQ            "Build FairMQ library and devices."
-                                             DEFAULT ON)
-fairmq_build_option(BUILD_TESTING           "Build tests."
-                                             DEFAULT OFF REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_NANOMSG_TRANSPORT "Build nanomsg transport."
-                                             DEFAULT OFF REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_OFI_TRANSPORT     "Build experimental OFI transport."
-                                             DEFAULT OFF REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_SDK_COMMANDS      "Build the FairMQ SDK commands."
-                                             DEFAULT OFF)
-fairmq_build_option(BUILD_DDS_PLUGIN        "Build DDS plugin."
-                                             DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS")
-fairmq_build_option(BUILD_PMIX_PLUGIN       "Build PMIx plugin."
-                                             DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS")
-fairmq_build_option(BUILD_EXAMPLES          "Build FairMQ examples."
-                                             DEFAULT ON  REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_SDK               "Build the FairMQ controller SDK."
-                                             DEFAULT OFF REQUIRES "BUILD_DDS_PLUGIN;BUILD_SDK_COMMANDS")
-fairmq_build_option(BUILD_DOCS              "Build FairMQ documentation."
-                                             DEFAULT OFF)
-fairmq_build_option(FAST_BUILD              "Fast production build. Not recommended for development."
-                                             DEFAULT OFF)
+include(CMakeDependentOption)
+option(BUILD_FAIRMQ "Build FairMQ library and devices." ON)
+cmake_dependent_option(BUILD_TESTING "Build tests." OFF "BUILD_FAIRMQ" OFF)
+cmake_dependent_option(BUILD_NANOMSG_TRANSPORT "Build nanomsg transport." OFF "BUILD_FAIRMQ" OFF)
+cmake_dependent_option(BUILD_OFI_TRANSPORT "Build experimental OFI transport." OFF "BUILD_FAIRMQ" OFF)
+cmake_dependent_option(BUILD_DDS_PLUGIN "Build DDS plugin." OFF "BUILD_FAIRMQ" OFF)
+cmake_dependent_option(BUILD_PMIX_PLUGIN "Build PMIx plugin." OFF "BUILD_FAIRMQ" OFF)
+cmake_dependent_option(BUILD_EXAMPLES "Build FairMQ examples." ON "BUILD_FAIRMQ" OFF)
+option(BUILD_DOCS "Build FairMQ documentation." OFF)
+option(FAST_BUILD "Fast production build. Not recommended for development." OFF)
 ################################################################################


@@ -72,11 +61,14 @@ endif()

 if(BUILD_OFI_TRANSPORT)
  find_package2(PRIVATE asiofi REQUIRED
-    VERSION 0.3.1
+    VERSION 0.2.0
  )
  find_package2(PRIVATE OFI REQUIRED
-    ADD_REQUIREMENTS_OF asiofi
+    VERSION ${asiofi_OFI_VERSION}
+    COMPONENTS ${asiofi_OFI_COMPONENTS}
  )
+  find_package2(PRIVATE AZMQ REQUIRED)
+  set(PROJECT_AZMQ_VERSION 1.0.2)
 endif()

 if(BUILD_NANOMSG_TRANSPORT)
@@ -85,44 +77,9 @@ if(BUILD_NANOMSG_TRANSPORT)
  )
 endif()

-if(BUILD_SDK_COMMANDS)
-  find_package2(PRIVATE Flatbuffers REQUIRED)
-endif()
-
-if(BUILD_DDS_PLUGIN OR BUILD_SDK)
-  find_package2(PRIVATE DDS REQUIRED
-    VERSION 3.0
-  )
-  set(DDS_Boost_COMPONENTS system log log_setup regex filesystem thread)
-  set(DDS_Boost_VERSION 1.67)
-endif()
-
-if(BUILD_PMIX_PLUGIN)
-  find_package2(PRIVATE PMIx REQUIRED
-    VERSION 2.1.4
-  )
-endif()
-
-if(BUILD_FAIRMQ OR BUILD_SDK)
-  find_package2(PUBLIC FairLogger REQUIRED
-    VERSION 1.2.0
-  )
-
-  foreach(dep IN LISTS FairLogger_PACKAGE_DEPENDENCIES)
-    if(NOT dep STREQUAL "Boost")
-      find_package2(PUBLIC ${dep} REQUIRED VERSION ${FairLogger_${dep}_VERSION})
-      set(PROJECT_${dep}_VERSION ${FairLogger_${dep}_VERSION})
-    endif()
-  endforeach()
-
-  if(NOT DEFINED Boost_NO_BOOST_CMAKE AND CMAKE_VERSION VERSION_LESS 3.15)
-    # Since Boost 1.70 a CMake package is shipped by default. Unfortunately, it has a number
-    # of problems that are only fixed in Boost 1.71 or CMake 3.15. By default we skip the
-    # BoostConfig lookup. This can be overridden on the command line via -DBoost_NO_BOOST_CMAKE=OFF
-    set(Boost_NO_BOOST_CMAKE ON)
-  endif()
+if(BUILD_FAIRMQ)
  find_package2(PUBLIC Boost REQUIRED
-    VERSION 1.66
+    VERSION 1.64 ${asiofi_Boost_VERSION}

    COMPONENTS
    container
@@ -130,41 +87,28 @@ if(BUILD_FAIRMQ OR BUILD_SDK)
    filesystem
    date_time
    regex
-
-    ADD_REQUIREMENTS_OF
-    asiofi
-    DDS
-    FairLogger
+    ${asiofi_Boost_COMPONENTS}
  )
-
-  # Normalize Boost version
-  if(CMAKE_VERSION VERSION_LESS 3.15)
-    set(Boost_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-  endif()
-endif()
-
-if(BUILD_SDK)
-  find_package2(BUNDLED asio
-    VERSION 1.13.0
+  find_package2(PUBLIC FairLogger REQUIRED
+    VERSION 1.2.0
  )
-  if(NOT asio_FOUND)
-    build_bundled(asio extern/asio)
-    find_package2(PRIVATE asio REQUIRED)
-  endif()
-endif()
-
-if(BUILD_FAIRMQ)
  find_package2(PRIVATE ZeroMQ REQUIRED
-    VERSION 4.1.4
+    VERSION 4.1.5
  )
 endif()

+if(BUILD_DDS_PLUGIN)
+  find_package2(PRIVATE DDS VERSION 2.2 REQUIRED)
+endif()
+
+if(BUILD_PMIX_PLUGIN)
+  find_package2(PRIVATE PMIx VERSION 2.1.4 REQUIRED)
+endif()
+
 if(BUILD_TESTING)
-  find_package2(PRIVATE GTest VERSION 1.7.0)
-  if(NOT GTest_FOUND)
-    build_bundled(GTest extern/googletest)
-    find_package2(PRIVATE GTest REQUIRED)
-  endif()
+  find_package2(PRIVATE GTest REQUIRED
+    VERSION 1.7.0
+  )
 endif()

 if(BUILD_DOCS)
@@ -178,7 +122,12 @@ endif()


 # Targets ######################################################################
-if(BUILD_FAIRMQ OR BUILD_SDK)
+if(BUILD_FAIRMQ)
+  configure_file(${PROJECT_NAME_LOWER}/Version.h.in
+    ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    @ONLY
+  )
+
  add_subdirectory(fairmq)
 endif()

@@ -227,42 +176,34 @@ endif()
 if(BUILD_DOCS)
  list(APPEND PROJECT_PACKAGE_COMPONENTS docs)
 endif()
-if(BUILD_SDK)
-  list(APPEND PROJECT_PACKAGE_COMPONENTS sdk)
-endif()
-if(BUILD_SDK_COMMANDS)
-  list(APPEND PROJECT_PACKAGE_COMPONENTS sdk_commands)
-endif()
 ################################################################################


 # Installation #################################################################
 if(BUILD_FAIRMQ)
+  install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    DESTINATION ${PROJECT_INSTALL_INCDIR}
+  )
+
  install(FILES cmake/FindZeroMQ.cmake
    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
  )
 endif()
+if(BUILD_DDS_PLUGIN)
+  install(FILES cmake/FindDDS.cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
+  )
+endif()
+if(BUILD_OFI_TRANSPORT)
+  install(FILES cmake/FindAZMQ.cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
+  )
+endif()
 if(BUILD_DOCS)
  install(DIRECTORY ${CMAKE_BINARY_DIR}/doxygen/html
    DESTINATION ${PROJECT_INSTALL_DATADIR}/docs
  )
 endif()
-if(BUILD_SDK)
-  install(FILES cmake/Findasio.cmake
-    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
-  )
-  if(asio_BUNDLED)
-    install(TARGETS bundled_asio_headers EXPORT ${PROJECT_EXPORT_SET})
-    install(DIRECTORY "${asio_BUILD_INCLUDE_DIR}/asio"
-      DESTINATION ${asio_INSTALL_INCLUDE_DIR}
-      PATTERN "Makefile.am" EXCLUDE
-      PATTERN ".gitignore" EXCLUDE
-    )
-    install(FILES "${asio_BUILD_INCLUDE_DIR}/asio.hpp"
-      DESTINATION ${asio_INSTALL_INCLUDE_DIR}
-    )
-  endif()
-endif()

 install_cmake_package()
 ################################################################################
@@ -298,8 +239,12 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
  message(STATUS "  ")
  message(STATUS "  ${Cyan}DEPENDENCY FOUND     VERSION                   PREFIX${CR}")
  foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
-    if(${dep}_VERSION AND NOT ${dep}_VERSION STREQUAL "..")
-      set(version_str "${BGreen}${${dep}_VERSION}${CR}")
+    if(${dep}_VERSION)
+      if(${dep} STREQUAL Boost)
+        set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
+      else()
+        set(version_str "${BGreen}${${dep}_VERSION}${CR}")
+      endif()
    else()
      set(version_str "${BYellow}unknown${CR}")
    endif()
@@ -313,11 +258,7 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
      pad("${version_str}${version_req_str}" 25 " " version_padded COLOR 1)
    endif()
    if(${dep} STREQUAL FairLogger)
-      if(FairLogger_PREFIX)
-        set(prefix ${FairLogger_PREFIX})
-      else()
-        set(prefix ${FairLogger_ROOT})
-      endif()
+      set(prefix ${FairLogger_ROOT})
    elseif(${dep} STREQUAL GTest)
      get_filename_component(prefix ${GTEST_INCLUDE_DIRS}/.. ABSOLUTE)
    elseif(${dep} STREQUAL msgpack)
@@ -330,35 +271,14 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
    elseif(${dep} STREQUAL nanomsg)
      get_target_property(nn_include nanomsg INTERFACE_INCLUDE_DIRECTORIES)
      get_filename_component(prefix ${nn_include}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL DDS)
-      set(prefix "${DDS_INSTALL_PREFIX}")
-    elseif(${dep} STREQUAL Boost)
-      if(TARGET Boost::headers)
-        get_target_property(boost_include Boost::headers INTERFACE_INCLUDE_DIRECTORIES)
-      else()
-        get_target_property(boost_include Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
-      endif()
-      get_filename_component(prefix ${boost_include}/.. ABSOLUTE)
    elseif(${dep} STREQUAL Doxygen)
      get_target_property(doxygen_bin Doxygen::doxygen INTERFACE_LOCATION)
      get_filename_component(prefix ${doxygen_bin} DIRECTORY)
      get_filename_component(prefix ${prefix}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL fmt)
-      get_target_property(fmt_include fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
-      get_filename_component(prefix ${fmt_include}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL Flatbuffers)
-      if(TARGET flatbuffers::flatbuffers)
-        get_target_property(flatbuffers_include flatbuffers::flatbuffers INTERFACE_INCLUDE_DIRECTORIES)
-      else()
-        get_target_property(flatbuffers_include flatbuffers::flatbuffers_shared INTERFACE_INCLUDE_DIRECTORIES)
-      endif()
-      get_filename_component(prefix ${flatbuffers_include}/.. ABSOLUTE)
    else()
      get_filename_component(prefix ${${dep}_INCLUDE_DIR}/.. ABSOLUTE)
    endif()
-    if(NOT ${dep}_BUNDLED)
-      message(STATUS "  ${BWhite}${dep_padded}${CR}${version_padded}${prefix}")
-    endif()
+    message(STATUS "  ${BWhite}${dep_padded}${CR}${version_padded}${prefix}")
    unset(version_str)
    unset(version_padded)
    unset(version_req_str)
@@ -397,9 +317,9 @@ else()
 endif()
 message(STATUS "  ${BWhite}dds_plugin${CR}         ${dds_summary}")
 if(BUILD_PMIX_PLUGIN)
-  set(pmix_summary "${BGreen}YES${CR}    EXPERIMENTAL (requires C++14) (disable with ${BMagenta}-DBUILD_PMIX_PLUGIN=OFF${CR})")
+  set(pmix_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_PMIX_PLUGIN=OFF${CR})")
 else()
-  set(pmix_summary "${BRed} NO${CR}    EXPERIMENTAL (requires C++14) (default, enable with ${BMagenta}-DBUILD_PMIX_PLUGIN=ON${CR})")
+  set(pmix_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_PMIX_PLUGIN=ON${CR})")
 endif()
 message(STATUS "  ${BWhite}pmix_plugin${CR}        ${pmix_summary}")
 if(BUILD_EXAMPLES)
@@ -414,41 +334,5 @@ else()
  set(docs_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_DOCS=ON${CR})")
 endif()
 message(STATUS "  ${BWhite}docs${CR}               ${docs_summary}")
-if(BUILD_SDK)
-  set(sdk_summary "${BGreen}YES${CR}    EXPERIMENTAL (required C++14) (disable with ${BMagenta}-DBUILD_SDK=OFF${CR})")
-else()
-  set(sdk_summary "${BRed} NO${CR}    EXPERIMENTAL (required C++14) (default, enable with ${BMagenta}-DBUILD_SDK=ON${CR})")
-endif()
-message(STATUS "  ${BWhite}sdk${CR}                ${sdk_summary}")
-if(BUILD_SDK_COMMANDS)
-  set(sdk_commands_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_SDK_COMMANDS=OFF${CR})")
-else()
-  set(sdk_commands_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_SDK_COMMANDS=ON${CR})")
-endif()
-message(STATUS "  ${BWhite}sdk_commands${CR}       ${sdk_commands_summary}")
-message(STATUS "  ")
-if(RUN_STATIC_ANALYSIS)
-  list(LENGTH PROJECT_STATIC_ANALYSERS size)
-  unset(analyser_list)
-  set(count 0)
-  foreach(analyser IN LISTS PROJECT_STATIC_ANALYSERS)
-    if(${analyser}_FOUND)
-      set(${analyser}_status "${analyser} ${BGreen}YES${CR}")
-    else()
-      set(${analyser}_status "${analyser} ${BRed}NO${CR}")
-    endif()
-    math(EXPR count "${count} + 1")
-    string(APPEND analyser_list "${${analyser}_status}")
-    if(count LESS size)
-      string(APPEND analyser_list "${BWhite},${CR} ")
-    endif()
-  endforeach()
-  set(static_ana_summary "${BWhite}(${CR}${analyser_list}${BWhite})${CR}  (disable with ${BMagenta}-DRUN_STATIC_ANALYSIS=OFF${CR})")
-else()
-  set(static_ana_summary "${BRed}OFF${CR}  (default, enable with ${BMagenta}-DRUN_STATIC_ANALYSIS=ON${CR})")
-endif()
-message(STATUS "  ${Cyan}INSTALL PREFIX${CR}     ${BGreen}${CMAKE_INSTALL_PREFIX}${CR} (change with ${BMagenta}-DCMAKE_INSTALL_PREFIX=...${CR})")
-message(STATUS "  ")
-message(STATUS "  ${Cyan}RUN STATIC ANALYSIS  ${static_ana_summary}")
 message(STATUS "  ")
 ################################################################################
--- a/1
+++ b/1
@@ -4,7 +4,6 @@ Eulisse, Giulio
 Karabowicz, Radoslaw
 Kretz, Matthias <kretz@kde.org>
 Krzewicki, Mikolaj 
-Lebedev, Andrey
 Mrnjavac, Teo <teo.m@cern.ch>
 Neskovic, Gvozden
 Richter, Matthias
--- a/69
+++ b/69
@@ -4,9 +4,9 @@ Upstream-Contact: Mohammad Al-Turany <m.al-turany@gsi.de>
 Source: https://github.com/FairRootGroup/FairMQ

 Files: *
-Copyright: 2012-2019, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
-Copyright: 2012-2019, [see AUTHORS file]
-Copyright: 2012-2019, [see CONTRIBUTORS file]
+Copyright: 2012-2018, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
+Copyright: 2012-2018, [see AUTHORS file]
+Copyright: 2012-2018, [see CONTRIBUTORS file]
 Comment: The copyright of individual contributors is documented in the
  Git history.
 License: LGPL-3.0-only
@@ -15,14 +15,6 @@ Files: cmake/cotire.cmake
 Copyright: 2012-2018 Sascha Kratky
 License: COTIRE

-Files: extern/googletest
-Copyright: 2008, Google Inc.
-License: GOOGLE
-
-Files: extern/asio
-Copyright: 2003-2019, Christopher M. Kohlhoff (chris at kohlhoff dot com)
-License: BSL-1.0
-
 License: LGPL-3.0-only
  [see LICENSE file]

@@ -47,58 +39,3 @@ License: COTIRE
  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
-
-License: GOOGLE
-  Copyright 2008, Google Inc.
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-      * Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-      * Neither the name of Google Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSL-1.0
-  Boost Software License - Version 1.0 - August 17th, 2003
-
-  Permission is hereby granted, free of charge, to any person or organization
-  obtaining a copy of the software and accompanying documentation covered by
-  this license (the "Software") to use, reproduce, display, distribute,
-  execute, and transmit the Software, and to prepare derivative works of the
-  Software, and to permit third-parties to whom the Software is furnished to
-  do so, all subject to the following:
-
-  The copyright notices in the Software and this entire statement, including
-  the above license grant, this restriction and the following disclaimer,
-  must be included in all copies of the Software, in whole or in part, and
-  all derivative works of the Software, unless such copies or derivative
-  works are solely in the form of machine-executable object code generated by
-  a source language processor.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
--- a/Dart.sh
+++ b/Dart.sh
@@ -65,7 +65,7 @@ if [ "$1" == "alfa_ci" ]; then
  export ctest_model=Experimental
 elif [ "$1" == "codecov" ]; then
  export ctest_model=Profile
-  export do_codecov_upload=0
+  export do_codecov_upload=1
 else
  export ctest_model=$1
 fi
--- a/FairMQTest.cmake
+++ b/FairMQTest.cmake
@@ -29,14 +29,12 @@ Set(configure_options "${configure_options};-DCMAKE_PREFIX_PATH=$ENV{SIMPATH}")
 Set(configure_options "${configure_options};-DBUILD_NANOMSG_TRANSPORT=ON")
 # Set(configure_options "${configure_options};-DBUILD_OFI_TRANSPORT=ON")
 Set(configure_options "${configure_options};-DBUILD_DDS_PLUGIN=ON")
-Set(configure_options "${configure_options};-DBUILD_SDK=ON")
-Set(configure_options "${configure_options};-DBUILD_SDK_COMMANDS=ON")
 Set(configure_options "${configure_options};-DFAST_BUILD=ON")
 Set(configure_options "${configure_options};-DCOTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j$ENV{number_of_processors}")

 Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
 If(EXTRA_FLAGS)
-  Set(configure_options "${configure_options};${EXTRA_FLAGS}")
+  Set(configure_options "${configure_options};${EXTRA_FLAGS}") 
 EndIf()

 If($ENV{ctest_model} MATCHES Profile)
@@ -44,7 +42,6 @@ If($ENV{ctest_model} MATCHES Profile)
  If(GCOV_COMMAND)
    Message("Found GCOV: ${GCOV_COMMAND}")
    Set(CTEST_COVERAGE_COMMAND ${GCOV_COMMAND})
-    set(CTEST_COVERAGE_EXTRA_FLAGS "-p")
  EndIf(GCOV_COMMAND)
 EndIf()

@@ -60,11 +57,19 @@ Ctest_Configure(BUILD "${CTEST_BINARY_DIRECTORY}"

 Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}")

-Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}"
+Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
           # PARALLEL_LEVEL $ENV{number_of_processors}
-           PARALLEL_LEVEL $ENV{number_of_processors}
+           PARALLEL_LEVEL 1
           RETURN_VALUE _ctest_test_ret_val
          )
+If("$ENV{do_codecov_upload}")
+  ForEach(i RANGE 4)
+    # Gather statistics to catch time sensitive branches
+    Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
+               PARALLEL_LEVEL $ENV{number_of_processors}
+              )
+  EndForEach()
+EndIf()

 If(GCOV_COMMAND)
  Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}" LABELS coverage)
@@ -80,7 +85,7 @@ If("$ENV{do_codecov_upload}")
 EndIf()

 Ctest_Submit()
-
+ 
 if (_ctest_test_ret_val)
  Message(FATAL_ERROR "Some tests failed.")
 endif()
--- a/16
+++ b/16
@@ -22,11 +22,11 @@ def jobMatrix(String prefix, List specs, Closure callback) {
            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
          """
-          if (os =~ /Debian/ && compiler =~ /gcc9/) {
+          if (os =~ /Debian/ && compiler =~ /gcc8/) {
            sh '''\
              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
-              echo "module load compiler/gcc/9.1.0" >> Dart.cfg
+              echo "module load compiler/gcc/8" >> Dart.cfg
            '''
          }
          if (os =~ /MacOS/) {
@@ -49,10 +49,6 @@ def jobMatrix(String prefix, List specs, Closure callback) {
          deleteDir()
          githubNotify(context: "${prefix}/${label}", description: 'Success', status: 'SUCCESS')
        } catch (e) {
-          def tarball = "${prefix}_${label}_dds_logs.tar.gz"
-          sh "tar czvf ${tarball} -C \${WORKSPACE}/build/test/ .DDS/"
-          archiveArtifacts tarball
-
          deleteDir()
          githubNotify(context: "${prefix}/${label}", description: 'Error', status: 'ERROR')
          throw e
@@ -69,16 +65,16 @@ pipeline{
    stage("Run CI Matrix") {
      steps{
        script {
-          def build_jobs = jobMatrix('build', [
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc9.1.0',        fairsoft: 'fairmq_dev'],
+          def build_jobs = jobMatrix('alfa-ci/build', [
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
          ]) { spec, label ->
            sh './Dart.sh alfa_ci Dart.cfg'
          }

-          def profile_jobs = jobMatrix('codecov', [
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc9.1.0',        fairsoft: 'fairmq_dev'],
+          def profile_jobs = jobMatrix('alfa-ci/codecov', [
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
          ]) { spec, label ->
            withCredentials([string(credentialsId: 'fairmq_codecov_token', variable: 'CODECOV_TOKEN')]) {
              sh './Dart.sh codecov Dart.cfg'
--- a/Jenkinsfile.nightly
+++ b/Jenkinsfile.nightly
@@ -21,11 +21,11 @@ def buildMatrix(List specs, Closure callback) {
            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
          """
-          if (os =~ /Debian/ && compiler =~ /gcc9/) {
+          if (os =~ /Debian/ && compiler =~ /gcc8/) {
            sh '''\
              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
-              echo "module load compiler/gcc/9.1.0" >> Dart.cfg
+              echo "module load compiler/gcc/8" >> Dart.cfg
            '''
          }
          if (os =~ /MacOS/) {
@@ -46,10 +46,6 @@ def buildMatrix(List specs, Closure callback) {

          deleteDir()
        } catch (e) {
-          def tarball = "${label}_dds_logs.tar.gz"
-          sh "tar czvf ${tarball} -C \${WORKSPACE}/build/test/ .DDS/"
-          archiveArtifacts tarball
-
          deleteDir()
          throw e
        }
@@ -67,7 +63,7 @@ pipeline{
      steps{
        script {
          parallel(buildMatrix([
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc9.1.0',        fairsoft: 'fairmq_dev'],
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
          ]) { spec, label ->
--- a/README.md
+++ b/README.md
@@ -33,21 +33,25 @@ configuration and control services.
 FairMQ has been developed in the context of its mother project [FairRoot](https://github.com/FairRootGroup/FairRoot) -
 a simulation, reconstruction and analysis framework.

+## Dependencies
+
+  * PUBLIC: [**Boost**](https://www.boost.org/), [**FairLogger**](https://github.com/FairRootGroup/FairLogger)
+  * BUILD: [CMake](https://cmake.org/), [GTest](https://github.com/google/googletest), [Doxygen](http://www.doxygen.org/)
+  * PRIVATE: [ZeroMQ](http://zeromq.org/), [Msgpack](https://msgpack.org/index.html), [nanomsg](http://nanomsg.org/),
+[asiofi](https://github.com/FairRootGroup/asiofi), [DDS](http://dds.gsi.de), [PMIx](https://pmix.org/), [AZMQ](https://github.com/zeromq/azmq), [asiofi](https://github.com/FairRootGroup/asiofi)
+
+  Supported platforms: Linux and MacOS.
+
 ## Installation from Source

-Recommended:
-
 ```bash
-git clone https://github.com/FairRootGroup/FairMQ fairmq_source
-cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=fairmq_install
-cmake --build fairmq_build
-cd fairmq_build; ctest -j4; cd ..
-cmake --build fairmq_build --target install
+git clone https://github.com/FairRootGroup/FairMQ fairmq
+mkdir fairmq_build && cd fairmq_build
+cmake -DCMAKE_INSTALL_PREFIX=./fairmq_install ../fairmq
+cmake --build . --target install
 ```

-Please consult the [manpages of your CMake version](https://cmake.org/cmake/help/latest/manual/cmake.1.html) for more options.
-
-If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PMIX`, `ASIO`, `ASIOFI` or `DDS` (`*_ROOT` variables can also be environment variables).
+If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PMIX`, `ASIOFI`, `AZMQ` or `DDS` (`*_ROOT` variables can also be environment variables).

 ## Usage

@@ -66,50 +70,30 @@ find_package(FairMQ)

 `find_package(FairMQ)` will define an imported target `FairMQ::FairMQ`.

-In order to succesfully compile and link against the `FairMQ::FairMQ` target, you need to discover its public package dependencies:
+In order to succesfully compile and link against the `FairMQ::FairMQ` target, you need to discover its public package dependencies, too.

 ```cmake
 find_package(FairMQ)
 if(FairMQ_FOUND)
-  foreach(dep IN LISTS FairMQ_PACKAGE_DEPENDENCIES)
-    if(FairMQ_${dep}_COMPONENTS)
-      find_package(${dep} ${FairMQ_${dep}_VERSION} COMPONENTS ${FairMQ_${dep}_COMPONENTS})
-    else()
-      find_package(${dep} ${FairMQ_${dep}_VERSION})
-    endif()
-  endforeach()
+  find_package(FairLogger ${FairMQ_FairLogger_VERSION})
+  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_Boost_COMPONENTS})
 endif()
 ```

-If your project shares a dependency with FairMQ or if you want to omit a certain dependency, you may want to customize the above example code to your needs.
+Of course, feel free to customize the above commands to your needs.

 Optionally, you can require certain FairMQ package components and a minimum version:

 ```cmake
 find_package(FairMQ 1.1.0 COMPONENTS nanomsg_transport dds_plugin)
+if(FairMQ_FOUND)
+  find_package(FairLogger ${FairMQ_FairLogger_VERSION})
+  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_Boost_COMPONENTS})
+endif()
 ```

 When building FairMQ, CMake will print a summary table of all available package components.

-## Dependencies
-
-  * [asio](https://github.com/chriskohlhoff/asio) (optionally bundled)
-  * [asiofi](https://github.com/FairRootGroup/asiofi)
-  * [Boost](https://www.boost.org/)
-  * [CMake](https://cmake.org/)
-  * [DDS](http://dds.gsi.de)
-  * [Doxygen](http://www.doxygen.org/)
-  * [FairLogger](https://github.com/FairRootGroup/FairLogger)
-  * [GTest](https://github.com/google/googletest) (optionally bundled)
-  * [Msgpack](https://msgpack.org/index.html)
-  * [nanomsg](http://nanomsg.org/)
-  * [PMIx](https://pmix.org/)
-  * [ZeroMQ](http://zeromq.org/)
-
-  Which dependencies are required depends on which components are built.
-
-  Supported platforms: Linux and MacOS.
-
 ## CMake options

 On command line:
@@ -122,7 +106,7 @@ On command line:
  * `-DBUILD_DDS_PLUGIN=ON` enables building of the DDS plugin.
  * `-DBUILD_PMIX_PLUGIN=ON` enables building of the PMIx plugin.
  * `-DBUILD_DOCS=ON` enables building of API docs.
-  * You can hint non-system installations for dependent packages, see the #installation-from-source section above
+  * You can hint non-system installations for dependent packages, see the #Installation section above

 After the `find_package(FairMQ)` call the following CMake variables are defined:

@@ -142,11 +126,9 @@ After the `find_package(FairMQ)` call the following CMake variables are defined:
 | `${FairMQ_LIBDIR}` | the installation lib directory |
 | `${FairMQ_DATADIR}` | the installation data directory (`../share/fairmq`) |
 | `${FairMQ_CMAKEMODDIR}` | the installation directory of shipped CMake find modules |
-| `${FairMQ_CXX_STANDARD_REQUIRED}` | the value of `CMAKE_CXX_STANDARD_REQUIRED` at build-time |
-| `${FairMQ_CXX_STANDARD}` | the value of `CMAKE_CXX_STANDARD` at build-time |
-| `${FairMQ_CXX_EXTENSIONS}` | the values of `CMAKE_CXX_EXTENSIONS` at build-time |
-| `${FairMQ_BUILD_TYPE}` | the value of `CMAKE_BUILD_TYPE` at build-time |
-| `${FairMQ_CXX_FLAGS}` | the values of `CMAKE_CXX_FLAGS` and `CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}` at build-time |
+| `${FairMQ_CXX_STANDARD_REQUIRED}` | the value of `CMAKE_CXX_STANDARD_REQUIRED` at built-time |
+| `${FairMQ_CXX_STANDARD}` | the value of `CMAKE_CXX_STANDARD` at built-time |
+| `${FairMQ_CXX_EXTENSIONS}` | the values of `CMAKE_CXX_EXTENSIONS` at built-time |

 ## Documentation

@@ -175,11 +157,3 @@ After the `find_package(FairMQ)` call the following CMake variables are defined:
   4. [File output](docs/Logging.md#54-file-output)
   5. [Custom sinks](docs/Logging.md#55-custom-sinks)
 6. [Examples](docs/Examples.md#6-examples)
-7. [Plugins](docs/Plugins.md#7-plugins)
-   1. [Usage](docs/Plugins.md#71-usage)
-   2. [Development](docs/Plugins.md#72-development)
-   3. [Provided Plugins](docs/Plugins.md#73-provided-plugins)
-       1. [DDS](docs/Plugins.md#731-dds)
-       2. [PMIx](docs/Plugins.md#732-pmix)
-8. [Controller SDK](docs/SDK.md)
-
--- a/cmake/FairMQConfig.cmake.in
+++ b/cmake/FairMQConfig.cmake.in
@@ -13,20 +13,17 @@ set(@PROJECT_NAME@_VERSION @PROJECT_VERSION@)
 set(@PROJECT_NAME@_GIT_VERSION @PROJECT_GIT_VERSION@)
 set(@PROJECT_NAME@_GIT_DATE @PROJECT_GIT_DATE@)

-set(@PROJECT_NAME@_PREFIX @PACKAGE_CMAKE_INSTALL_PREFIX@)
-set(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@)
-set(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
-set(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@)
-set(@PROJECT_NAME@_DATADIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_DATADIR@)
-set(@PROJECT_NAME@_CMAKEMODDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_CMAKEMODDIR@)
+set_and_check(@PROJECT_NAME@_PREFIX @PACKAGE_CMAKE_INSTALL_PREFIX@)
+set_and_check(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@)
+set_and_check(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
+set_and_check(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@)
+set_and_check(@PROJECT_NAME@_DATADIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_DATADIR@)
+set_and_check(@PROJECT_NAME@_CMAKEMODDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_CMAKEMODDIR@)

 set(@PROJECT_NAME@_CXX_STANDARD_REQUIRED @CMAKE_CXX_STANDARD_REQUIRED@)
 set(@PROJECT_NAME@_CXX_STANDARD @CMAKE_CXX_STANDARD@)
 set(@PROJECT_NAME@_CXX_EXTENSIONS @CMAKE_CXX_EXTENSIONS@)
 set(@PROJECT_NAME@_VERSION_HOTFIX @PROJECT_VERSION_HOTFIX@)
-set(@PROJECT_NAME@_BUILD_TYPE @CMAKE_BUILD_TYPE@)
-set(@PROJECT_NAME@_BUILD_TYPE_UPPER @PROJECT_BUILD_TYPE_UPPER@)
-set(@PROJECT_NAME@_CXX_FLAGS @PROJECT_CXX_FLAGS@)

 ### Import cmake modules
 set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH})
@@ -36,6 +33,4 @@ set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH})
 ### Import targets
 include(@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_EXPORT_SET@.cmake)

-@BUNDLED_PACKAGES@
-
@PACKAGE_COMPONENTS@
--- a/cmake/FairMQLib.cmake
+++ b/cmake/FairMQLib.cmake
@@ -29,6 +29,26 @@ if(NOT WIN32 AND NOT DISABLE_COLOR)
  set(BWhite   "${Esc}[1;37m")
 endif()

+# set_fairmq_cmake_policies()
+#
+# Sets CMake policies.
+macro(set_fairmq_cmake_policies)
+  # Find more details to each policy with cmake --help-policy CMPXXXX
+  foreach(policy
+    CMP0025 # Compiler id for Apple Clang is now AppleClang.
+    CMP0028 # Double colon in target name means ALIAS or IMPORTED target.
+    CMP0042 # MACOSX_RPATH is enabled by default.
+    CMP0048 # The ``project()`` command manages VERSION variables.
+    CMP0054 # Only interpret ``if()`` arguments as variables or keywords when unquoted.
+    CMP0074 # ``find_package()`` uses ``<PackageName>_ROOT`` variables.
+  )
+    if(POLICY ${policy})
+      cmake_policy(SET ${policy} NEW)
+    endif()
+  endforeach()
+endmacro()
+
+
 find_package(Git)
 # get_git_version([DEFAULT_VERSION version] [DEFAULT_DATE date] [OUTVAR_PREFIX prefix])
 #
@@ -143,17 +163,15 @@ macro(set_fairmq_defaults)
  set(PROJECT_EXPORT_SET ${PROJECT_NAME}Targets)

  # Configure build types
-  set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" "RelWithDebInfo" "Nightly" "Profile" "Experimental" "AddressSan" "ThreadSan")
-  set(_warnings "-Wshadow -Wall -Wextra -Wpedantic")
-  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_warnings}")
+  set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" "RelWithDebInfo" "Nightly" "Profile" "Experimental" "AdressSan" "ThreadSan")
+  set(CMAKE_CXX_FLAGS_DEBUG          "-g -Wshadow -Wall -Wextra")
  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_warnings} -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_NIGHTLY        "-O2 -g ${_warnings}")
-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 ${_warnings} -fno-inline -ftest-coverage -fprofile-arcs")
-  set(CMAKE_CXX_FLAGS_EXPERIMENTAL   "-O2 -g ${_warnings} -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_ADDRESSSAN     "-O2 -g ${_warnings} -fsanitize=address -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS_THREADSAN      "-O2 -g ${_warnings} -fsanitize=thread")
-  unset(_warnings)
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -Wshadow -Wall -Wextra -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_NIGHTLY        "-O2 -g -Wshadow -Wall -Wextra")
+  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -Wshadow -Wall -Wextra -fno-inline -ftest-coverage -fprofile-arcs")
+  set(CMAKE_CXX_FLAGS_EXPERIMENTAL   "-O2 -g -Wshadow -Wall -Wextra -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_ADRESSSAN      "-O2 -g -Wshadow -Wall -Wextra -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_CXX_FLAGS_THREADSAN      "-O2 -g -Wshadow -Wall -Wextra -fsanitize=thread")

  if(CMAKE_GENERATOR STREQUAL "Ninja" AND
     ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR
@@ -168,41 +186,6 @@ macro(set_fairmq_defaults)
  else()
    set(PROJECT_VERSION_HOTFIX ${PROJECT_VERSION_TWEAK})
  endif()
-
-  if(NOT DEFINED RUN_STATIC_ANALYSIS)
-    set(RUN_STATIC_ANALYSIS OFF)
-  endif()
-
-  unset(PROJECT_STATIC_ANALYSERS)
-  if(RUN_STATIC_ANALYSIS)
-    set(analyser "clang-tidy")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_CLANG_TIDY "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-
-    set(analyser "iwyu")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_IWYU "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-
-    set(analyser "cpplint")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_CPPLINT "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-  endif()
-
-  if(CMAKE_GENERATOR STREQUAL Ninja AND ENABLE_CCACHE)
-    find_program(CCACHE ccache)
-    if(CCACHE)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
-    endif()
-  endif()
 endmacro()

 function(join VALUES GLUE OUTPUT)
@@ -275,30 +258,13 @@ check_required_components(${PROJECT_NAME})
 set(PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} PARENT_SCOPE)
 endfunction()

-function(generate_bundled_packages)
-  if(asio_BUNDLED)
-  set(BUNDLED_PACKAGES "\
-####### Expanded from @BUNDLED_PACKAGES@ by configure_package_config_file() #########
-
-if(\"\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}\" VERSION_LESS 3.11)
-   message(FATAL_ERROR \"CMake >= 3.11 required\")
-endif()
-set_target_properties(${PROJECT_NAME}::bundled_asio_headers PROPERTIES IMPORTED_GLOBAL TRUE)
-add_library(asio::headers ALIAS ${PROJECT_NAME}::bundled_asio_headers)
-set(asio_VERSION ${asio_VERSION})
-
-")
-  endif()
-set(BUNDLED_PACKAGES ${BUNDLED_PACKAGES} PARENT_SCOPE)
-endfunction()
-
 # Configure/Install CMake package
 macro(install_cmake_package)
  list(SORT PROJECT_PACKAGE_DEPENDENCIES)
  list(SORT PROJECT_INTERFACE_PACKAGE_DEPENDENCIES)
  include(CMakePackageConfigHelpers)
  set(PACKAGE_INSTALL_DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
  )
  if(BUILD_FAIRMQ)
    install(EXPORT ${PROJECT_EXPORT_SET}
@@ -314,9 +280,6 @@ macro(install_cmake_package)
  )
  generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
  generate_package_components() # fills ${PACKAGE_COMPONENTS}
-  generate_bundled_packages() # fills ${BUNDLED_PACKAGES}
-  string(TOUPPER ${CMAKE_BUILD_TYPE} PROJECT_BUILD_TYPE_UPPER)
-  set(PROJECT_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${PROJECT_BUILD_TYPE_UPPER}})
  configure_package_config_file(
    ${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in
    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
@@ -330,219 +293,49 @@ macro(install_cmake_package)
  )
 endmacro()

-#
-# find_package2(PRIVATE|PUBLIC|INTERFACE <pkgname>
-#               [VERSION <version>]
-#               [COMPONENTS <list of components>]
-#               [ADD_REQUIREMENTS_OF <list of dep_pgkname>]
-#               [any other option the native find_package supports]...)
-#
-# Wrapper around CMake's native find_package command to add some features and bookkeeping.
-#
-# The qualifier (PRIVATE|PUBLIC|INTERFACE|BUNDLED) to the package to populate
-# the variables PROJECT_[INTERFACE]_<pkgname>_([VERSION]|[COMPONENTS]|PACKAGE_DEPENDENCIES)
-# accordingly. This bookkeeping information is used to print our dependency found summary
-# table and to generate a part of our CMake package. BUNDLED decays to PUBLIC if the variable
-# <pkgname>_BUNDLED is false and to PRIVATE otherwise.
-#
-# When a dependending package is listed with ADD_REQUIREMENTS_OF the variables
-# <dep_pkgname>_<pkgname>_VERSION|COMPONENTS are looked up to and added to the native
-# VERSION (selected highest version) and COMPONENTS (deduplicated) args.
-#
-# COMPONENTS and VERSION args are then just passed to the native find_package.
-#
 macro(find_package2 qualifier pkgname)
-  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS;ADD_REQUIREMENTS_OF" ${ARGN})
+  cmake_parse_arguments(ARGS "" "" "VERSION;COMPONENTS" ${ARGN})

  string(TOUPPER ${pkgname} pkgname_upper)
-  set(__old_cpp__ ${CMAKE_PREFIX_PATH})
+  set(old_CPP ${CMAKE_PREFIX_PATH})
  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
-
-  # build lists of required versions and components
-  unset(__required_versions__)
-  unset(__components__)
-  if(ARGS_VERSION)
-    list(APPEND __required_versions__ ${ARGS_VERSION})
-  endif()
-  if(ARGS_COMPONENTS)
-    list(APPEND __components__ ${ARGS_COMPONENTS})
-  endif()
-  if(ARGS_ADD_REQUIREMENTS_OF)
-    foreach(dep_pkgname IN LISTS ARGS_ADD_REQUIREMENTS_OF)
-      if(${dep_pkgname}_${pkgname}_VERSION)
-        list(APPEND __required_versions__ ${${dep_pkgname}_${pkgname}_VERSION})
-      endif()
-      if(${dep_pkgname}_${pkgname}_COMPONENTS)
-        list(APPEND __components__ ${${dep_pkgname}_${pkgname}_COMPONENTS})
-      endif()
-    endforeach()
-  endif()
-
-  # select highest required version
  unset(__version__)
-  if(__required_versions__)
-    list(GET __required_versions__ 0 __version__)
-    foreach(v IN LISTS __required_versions__)
+  if(ARGS_VERSION)
+    list(GET ARGS_VERSION 0 __version__)
+    list(LENGTH ARGS_VERSION __length__)
+    foreach(v IN LISTS ARGS_VERSION)
      if(${v} VERSION_GREATER ${__version__})
        set(__version__ ${v})
      endif()
    endforeach()
  endif()
-  # deduplicate required component list
-  if(__components__)
-    list(REMOVE_DUPLICATES __components__)
-  endif()
-
-  # call native find_package
-  if(__components__)
-    find_package(${pkgname} ${__version__} QUIET COMPONENTS ${__components__} ${ARGS_UNPARSED_ARGUMENTS})
+  if(ARGS_COMPONENTS)
+    list(REMOVE_DUPLICATES ARGS_COMPONENTS)
+    find_package(${pkgname} ${__version__} QUIET COMPONENTS ${ARGS_COMPONENTS} ${ARGS_UNPARSED_ARGUMENTS})
  else()
    find_package(${pkgname} ${__version__} QUIET ${ARGS_UNPARSED_ARGUMENTS})
  endif()
-
-  if(${qualifier} STREQUAL BUNDLED)
-    if(${pkgname}_BUNDLED)
-      set(__qualifier__ PRIVATE)
-    else()
-      set(__qualifier__ PUBLIC)
-    endif()
-  else()
-    set(__qualifier__ ${qualifier})
-  endif()
+  set(CMAKE_PREFIX_PATH ${old_CPP})
+  unset(old_CPP)

  if(${pkgname}_FOUND)
-    if(${__qualifier__} STREQUAL PRIVATE)
+    if(${qualifier} STREQUAL PRIVATE)
      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-    elseif(${__qualifier__} STREQUAL PUBLIC)
+    elseif(${qualifier} STREQUAL PUBLIC)
      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
-    elseif(${__qualifier__} STREQUAL INTERFACE)
+    elseif(${qualifier} STREQUAL INTERFACE)
      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
    endif()
  endif()

-  unset(__qualifier__)
  unset(__version__)
-  unset(__components__)
-  unset(__required_versions__)
-  set(CMAKE_PREFIX_PATH ${__old_cpp__})
-  unset(__old_cpp__)
-endmacro()
-
-macro(exec cmd)
-  join("${ARGN}" " " args)
-  file(APPEND ${${package}_BUILD_LOGFILE} ">>> ${cmd} ${args}\n")
-
-  execute_process(COMMAND ${cmd} ${ARGN}
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE log
-    ERROR_VARIABLE log
-    RESULT_VARIABLE res
-  )
-  file(APPEND ${${package}_BUILD_LOGFILE} ${log})
-
-  if(res)
-    message(FATAL_ERROR "${res} \nSee also \"${${package}_BUILD_LOGFILE}\"")
-  endif()
-endmacro()
-
-macro(exec_source cmd)
-  join("${ARGN}" " " args)
-  file(APPEND ${${package}_BUILD_LOGFILE} ">>> ${cmd} ${args}\n")
-
-  execute_process(COMMAND ${cmd} ${ARGN}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE log
-    ERROR_VARIABLE log
-    RESULT_VARIABLE res
-  )
-  file(APPEND ${${package}_BUILD_LOGFILE} ${log})
-
-  if(res)
-    message(FATAL_ERROR "${res} \nSee also \"${${package}_BUILD_LOGFILE}\"")
-  endif()
-endmacro()
-
-function(build_bundled package bundle)
-  message(STATUS "Building bundled ${package}")
-
-  set(${package}_SOURCE_DIR ${CMAKE_SOURCE_DIR}/${bundle})
-  set(${package}_BINARY_DIR ${CMAKE_BINARY_DIR}/${bundle})
-  file(MAKE_DIRECTORY ${${package}_BINARY_DIR})
-  set(${package}_BUILD_LOGFILE ${${package}_BINARY_DIR}/build.log)
-  file(REMOVE ${${package}_BUILD_LOGFILE})
-
-  if(Git_FOUND)
-    exec_source(${GIT_EXECUTABLE} submodule update --init -- ${${package}_SOURCE_DIR})
-  endif()
-
-  if(${package} STREQUAL GTest)
-    set(${package}_INSTALL_DIR ${CMAKE_BINARY_DIR}/${bundle}_install)
-    file(MAKE_DIRECTORY ${${package}_INSTALL_DIR})
-    set(${package}_ROOT ${${package}_INSTALL_DIR})
-
-    exec(${CMAKE_COMMAND} -S ${${package}_SOURCE_DIR} -B ${${package}_BINARY_DIR} -G ${CMAKE_GENERATOR}
-      -DCMAKE_INSTALL_PREFIX=${${package}_INSTALL_DIR} -DBUILD_GMOCK=OFF
-    )
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)
-  elseif(${package} STREQUAL asio)
-    set(${package}_BUILD_INCLUDE_DIR ${${package}_SOURCE_DIR}/asio/include CACHE PATH "Bundled ${package} build-interface include dir")
-    set(${package}_INSTALL_INCLUDE_DIR ${PROJECT_INSTALL_INCDIR}/bundled CACHE PATH "Bundled ${package} install-interface include dir")
-    set(${package}_ROOT ${${package}_SOURCE_DIR}/asio)
-  endif()
-
-  string(TOUPPER ${package} package_upper)
-  set(${package_upper}_ROOT "${${package}_ROOT}" CACHE PATH "Bundled ${package} install prefix search hint")
-  set(${package}_BUNDLED ON CACHE BOOL "Whether bundled ${package} was used")
-
-  message(STATUS "Building bundled ${package} - done")
-endfunction()
-
-macro(fairmq_build_option option description)
-  cmake_parse_arguments(ARGS "" "DEFAULT" "REQUIRES" ${ARGN})
-
-  if(ARGS_DEFAULT)
-    set(__default__ ON)
-  else()
-    set(__default__ OFF)
-  endif()
-
-  if(ARGS_REQUIRES)
-    include(CMakeDependentOption)
-    set(__requires__ ${ARGS_REQUIRES})
-    foreach(d ${__requires__})
-      string(REGEX REPLACE " +" ";" __requires_condition__ "${d}")
-      if(${__requires_condition__})
-      else()
-        if(${option})
-          message(FATAL_ERROR "Cannot enable build option ${option}, depending option is not set: ${__requires_condition__}")
-        endif()
-      endif()
-    endforeach()
-  else()
-    set(__requires__)
-  endif()
-
-  if(__requires__)
-    cmake_dependent_option(${option} ${description} ${__default__} "${__requires__}" OFF)
-  else()
-    option(${option} ${description} ${__default__})
-  endif()
-
-  set(__default__)
-  set(__requires__)
-  set(__requires_condition__)
-  set(ARGS_DEFAULT)
-  set(ARGS_REQUIRES)
-  set(option)
-  set(description)
 endmacro()
--- a/cmake/FindAZMQ.cmake
+++ b/cmake/FindAZMQ.cmake
@@ -0,0 +1,57 @@
+################################################################################
+#    Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+#
+# ###########################
+# # Locate the AZMQ library #
+# ###########################
+#
+#
+# Usage:
+#
+#   find_package(AZMQ [version] [QUIET] [REQUIRED])
+#
+#
+# Defines the following variables:
+#
+#   AZMQ_FOUND - Found the ZeroMQ library
+#   AZMQ_INCLUDE_DIR (CMake cache) - Include directory
+#
+#
+# Accepts the following variables as hints for installation directories:
+#
+#   AZMQ_ROOT (CMake var, ENV var)
+#
+#
+# If the above variables are not defined, or if ZeroMQ could not be found there,
+# it will look for it in the system directories. Custom ZeroMQ installations
+# will always have priority over system ones.
+#
+
+if(NOT AZMQ_ROOT)
+  set(AZMQ_ROOT $ENV{AZMQ_ROOT})
+endif()
+
+find_path(AZMQ_INCLUDE_DIR
+  NAMES azmq/socket.hpp
+  HINTS ${AZMQ_ROOT} $ENV{AZMQ_ROOT}
+  PATH_SUFFIXES include
+  DOC "AZMQ include directory"
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(AZMQ
+    REQUIRED_VARS AZMQ_INCLUDE_DIR
+)
+
+if(AZMQ_FOUND AND NOT TARGET AZMQ::AZMQ)
+  add_library(AZMQ::AZMQ INTERFACE IMPORTED)
+  set_target_properties(AZMQ::AZMQ PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${AZMQ_INCLUDE_DIR}
+    INTERFACE_LINK_LIBRARIES "libzmq;Boost::boost;Boost::container;Boost::system"
+  )
+endif()
--- a/cmake/FindDDS.cmake
+++ b/cmake/FindDDS.cmake
@@ -0,0 +1,88 @@
+################################################################################
+# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+find_path(DDS_INCLUDE_DIR
+  NAMES dds_intercom.h
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES include
+)
+
+find_path(DDS_LIBRARY_DIR
+  NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+)
+
+find_library(DDS_INTERCOM_LIBRARY_SHARED
+  NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds_intercom_lib.dylib libdds_intercom_lib.so."
+)
+
+find_library(DDS_PROTOCOL_LIBRARY_SHARED
+  NAMES libdds_protocol_lib.dylib libdds_protocol_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds_protocol_lib.dylib libdds_protocol_lib.so."
+)
+
+find_library(DDS_USER_DEFAULTS_LIBRARY_SHARED
+  NAMES libdds-user-defaults.dylib libdds-user-defaults.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds-user-defaults.dylib libdds-user-defaults.so."
+)
+
+find_file(DDS_VERSION_FILE
+  NAMES version
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES etc
+)
+
+if(DDS_VERSION_FILE AND NOT DDS_VERSION)
+  file(READ ${DDS_VERSION_FILE} DDS_VERSION)
+  string(STRIP "${DDS_VERSION}" DDS_VERSION)
+  set(DDS_VERSION ${DDS_VERSION} CACHE string "DDS version.")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DDS
+  REQUIRED_VARS
+  DDS_INCLUDE_DIR
+  DDS_LIBRARY_DIR
+  DDS_INTERCOM_LIBRARY_SHARED
+  DDS_PROTOCOL_LIBRARY_SHARED
+  DDS_USER_DEFAULTS_LIBRARY_SHARED
+
+  VERSION_VAR DDS_VERSION
+)
+
+if(NOT TARGET DDS::dds_intercom_lib AND DDS_FOUND)
+  add_library(DDS::dds_intercom_lib SHARED IMPORTED)
+  set_target_properties(DDS::dds_intercom_lib PROPERTIES
+    IMPORTED_LOCATION ${DDS_INTERCOM_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
+
+if(NOT TARGET DDS::dds_protocol_lib AND DDS_FOUND)
+  add_library(DDS::dds_protocol_lib SHARED IMPORTED)
+  set_target_properties(DDS::dds_protocol_lib PROPERTIES
+    IMPORTED_LOCATION ${DDS_PROTOCOL_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
+
+if(NOT TARGET DDS::dds-user-defaults AND DDS_FOUND)
+  add_library(DDS::dds-user-defaults SHARED IMPORTED)
+  set_target_properties(DDS::dds-user-defaults PROPERTIES
+    IMPORTED_LOCATION ${DDS_USER_DEFAULTS_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
--- a/cmake/Findasio.cmake
+++ b/cmake/Findasio.cmake
@@ -1,53 +0,0 @@
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-find_path(asio_INCLUDE_DIR
-  NAMES asio.hpp
-  PATH_SUFFIXES include
-)
-
-if(asio_INCLUDE_DIR)
-  find_file(asio_VERSION_HEADER "asio/version.hpp"
-    ${asio_INCLUDE_DIR}
-    NO_DEFAULT_PATH
-  )
-endif()
-
-if(asio_VERSION_HEADER)
-  file(READ "${asio_VERSION_HEADER}" _asio_VERSION_HEADER_CONTENT)
-  string(REGEX MATCH "#define ASIO_VERSION ([0-9]+)" _MATCH "${_asio_VERSION_HEADER_CONTENT}")
-  set(asio_VERSION_MACRO ${CMAKE_MATCH_1})
-  math(EXPR asio_VERSION_MAJOR "${asio_VERSION_MACRO} / 100000")
-  math(EXPR asio_VERSION_MINOR "${asio_VERSION_MACRO} / 100 % 1000")
-  math(EXPR asio_VERSION_PATCH "${asio_VERSION_MACRO} % 100")
-  set(asio_VERSION "${asio_VERSION_MAJOR}.${asio_VERSION_MINOR}.${asio_VERSION_PATCH}")
-endif()
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(asio
-  REQUIRED_VARS asio_INCLUDE_DIR
-  VERSION_VAR asio_VERSION
-  HANDLE_COMPONENTS
-)
-
-if(asio_FOUND AND asio_BUNDLED)
-  add_library(bundled_asio_headers INTERFACE)
-  target_include_directories(bundled_asio_headers INTERFACE
-    $<BUILD_INTERFACE:${asio_BUILD_INCLUDE_DIR}>
-    $<INSTALL_INTERFACE:${asio_INSTALL_INCLUDE_DIR}>
-  )
-  add_library(asio::headers ALIAS bundled_asio_headers)
-endif()
-if(asio_FOUND AND NOT TARGET asio::headers)
-  add_library(asio::headers INTERFACE IMPORTED)
-  set_target_properties(asio::headers PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${asio_INCLUDE_DIR}"
-  )
-endif()
-
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -4,37 +4,7 @@

 ## 3.1 Device Configuration

-Device Configuration is stored in configuration object - `fair::mq::ProgOptions`. It is accessible by the device, plugins or from DeviceRunner/main:
-
-Plugins <---read/write---> ProgOptions <---read/write---> Device
-
-Whenever a configuration property is set, it is set in ProgOptions. Device/Channels/User code read this value and apply it as necessary at different stages:
- - apply it immidiately
- - apply it in device/channels during InitializingDevice/Binding/Connecting states
-
-Here is an overview of the device/channel options and when they are applied:
-
-| Property | Applied in |
-| --- | --- |
-| `severity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `file-severity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `verbosity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `color` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `log-to-file` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `id` | at the end of `fair::mq::State::InitializingDevice` |
-| `io-threads` | at the end of `fair::mq::State::InitializingDevice` |
-| `transport` | at the end of `fair::mq::State::InitializingDevice` |
-| `network-interface` | at the end of `fair::mq::State::InitializingDevice` |
-| `init-timeout` | at the end of `fair::mq::State::InitializingDevice` |
-| `max-run-time` | at the end of `fair::mq::State::InitializingDevice` |
-| `shm-segment-size` | at the end of `fair::mq::State::InitializingDevice` |
-| `shm-monitor` | at the end of `fair::mq::State::InitializingDevice` |
-| `ofi-size-hint` | at the end of `fair::mq::State::InitializingDevice` |
-| `rate` | at the end of `fair::mq::State::InitializingDevice` |
-| `session` | at the end of `fair::mq::State::InitializingDevice` |
-| `chan.*` | at the end of `fair::mq::State::InitializingDevice` (channel addresses can be also applied during `fair::mq::State::Binding`/`fair::mq::State::Connecting`) |
-
-## 3.2 Configuration options
+Devices receive configuration primarily via provided command line options (that can be extended per device).

 ## 3.2 Communication Channels Configuration

@@ -62,14 +32,6 @@ This parser reads channel configuration from a JSON file. Example:
                                "address": "tcp://*:5555",
                                "sndBufSize": 1000,
                                "rcvBufSize": 1000,
-                                "sndKernelSize" : 0,
-                                "rcvKernelSize" : 0,
-                                "transport": "shmem",
-                                "linger": "500",
-                                "portRangeMin": "22000",
-                                "portRangeMax": "23000",
-                                "autoBind": false,
-                                "numSockets": 0,
                                "rateLogging": 1
                            }
                        ]
@@ -86,7 +48,9 @@ This parser reads channel configuration from a JSON file. Example:
                                "type": "pull",
                                "method": "connect",
                                "address": "tcp://localhost:5555",
-                                "transport": "shmem"
+                                "sndBufSize": 1000,
+                                "rcvBufSize": 1000,
+                                "rateLogging": 1
                            }
                        ]
                    }
--- a/docs/Device.md
+++ b/docs/Device.md
@@ -24,7 +24,7 @@ FairMQ devices communicate via the communication patterns offered by ZeroMQ (or

 Each FairMQ device has an internal state machine:

-![FairMQ state machine](images/device_states.svg "FairMQ state machine")
+![FairMQ state machine](images/device_states.png?raw=true "FairMQ state machine")

 The state machine can be querried and controlled via `GetCurrentStateName()` and `ChangeState("<state name>")` methods. Only legal state transitions are allowed (see image above). Illegal transitions will fail with an error.

@@ -48,6 +48,6 @@ Without the interactive mode, for example for a run in background, two other con

 ## 1.4 Multiple devices in the same process

-Technically one can create two or more devices within the same process without any conflicts. However the configuration (fair::mq::ProgOptions) currently assumes the supplied configuration values are for one device/process.
+Technically one can create two or more devices within the same process without any conflicts. However the configuration (FairMQProgOptions) currently assumes the supplied configuration values are for one device/process.

 ← [Back](../README.md)
--- a/docs/Plugins.md
+++ b/docs/Plugins.md
@@ -1,93 +0,0 @@
-← [Back](../README.md)
-
-# 7. Plugins
-
-FairMQ devices can be integrated with external configuration and control systems through its plugin system. FairMQ plugins are special dynamic libraries that can be loaded at runtime. Plugins have access to the Plugin API which includes the capability to control/monitor the device [state machine](Device.md#13-state-machine) and change/monitor configuration properties.
-
-A simple plugin may add the feature to read configuration from a certain desired file format once at the start of a device. A more complex plugin may create a long-running thread that integrates a network client to an external API of a central experiment control system.
-
-Because plugins are loaded dynamically, they can be developed in separate repositories/projects and also have their own set of runtime dependency that are not needed to be known at compile-time of the FairMQ device.
-
-## 7.1 Usage
-
-To load a plugin pass the `-P <name>[,<name>]` (or long `--plugin`) command line option. Multiple plugins can be loaded at the same time. The load order is as specified at the command line. This determines the order in which the plugins are instantiated (ctor call order) and in which order they are notified, should they subscribe to any notifications.
-
-When passing `-h/--help` on the command line one can find more detailed information:
-
-```
-Plugin Manager:
-  -S [ --plugin-search-path ] arg       List of plugin search paths.
-                                        * Override default search path, e.g.
-                                          -S /home/user/lib /lib
-                                        * Append(>) or prepend(<) to default
-                                        search path, e.g.
-                                          -S >/lib </home/user/lib
-                                        * If you mix the overriding and
-                                        appending/prepending syntaxes, the
-                                        overriding paths act as default search
-                                        path, e.g.
-                                          -S /usr/lib >/lib </home/user/lib
-                                        /usr/local/lib results in
-                                        /home/user/lib,/usr/local/lib,/usr/lib/
-                                        ,/lib
-                                        If nothing is found, the default
-                                        dynamic library lookup is performed,
-                                        see man ld.so(8) for details.
-  -P [ --plugin ] arg                   List of plugin names to load in
-                                        order,e.g. if the file is called
-                                        'libFairMQPlugin_example.so', just list
-                                        'example' or 'd:example' here.To load a
-                                        prelinked plugin, list 'p:example'
-                                        here.
-```
-
-## 7.2 Development
-
-To develop a custom FairMQ plugin, one simply needs to inherit from the `fair::mq::Plugin` base class (`#include <fairmq/Plugin.h>`) and call the `REGISTER_FAIRMQ_PLUGIN` macro. It is possible to introduce new command line option together with a plugin.
-
-The Plugin API includes:
-  * `Take/Steal/ReleaseDeviceControl()`/`GetCurrent/ChangeDeviceState()`/`SubscribeTo/UnsubscribeFromDeviceStateChange()` APIs enable controlling the device state machine. Only one plugin is authorized to control at the same time. Which one is determined by which plugin calls `TakeDeviceControl()` first.
-  * `Set/GetProperty()`/`GetPropertyKeys()`/`SubscribeTo/UnsubscribeFromPropertyChange()` APIs enable configuration of device properties.
-See [`<fairmq/Plugin.h>`](/fairmq/Plugin.h) for the full API.
-
-A more complete example which may serve as a start including example CMake code can be found here: [FairRootGroup/FairMQPlugin_example](https://github.com/FairRootGroup/FairMQPlugin_example).
-
-## 7.3 Provided Plugins
-
-### 7.3.1 DDS
-
-When launching a FairMQ topology via [DDS](http://dds.gsi.de/) the DDS plugin enables FairMQ devices to interact with DDS' custom command and property subsystems - enable the plugin by passing `-P dds` on the command line.
-
-Via the property subsystem a FairMQ topology may exchange channel connection data (essentially to do service discovery) needed to connect/bind all FairMQ channels appropriately. DDS is highly optimized for this use case. See [examples/dds](examples/dds/README.md) for more details.
-
-Via the custom command subsystem a FairMQ device can receive a number of commands. FairMQ provides a convenient command line tool `fairmq-dds-command-ui` that allows interactive or scripted control of a running FairMQ topology managed via DDS. If one develops directly against the custom command DDS API, the following table lists all the commands the DDS plugin currently understands:
-
-| Custom Command | Response | Error | Description |
-| --- | --- | --- | --- |
-| `check-state` | `<ID>: <STATE> (pid: <PID>)` | n/a | Query current device state, see state machine for possible states |
-| `dump-config` | `(<ID>: <PKEY> -> <PVALUE>\n)+` | n/a | Query current device config (list property key/value pairs) |
-| `INIT DEVICE` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `BIND` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `CONNECT` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `INIT TASK` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RUN` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `STOP` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RESET TASK` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RESET DEVICE` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `END` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `subscribe-to-heartbeats` | `heartbeat-subscription: <ID>,OK` | n/a | Subscribe to heartbeats |
-| on heartbeat subscription | `heartbeat: <ID>,<PID>` | n/a | Heartbeat every 100ms |
-| `unsubscribe-from-heartbeats` | `heartbeat-unsubscription: <ID>,OK` | n/a | Unsubscribe from heartbeats |
-| `subscribe-to-state-changes` | `state-changes-subscription: <ID>,OK` | n/a | Subscribe to state changes |
-| on state changes subscription | `state-change: <ID>,<STATE>` | n/a | State change notification |
-| `unsubscribe-from-state-changes` | `state-changes-unsubscription: <ID>,OK` | n/a | Unsubscribe from state changes |
-
-If unknown commands are received the plugin will print a warning.
-
-### 7.3.2 PMIx
-
-The [PMIx](https://pmix.org/) plugin enables launching a FairMQ topology with any PMIx capable launcher, e.g. the [Open Run-Time Environment (ORTE) of OpenMPI](https://www.open-mpi.org/doc/v4.0/man1/mpirun.1.php) or the [Slurm workload manager](https://slurm.schedmd.com/srun.html). This plugin is not (yet) very mature and serves as a proof of concept at the moment.
-
-TODO example usage
-
-← [Back](../README.md)
--- a/docs/SDK.md
+++ b/docs/SDK.md
@@ -1,34 +0,0 @@
-← [Back](../README.md)
-
-# 8. Controller SDK
-
-The FairMQ Controller Software Development Kit (`-DBUILD_SDK=ON`) contains a (as of today still experimental) set of C++ APIs that provide essential functionality to the implementer of a global controller.
-
-The FairMQ core library only provides two local controllers - `static` (a fixed sequence of state transitions) and `interactive` (a read-eval-print-loop which reads keyboard commands from standard input). A local controller only knows how steer a single [FairMQ device](Device.md) - in fact, it runs in a thread within the device process.
-
-A global controller has knowledge about the full topology of connected FairMQ devices. Its responsibility is to facilitate the lifecycle of a distributed FairMQ-based application (*executing a topology*), such as
-
-* allocating/releasing compute resources from a resource management system,
-* launching/setting up the run-time environment and the FairMQ devices,
-* driving the device state machines in lock-step across the full topology,
-* pushing the device configuration,
-* monitoring (some aspects of the application's) operation,
-* and handling/reporting (some) error cases.
-
-The low-level hook to integrate FairMQ devices with such a global contoller is the [plugin mechanism](Plugins.md) in the FairMQ core library. The FairMQ Controller SDK provides C++ APIs that communicate to the endpoints exposed by such a FairMQ plugin.
-
-At the moment, the Controller SDK only supports [DDS](https://dds.gsi.de) as resource manager and run-time environment. A second implementation based on [PMIx](https://pmix.org/) (targeting its implementation in [Slurm](https://slurm.schedmd.com/documentation.html) and [OpenRTE](https://www-lb.open-mpi.org/papers/euro-pvmmpi-2005-orte/)) is in development.
-
-The following section give a short overview on the APIs provided.
-
-## RMS and run-time environment
-
-The classes [`fair::mq::sdk::DDSEnvironment`](../fairmq/sdk/DDSEnvironment.h), [`fair::mq::sdk::DDSSession`](../fairmq/sdk/DDSSession.h), and [`fair::mq::sdk::DDSTopology`](../fairmq/sdk/DDSTopology.h) are thin wrappers of most of the synchronous APIs exposed by DDS ([`dds::tools_api`](http://dds.gsi.de/doc/api-docs/DDS/html/namespacedds_1_1tools__api.html) and [`dds::topology_api`](http://dds.gsi.de/doc/api-docs/DDS/html/namespacedds_1_1topology__api.html)). E.g. they allow to [start a DDS session](https://github.com/FairRootGroup/FairMQ/blob/077eb0ef691940d764cfd1852bf3981dc812ddbd/main.cpp#L26-L28), [allocate resources](https://github.com/FairRootGroup/FairMQ/blob/077eb0ef691940d764cfd1852bf3981dc812ddbd/main.cpp#L34) and [launch a topology](https://github.com/FairRootGroup/FairMQ/blob/077eb0ef691940d764cfd1852bf3981dc812ddbd/main.cpp#L39) from a C++ program.
-
-## Driving the global state machine
-
-The class [`fair::mq::sdk::Topology`](../fairmq/sdk/Topology.h) adds a FairMQ-specific view on an existing DDS session that is executing a topology of FairMQ devices. One can e.g. [initiate a state transition on all devices in the topology simultaneously](https://github.com/FairRootGroup/FairMQ/blob/077eb0ef691940d764cfd1852bf3981dc812ddbd/main.cpp#L48-L49). This topology transition completes once a topology-wide barrier is passed (all devices completed the transition). This effectively exposes the device state machine as a topology state machine. The implementation is based on remote procedure calls over the [DDS intercom service](http://dds.gsi.de/doc/api-docs/DDS/html/namespacedds_1_1intercom__api.html) between the controller and the DDS plugin shipped with FairMQ (`-DBUILD_DDS_PLUGIN=ON`).
-
-For future versions of the SDK new APIs are planned to inspect and modify the device configurations and also operate only on subsets of a given topology.
-
-← [Back](../README.md)
--- a/docs/images/device_states.png
+++ b/docs/images/device_states.png
--- a/docs/images/device_states.svg
+++ b/docs/images/device_states.svg
--- a/examples/1-1/Sampler.cxx
+++ b/examples/1-1/Sampler.cxx
@@ -6,6 +6,9 @@
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/

+#include <thread> // this_thread::sleep_for
+#include <chrono>
+
 #include "Sampler.h"

 using namespace std;
@@ -23,8 +26,8 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    // Get the fText and fMaxIterations values from the command line options (via fConfig)
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
--- a/examples/1-1/Sink.cxx
+++ b/examples/1-1/Sink.cxx
@@ -30,7 +30,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
--- a/examples/1-1/runSampler.cxx
+++ b/examples/1-1/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_1::Sampler();
 }
--- a/examples/1-1/runSink.cxx
+++ b/examples/1-1/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_1::Sink();
 }
--- a/examples/1-n-1/Sampler.cxx
+++ b/examples/1-n-1/Sampler.cxx
@@ -32,8 +32,8 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    // Get the fText and fMaxIterations values from the command line options (via fConfig)
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
--- a/examples/1-n-1/Sink.cxx
+++ b/examples/1-n-1/Sink.cxx
@@ -30,7 +30,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data2", with a reference to the message and a sub-channel index (here 0)
--- a/examples/1-n-1/runProcessor.cxx
+++ b/examples/1-n-1/runProcessor.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Processor();
 }
--- a/examples/1-n-1/runSampler.cxx
+++ b/examples/1-n-1/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Sampler();
 }
--- a/examples/1-n-1/runSink.cxx
+++ b/examples/1-n-1/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Sink();
 }
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -16,8 +16,6 @@ add_subdirectory(multiple-channels)
 if(BUILD_NANOMSG_TRANSPORT)
  add_subdirectory(multiple-transports)
 endif()
-add_subdirectory(n-m)
-add_subdirectory(qc)
 add_subdirectory(readout)
 add_subdirectory(region)
 add_subdirectory(req-rep)
--- a/examples/README.md
+++ b/examples/README.md
@@ -6,50 +6,41 @@ Set of FairMQ examples. More examples that combine FairMQ with FairRoot can be f

 A simple topology of two devices - **Sampler** and **Sink**. **Sampler** sends data to **Sink** with the **PUSH-PULL** pattern.

+
 ## 1-n-1

 A simple topology of three device types - **Sampler**, **Processor** and **Sink**. **Sampler** sends data to one or more **Processor**s, who modify the data and send it to one **Sink**. Transport with the **PUSH-PULL** pattern. The example also shows the configuration via JSON files, as oposed to `--channel-config` that is used by other examples.

-## Built-in devices
-
-Usage of generic devies provided with FairMQ.
-
-## Copy & Push
-
-A topology consisting of one **Sampler** and two **Sink**s. The **Sampler** uses the `Copy` method to send the same data to both sinks with the **PUSH-PULL** pattern. In countrary to the **PUB-SUB** pattern, this ensures that all receivers are connected and no data is lost, but requires additional channels to be configured.

 ## DDS

 This example demonstrates usage of the Dynamic Deployment System ([DDS](http://dds.gsi.de/)) to dynamically deploy and configure a topology of devices. The topology is similar to those of Example 2, but now it can be easily distributed on different computing nodes without the need for manual reconfiguration of the devices.

-## Multipart

-This example shows how to send a multipart message from one device to the other. (two parts message parts - header and body).
+## Copy & Push
+
+A topology consisting of one **Sampler** and two **Sink**s. The **Sampler** uses the `Copy` method to send the same data to both sinks with the **PUSH-PULL** pattern. In countrary to the **PUB-SUB** pattern, this ensures that all receivers are connected and no data is lost, but requires additional channels to be configured.
+
+
+## Request & Reply
+
+This topology contains two devices that communicate with each other via the **REQ-REP** pettern. Bidirectional communication via a single socket.
+

 ## Multiple Channels

 This example demonstrates how to work with multiple channels and multiplex between them.

-## Multiple Transports
+
+## Sending Multipart messages
+
+This example shows how to send a multipart message from one device to the other. (two parts message parts - header and body).
+
+
+## Multiple Transports example

 This examples shows how to combine different channel transports (zeromq/nanomsg/shmem) inside of one device and/or topology.

-## n-m
-
-A topology consisting of three layers of devices: synchronizer -> n * senders -> m * receivers.
-
-## QC
-
-A topology consisting of 4 devices - Sampler, QCDispatcher, QCTask and Sink. The data flows from Sampler through QCDispatcher to Sink. On demand - by setting the corresponding configuration property - the QCDispatcher device will duplicate the data to the QCTask device. The property is set by the topology controller, in this example this is the `fairmq-dds-command-ui` utility.
-
-## Readout
-
-Two example topologies of setups to be distributed to two kinds of nodes - detector readout node and processing node. Detector readout node contains readout process, data builder and data sender (and optionally an additional processor), while processing node contains data receiver devices. communication within readout nodes is done via unmanaged region through shared memory transport.
-
-## Region
+## Region example

 This example demonstrates the use of a more advanced feature - UnmanagedRegion, that can be used to create a buffer through one of FairMQ transports. The contents of this buffer are managed by the user, who can also create messages out of sub-buffers of the created buffer. Such feature can be interesting in environments that have special requirements by the hardware that writes the data, to keep the transfer efficient (e.g. shared memory).
-
-## Request & Reply
-
-This topology contains two devices that communicate with each other via the **REQ-REP** pettern. Bidirectional communication via a single socket.
--- a/examples/copypush/Sampler.cxx
+++ b/examples/copypush/Sampler.cxx
@@ -33,11 +33,12 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    fNumDataChannels = fChannels.at("data").size();
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
 {
+
    // NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
    // Should only be used for small data because of the cost of an additional copy
    FairMQMessagePtr msg(NewSimpleMessage(fCounter++));
--- a/examples/copypush/Sink.cxx
+++ b/examples/copypush/Sink.cxx
@@ -27,7 +27,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
--- a/examples/copypush/runSampler.cxx
+++ b/examples/copypush/runSampler.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_copypush::Sampler();
 }
--- a/examples/copypush/runSink.cxx
+++ b/examples/copypush/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_copypush::Sink();
 }
--- a/examples/dds/CMakeLists.txt
+++ b/examples/dds/CMakeLists.txt
@@ -1,5 +1,5 @@
 ################################################################################
-#  Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
+#    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -7,12 +7,12 @@
 ################################################################################

 add_library(ExampleDDSLib STATIC
-  "Sampler.cxx"
-  "Sampler.h"
-  "Processor.cxx"
-  "Processor.h"
-  "Sink.cxx"
-  "Sink.h"
+    "Sampler.cxx"
+    "Sampler.h"
+    "Processor.cxx"
+    "Processor.h"
+    "Sink.cxx"
+    "Sink.h"
 )

 target_link_libraries(ExampleDDSLib PUBLIC FairMQ)
@@ -28,70 +28,40 @@ target_link_libraries(fairmq-ex-dds-sink PRIVATE ExampleDDSLib)

 add_custom_target(ExampleDDS DEPENDS fairmq-ex-dds-sampler fairmq-ex-dds-processor fairmq-ex-dds-sink)

-list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR)
-set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
-set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(DDS_PLUGIN_LIB_DIR ${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
+set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology-infinite.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml @ONLY)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-hosts.cfg ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh @ONLY)

 # test
-if(DDS_FOUND)
-  add_test(NAME Example.DDS.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh localhost)
-  set_tests_properties(Example.DDS.localhost PROPERTIES
-    TIMEOUT 15
-    RUN_SERIAL true
-    PASS_REGULAR_EXPRESSION "Example successful"
-  )
-endif()

 # install

 install(
-  TARGETS
-  fairmq-ex-dds-sampler
-  fairmq-ex-dds-processor
-  fairmq-ex-dds-sink
+    TARGETS
+    fairmq-ex-dds-sampler
+    fairmq-ex-dds-processor
+    fairmq-ex-dds-sink

-  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
 )

 # configure run script with different executable paths for build and for install directories
-set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
+set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
+set(DDS_PLUGIN_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR})
+set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology-infinite.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install @ONLY)

 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-dds-topology.xml
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
+    RENAME ex-dds-topology.xml
 )

 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml_install
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-dds-topology-infinite.xml
-)
-
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-ex-dds-env.sh
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-dds.sh
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
 )
--- a/examples/dds/README.md
+++ b/examples/dds/README.md
@@ -40,9 +40,9 @@ The configuration of the channel connection addresses is done by the DDS plugin

 **If you chose step 2b earlier**, then modify the provided `ex-dds-topology.xml` in the top that the following lines read as following:
 ```xml
-<declrequirement name="SamplerWorker" type="wnname" value=".*"/>
-<declrequirement name="ProcessorWorker" type="wnname" value=".*"/>
-<declrequirement name="SinkWorker" type="wnname" value=".*"/>
+<declrequirement id="SamplerWorker" type="wnname" value=".*"/>
+<declrequirement id="ProcessorWorker" type="wnname" value=".*"/>
+<declrequirement id="SinkWorker" type="wnname" value=".*"/>
 ```

 Note that the attributes `value` contain a different value.
--- a/examples/dds/Sampler.cxx
+++ b/examples/dds/Sampler.cxx
@@ -26,14 +26,10 @@ Sampler::Sampler()
 {
 }

-void Sampler::InitTask()
-{
-    fIterations = fConfig->GetValue<uint64_t>("iterations");
-    fCounter = 0;
-}
-
 bool Sampler::ConditionalRun()
 {
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
    // NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
    // Should only be used for small data because of the cost of an additional copy
    FairMQMessagePtr msg(NewSimpleMessage("Data"));
@@ -42,18 +38,11 @@ bool Sampler::ConditionalRun()

    // in case of error or transfer interruption, return false to go to IDLE state
    // successfull transfer will return number of bytes transfered (can be 0 if sending an empty message).
-    if (Send(msg, "data1") < 0) {
+    if (Send(msg, "data1") < 0)
+    {
        return false;
    }

-    if (fIterations > 0) {
-        ++fCounter;
-        if (fCounter >= fIterations) {
-            LOG(info) << "Sent " << fCounter << " messages. Finished.";
-            return false;
-        }
-    }
-
    return true;
 }

--- a/examples/dds/Sampler.h
+++ b/examples/dds/Sampler.h
@@ -25,14 +25,9 @@ class Sampler : public FairMQDevice
  public:
    Sampler();
    virtual ~Sampler();
-    void InitTask() override;

  protected:
-    bool ConditionalRun() override;
-
-  private:
-    uint64_t fIterations;
-    uint64_t fCounter;
+    virtual bool ConditionalRun();
 };

 } // namespace example_dds
--- a/examples/dds/Sink.cxx
+++ b/examples/dds/Sink.cxx
@@ -25,24 +25,11 @@ Sink::Sink()
    OnData("data2", &Sink::HandleData);
 }

-void Sink::InitTask()
-{
-    fIterations = fConfig->GetValue<uint64_t>("iterations");
-    fCounter = 0;
-}
-
 // handler is called whenever a message arrives on "data2", with a reference to the message and a sub-channel index (here 0)
 bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
 {
    LOG(info) << "Received: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";

-    if (fIterations > 0) {
-        ++fCounter;
-        if (fCounter >= fIterations) {
-            LOG(info) << "Received " << fCounter << " messages. Finished.";
-            return false;
-        }
-    }
    // return true if want to be called again (otherwise go to IDLE state)
    return true;
 }
--- a/examples/dds/Sink.h
+++ b/examples/dds/Sink.h
@@ -25,14 +25,9 @@ class Sink : public FairMQDevice
  public:
    Sink();
    virtual ~Sink();
-    void InitTask() override;

  protected:
    bool HandleData(FairMQMessagePtr&, int);
-
-  private:
-    uint64_t fIterations;
-    uint64_t fCounter;
 };

 } // namespace example_dds
--- a/examples/dds/ex-dds-hosts.cfg
+++ b/examples/dds/ex-dds-hosts.cfg
@@ -1,3 +1,7 @@
-sampler, 127.0.0.1, , /tmp/fairmq-ex-dds, 1
-processor, 127.0.0.1, , /tmp/fairmq-ex-dds, 10
-sink, 127.0.0.1, , /tmp/fairmq-ex-dds, 1
+@bash_begin@
+# source setup.sh
+@bash_end@
+
+sampler, username@localhost, , /path/to/dds-work/, 1
+processor, username@localhost, , /path/to/dds-work/, 10
+sink, username@localhost, , /path/to/dds-work/, 1
--- a/examples/dds/ex-dds-topology-infinite.xml
+++ b/examples/dds/ex-dds-topology-infinite.xml
@@ -1,52 +0,0 @@
-<topology name="ExampleDDS">
-
-    <property name="fmqchan_data1" />
-    <property name="fmqchan_data2" />
-
-    <declrequirement name="SamplerWorker" type="wnname" value="sampler"/>
-    <declrequirement name="ProcessorWorker" type="wnname" value="processor"/>
-    <declrequirement name="SinkWorker" type="wnname" value="sink"/>
-
-    <decltask name="Sampler">
-        <exe>fairmq-ex-dds-sampler --color false --channel-config name=data1,type=push,method=bind --rate 100 -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>SamplerWorker</name>
-        </requirements>
-        <properties>
-            <name access="write">fmqchan_data1</name>
-        </properties>
-    </decltask>
-
-    <decltask name="Processor">
-        <exe>fairmq-ex-dds-processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>ProcessorWorker</name>
-        </requirements>
-        <properties>
-            <name access="read">fmqchan_data1</name>
-            <name access="read">fmqchan_data2</name>
-        </properties>
-    </decltask>
-
-    <decltask name="Sink">
-        <exe>fairmq-ex-dds-sink --color false --channel-config name=data2,type=pull,method=bind -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>SinkWorker</name>
-        </requirements>
-        <properties>
-            <name access="write">fmqchan_data2</name>
-        </properties>
-    </decltask>
-
-    <main name="main">
-        <task>Sampler</task>
-        <task>Sink</task>
-        <group name="ProcessorGroup" n="10">
-            <task>Processor</task>
-        </group>
-    </main>
-
-</topology>
--- a/examples/dds/ex-dds-topology.xml
+++ b/examples/dds/ex-dds-topology.xml
@@ -1,50 +1,47 @@
-<topology name="ExampleDDS">
+<topology id="ExampleDDS">

-    <property name="fmqchan_data1" />
-    <property name="fmqchan_data2" />
+    <property id="data1" />
+    <property id="data2" />

-    <declrequirement name="SamplerWorker" type="wnname" value="sampler"/>
-    <declrequirement name="ProcessorWorker" type="wnname" value="processor"/>
-    <declrequirement name="SinkWorker" type="wnname" value="sink"/>
+    <declrequirement id="SamplerWorker" type="wnname" value="sampler"/>
+    <declrequirement id="ProcessorWorker" type="wnname" value="processor"/>
+    <declrequirement id="SinkWorker" type="wnname" value="sink"/>

-    <decltask name="Sampler">
-        <exe>fairmq-ex-dds-sampler --color false --channel-config name=data1,type=push,method=bind -P dds --iterations 10</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Sampler">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>SamplerWorker</name>
+            <id>SamplerWorker</id>
        </requirements>
        <properties>
-            <name access="write">fmqchan_data1</name>
+            <id access="write">data1</id>
        </properties>
    </decltask>

-    <decltask name="Processor">
-        <exe>fairmq-ex-dds-processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Processor">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-processor --id processor_%taskIndex% --config-key processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>ProcessorWorker</name>
+            <id>ProcessorWorker</id>
        </requirements>
        <properties>
-            <name access="read">fmqchan_data1</name>
-            <name access="read">fmqchan_data2</name>
+            <id access="read">data1</id>
+            <id access="read">data2</id>
        </properties>
    </decltask>

-    <decltask name="Sink">
-        <exe>fairmq-ex-dds-sink --color false --channel-config name=data2,type=pull,method=bind -P dds --iterations 10</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Sink">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>SinkWorker</name>
+            <id>SinkWorker</id>
        </requirements>
        <properties>
-            <name access="write">fmqchan_data2</name>
+            <id access="write">data2</id>
        </properties>
    </decltask>

-    <main name="main">
+    <main id="main">
        <task>Sampler</task>
        <task>Sink</task>
-        <group name="ProcessorGroup" n="10">
+        <group id="ProcessorGroup" n="10">
            <task>Processor</task>
        </group>
    </main>
--- a/examples/dds/fairmq-ex-dds-env.sh
+++ b/examples/dds/fairmq-ex-dds-env.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-export PATH=@BIN_DIR@:$PATH
-
-OS=$(uname -s 2>&1)
-if [ "$OS" == "Darwin" ]; then
-   export DYLD_LIBRARY_PATH=@LIB_DIR@:$DYLD_LIBRARY_PATH
-fi
--- a/examples/dds/fairmq-start-ex-dds.sh.in
+++ b/examples/dds/fairmq-start-ex-dds.sh.in
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-# fairmq-start-ex-dds.sh [localhost]   -> submit agents with localhost plugin
-# fairmq-start-ex-dds.sh ssh           -> submit agents with ssh plugin
-
-set -e
-
-cleanup() {
-  dds-session stop $1
-  echo "CLEANUP PERFORMED"
-}
-
-source @DDS_INSTALL_PREFIX@/DDS_env.sh
-export PATH=@BIN_DIR@:$PATH
-
-plugin=${1:-localhost}
-
-exec 5>&1
-output=$(dds-session start | tee >(cat - >&5))
-export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
-echo "SESSION ID: ${DDS_SESSION_ID}"
-
-trap "cleanup ${DDS_SESSION_ID}" EXIT
-
-requiredNofSlots=12
-if [[ "$plugin" == "ssh" ]]; then
-  dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg
-else
-  dds-submit -r ${plugin} --slots ${requiredNofSlots}
-fi
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-
-export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-dds-topology.xml
-echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
-echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})"
-
-dds-info --active-topology
-dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
-dds-info --active-topology
-echo "...waiting for ${requiredNofSlots} executing slots..."
-dds-info --executing-count --wait ${requiredNofSlots}
-
-echo "------------------------"
-echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
-fairmq-dds-command-ui -w "IDLE"
-fairmq-dds-command-ui -c i
-fairmq-dds-command-ui -c k
-fairmq-dds-command-ui -c b
-fairmq-dds-command-ui -c x
-fairmq-dds-command-ui -c j
-fairmq-dds-command-ui -c r
-sampler_and_sink="main/(Sampler|Sink).*"
-fairmq-dds-command-ui -w "RUNNING->READY" -p $sampler_and_sink
-echo "...$sampler_and_sink are READY, sending shutdown..."
-fairmq-dds-command-ui -c s
-fairmq-dds-command-ui -c t
-fairmq-dds-command-ui -c d
-fairmq-dds-command-ui -c q
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-echo "------------------------"
-
-dds-info --active-topology
-dds-topology --stop
-dds-info --active-topology
-
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
-
-# This string is used by ctest to detect success
-echo "Example successful :)"
-
-# Cleanup function is called by EXIT trap
--- a/examples/dds/runProcessor.cxx
+++ b/examples/dds/runProcessor.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Processor();
 }
--- a/examples/dds/runSampler.cxx
+++ b/examples/dds/runSampler.cxx
@@ -11,15 +11,11 @@

 namespace bpo = boost::program_options;

-void addCustomOptions(bpo::options_description& options)
+void addCustomOptions(bpo::options_description& /*options*/)
 {
-    options.add_options()(
-        "iterations,i",
-        bpo::value<uint64_t>()->default_value(1000),
-        "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Sampler();
 }
--- a/examples/dds/runSink.cxx
+++ b/examples/dds/runSink.cxx
@@ -11,15 +11,11 @@

 namespace bpo = boost::program_options;

-void addCustomOptions(bpo::options_description& options)
+void addCustomOptions(bpo::options_description& /*options*/)
 {
-    options.add_options()(
-        "iterations,i",
-        bpo::value<uint64_t>()->default_value(1000),
-        "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Sink();
 }
--- a/examples/multipart/CMakeLists.txt
+++ b/examples/multipart/CMakeLists.txt
@@ -32,20 +32,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multipart.sh.in ${CMA
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-multipart.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh)

 add_test(NAME Example.Multipart.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh zeromq)
-set_tests_properties(Example.Multipart.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 7 parts")
+set_tests_properties(Example.Multipart.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")

 if(BUILD_NANOMSG_TRANSPORT)
  add_test(NAME Example.Multipart.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh nanomsg)
-  set_tests_properties(Example.Multipart.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 7 parts")
+  set_tests_properties(Example.Multipart.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")
 endif()

 add_test(NAME Example.Multipart.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh shmem)
-set_tests_properties(Example.Multipart.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 7 parts")
-
-if(BUILD_OFI_TRANSPORT)
-  add_test(NAME Example.Multipart.ofi COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh ofi)
-  set_tests_properties(Example.Multipart.ofi PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 7 parts")
-endif()
+set_tests_properties(Example.Multipart.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")

 # install

--- a/examples/multipart/Sampler.cxx
+++ b/examples/multipart/Sampler.cxx
@@ -31,7 +31,7 @@ Sampler::Sampler()

 void Sampler::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
@@ -40,7 +40,8 @@ bool Sampler::ConditionalRun()
    header.stopFlag = 0;

    // Set stopFlag to 1 for last message.
-    if (fMaxIterations > 0 && fNumIterations == fMaxIterations - 1) {
+    if (fMaxIterations > 0 && fNumIterations == fMaxIterations - 1)
+    {
        header.stopFlag = 1;
    }
    LOG(info) << "Sending header with stopFlag: " << header.stopFlag;
@@ -52,27 +53,13 @@ bool Sampler::ConditionalRun()
    parts.AddPart(NewSimpleMessage(header));
    parts.AddPart(NewMessage(1000));

-    // create more data parts, testing the FairMQParts in-place constructor
-    FairMQParts auxData{ NewMessage(500), NewMessage(600), NewMessage(700) };
-    assert(auxData.Size() == 3);
-    parts.AddPart(std::move(auxData));
-    assert(auxData.Size() == 0);
-    assert(parts.Size() == 5);
-
-    parts.AddPart(NewMessage());
-
-    assert(parts.Size() == 6);
-
-    parts.AddPart(NewMessage(100));
-
-    assert(parts.Size() == 7);
-
    LOG(info) << "Sending body of size: " << parts.At(1)->GetSize();

    Send(parts, "data");

    // Go out of the sending loop if the stopFlag was sent.
-    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
+    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
        return false;
    }
@@ -83,4 +70,8 @@ bool Sampler::ConditionalRun()
    return true;
 }

-} // namespace example_multipart
+Sampler::~Sampler()
+{
+}
+
+} // namespace example_multipart
--- a/examples/multipart/Sampler.h
+++ b/examples/multipart/Sampler.h
@@ -24,7 +24,7 @@ class Sampler : public FairMQDevice
 {
  public:
    Sampler();
-    virtual ~Sampler() {}
+    virtual ~Sampler();

  protected:
    virtual void InitTask();
--- a/examples/multipart/Sink.cxx
+++ b/examples/multipart/Sink.cxx
@@ -20,28 +20,23 @@ using namespace std;
 namespace example_multipart
 {

+Sink::Sink()
+{
+    OnData("data", &Sink::HandleData);
+}
+
 bool Sink::HandleData(FairMQParts& parts, int /*index*/)
 {
-    LOG(info) << "Received message with " << parts.Size() << " parts";
-
    Header header;
    header.stopFlag = (static_cast<Header*>(parts.At(0)->GetData()))->stopFlag;

-    LOG(info) << "Received part 1 (header) with stopFlag: " << header.stopFlag;
-    LOG(info) << "Received part 2 of size: " << parts.At(1)->GetSize();
-    assert(parts.At(1)->GetSize() == 1000);
-    LOG(info) << "Received part 3 of size: " << parts.At(2)->GetSize();
-    assert(parts.At(2)->GetSize() == 500);
-    LOG(info) << "Received part 4 of size: " << parts.At(3)->GetSize();
-    assert(parts.At(3)->GetSize() == 600);
-    LOG(info) << "Received part 5 of size: " << parts.At(4)->GetSize();
-    assert(parts.At(4)->GetSize() == 700);
-    LOG(info) << "Received part 6 of size: " << parts.At(5)->GetSize();
-    assert(parts.At(5)->GetSize() == 0);
-    LOG(info) << "Received part 7 of size: " << parts.At(6)->GetSize();
-    assert(parts.At(6)->GetSize() == 100);
+    LOG(info) << "Received message with " << parts.Size() << " parts";

-    if (header.stopFlag == 1) {
+    LOG(info) << "Received header with stopFlag: " << header.stopFlag;
+    LOG(info) << "Received body of size: " << parts.At(1)->GetSize();
+
+    if (header.stopFlag == 1)
+    {
        LOG(info) << "stopFlag is 1, going IDLE";
        return false;
    }
@@ -49,4 +44,8 @@ bool Sink::HandleData(FairMQParts& parts, int /*index*/)
    return true;
 }

+Sink::~Sink()
+{
+}
+
 }
--- a/examples/multipart/Sink.h
+++ b/examples/multipart/Sink.h
@@ -23,8 +23,8 @@ namespace example_multipart
 class Sink : public FairMQDevice
 {
  public:
-    Sink() { OnData("data", &Sink::HandleData); }
-    virtual ~Sink() {}
+    Sink();
+    virtual ~Sink();

  protected:
    bool HandleData(FairMQParts&, int);
--- a/examples/multipart/fairmq-start-ex-multipart.sh.in
+++ b/examples/multipart/fairmq-start-ex-multipart.sh.in
@@ -2,24 +2,12 @@

 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

-transport="zeromq"
-
-if [[ $1 =~ ^[a-z]+$ ]]; then
-    transport=$1
-fi
-
-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-
 SAMPLER="fairmq-ex-multipart-sampler"
 SAMPLER+=" --id sampler1"
-SAMPLER+=" --transport $transport"
-SAMPLER+=" --session $SESSION"
 SAMPLER+=" --channel-config name=data,type=push,method=connect,rateLogging=0,address=tcp://127.0.0.1:5555"
 xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$SAMPLER &

 SINK="fairmq-ex-multipart-sink"
 SINK+=" --id sink1"
-SINK+=" --transport $transport"
-SINK+=" --session $SESSION"
 SINK+=" --channel-config name=data,type=pull,method=bind,rateLogging=0,address=tcp://127.0.0.1:5555"
 xterm -geometry 80x23+500+0 -hold -e @EX_BIN_DIR@/$SINK &
--- a/examples/multipart/runSampler.cxx
+++ b/examples/multipart/runSampler.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(5), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multipart::Sampler();
 }
--- a/examples/multipart/runSink.cxx
+++ b/examples/multipart/runSink.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multipart::Sink();
 }
--- a/examples/multipart/test-ex-multipart.sh.in
+++ b/examples/multipart/test-ex-multipart.sh.in
@@ -20,7 +20,7 @@ SAMPLER+=" --verbosity veryhigh"
 SAMPLER+=" --session $SESSION"
 SAMPLER+=" --max-iterations 1"
 SAMPLER+=" --control static --color false"
-SAMPLER+=" --channel-config name=data,type=pair,method=connect,rateLogging=0,address=tcp://127.0.0.1:5555,linger=1000"
+SAMPLER+=" --channel-config name=data,type=push,method=connect,rateLogging=0,address=tcp://127.0.0.1:5555"
@CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 SAMPLER_PID=$!

@@ -30,7 +30,7 @@ SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
 SINK+=" --session $SESSION"
 SINK+=" --control static --color false"
-SINK+=" --channel-config name=data,type=pair,method=bind,rateLogging=0,address=tcp://127.0.0.1:5555"
+SINK+=" --channel-config name=data,type=pull,method=bind,rateLogging=0,address=tcp://127.0.0.1:5555"
@CMAKE_CURRENT_BINARY_DIR@/$SINK &
 SINK_PID=$!

--- a/examples/multiple-channels/Sampler.cxx
+++ b/examples/multiple-channels/Sampler.cxx
@@ -33,8 +33,8 @@ Sampler::Sampler()

 void Sampler::InitTask()
 {
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 void Sampler::Run()
--- a/examples/multiple-channels/Sink.cxx
+++ b/examples/multiple-channels/Sink.cxx
@@ -31,7 +31,7 @@ Sink::Sink()

 void Sink::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sink::HandleBroadcast(FairMQMessagePtr& msg, int /*index*/)
--- a/examples/multiple-channels/runBroadcaster.cxx
+++ b/examples/multiple-channels/runBroadcaster.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Broadcaster();
 }
--- a/examples/multiple-channels/runSampler.cxx
+++ b/examples/multiple-channels/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Sampler();
 }
--- a/examples/multiple-channels/runSink.cxx
+++ b/examples/multiple-channels/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Sink();
 }
--- a/examples/multiple-transports/Sampler1.cxx
+++ b/examples/multiple-transports/Sampler1.cxx
@@ -22,7 +22,7 @@ Sampler1::Sampler1()

 void Sampler1::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 void Sampler1::PreRun()
--- a/examples/multiple-transports/Sampler2.cxx
+++ b/examples/multiple-transports/Sampler2.cxx
@@ -21,7 +21,7 @@ Sampler2::Sampler2()

 void Sampler2::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler2::ConditionalRun()
--- a/examples/multiple-transports/Sink.cxx
+++ b/examples/multiple-transports/Sink.cxx
@@ -31,7 +31,7 @@ Sink::Sink()

 void Sink::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
--- a/examples/multiple-transports/runSampler1.cxx
+++ b/examples/multiple-transports/runSampler1.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sampler1();
 }
--- a/examples/multiple-transports/runSampler2.cxx
+++ b/examples/multiple-transports/runSampler2.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sampler2();
 }
--- a/examples/multiple-transports/runSink.cxx
+++ b/examples/multiple-transports/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sink();
 }
--- a/examples/n-m/CMakeLists.txt
+++ b/examples/n-m/CMakeLists.txt
@@ -1,99 +0,0 @@
-################################################################################
-#    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-add_executable(fairmq-ex-n-m-synchronizer runSynchronizer.cxx)
-target_link_libraries(fairmq-ex-n-m-synchronizer PRIVATE FairMQ)
-
-add_executable(fairmq-ex-n-m-sender runSender.cxx)
-target_link_libraries(fairmq-ex-n-m-sender PRIVATE FairMQ)
-
-add_executable(fairmq-ex-n-m-receiver runReceiver.cxx)
-target_link_libraries(fairmq-ex-n-m-receiver PRIVATE FairMQ)
-
-add_custom_target(ExampleNM DEPENDS fairmq-ex-n-m-synchronizer fairmq-ex-n-m-sender fairmq-ex-n-m-receiver)
-
-list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR)
-set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
-set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-topology.xml                ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-topology.xml @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-pair-topology.xml           ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-pair-topology.xml @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-n-m-env.sh               ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-n-m-env.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m.sh.in          ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-pair.sh.in     ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-dds.sh.in      ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-dds.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-pair-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair-dds.sh @ONLY)
-
-# test
-if(DDS_FOUND)
-  add_test(NAME Example.N-M.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-dds.sh localhost)
-  set_tests_properties(Example.N-M.localhost PROPERTIES TIMEOUT 15 RUN_SERIAL true PASS_REGULAR_EXPRESSION "Example successful")
-  add_test(NAME Example.N-M-pair.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair-dds.sh localhost)
-  set_tests_properties(Example.N-M-pair.localhost PROPERTIES TIMEOUT 15 RUN_SERIAL true PASS_REGULAR_EXPRESSION "Example successful")
-endif()
-
-# install
-install(
-  TARGETS
-  fairmq-ex-n-m-synchronizer
-  fairmq-ex-n-m-sender
-  fairmq-ex-n-m-receiver
-
-  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
-)
-
-# configure run script with different executable paths for build and for install directories
-set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-topology.xml                ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-topology.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-pair-topology.xml           ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-pair-topology.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-n-m-env.sh               ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-n-m-env.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m.sh.in          ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-pair.sh.in     ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-dds.sh.in      ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-dds.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-n-m-pair-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair-dds.sh_install @ONLY)
-
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-topology.xml_install
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-n-m-topology.xml
-)
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-pair-topology.xml_install
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-n-m-pair-topology.xml
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-n-m-env.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-ex-n-m-env.sh
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-n-m.sh
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-n-m-pair.sh
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-dds.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-n-m-dds.sh
-)
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-n-m-pair-dds.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-n-m-pair-dds.sh
-)
--- a/examples/n-m/Header.h
+++ b/examples/n-m/Header.h
@@ -1,24 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIR_MQ_EXAMPLE_N_M_HEADER_H
-#define FAIR_MQ_EXAMPLE_N_M_HEADER_H
-
-#include <cstdint>
-
-namespace example_n_m
-{
-
-struct Header
-{
-    std::uint16_t id;
-    int senderIndex;
-};
-
-} // namespace example_n_m
-
-#endif /* FAIR_MQ_EXAMPLE_N_M_HEADER_H */
--- a/examples/n-m/README.md
+++ b/examples/n-m/README.md
@@ -1,4 +0,0 @@
-N-M
-==========================
-
-A topology consisting of three layers of devices: synchronizer -> sender(s) -> receiver(s). Senders distribute data to receivers based on the data id contained in the message from the synchronizer (same id goes to the same receiver from every sender). The senders send the data in a non-blocking fashion - if queue is full or receiver is down, data is discarded. Two configurations are provided - one using push/pull channels between senders/receivers, another using pair channels. In push/pull case there is only one receiving channel on the receiver device. In pair case there are as many receiver (sub-)channels as there are senders.
--- a/examples/n-m/ex-n-m-pair-topology.xml
+++ b/examples/n-m/ex-n-m-pair-topology.xml
@@ -1,44 +0,0 @@
-<topology name="myTopology">
-
-    <var name="numSenders" value="3" />
-    <var name="numReceivers" value="4" />
-
-    <property name="fmqchan_sync" />
-    <property name="fmqchan_data" />
-
-    <decltask name="Synchronizer">
-        <exe reachable="true">fairmq-ex-n-m-synchronizer --id sync --rate 100 --color false -P dds --channel-config name=sync,type=pub,method=bind</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_sync</id>
-        </properties>
-    </decltask>
-
-    <decltask name="Sender">
-        <exe reachable="true">fairmq-ex-n-m-sender --id sender%taskIndex% --timeframe-size 100000 --num-receivers ${numReceivers} --color false -P dds --channel-config name=sync,type=sub,method=connect name=data,type=pair,method=connect,numSockets=${numReceivers} --dds-i data:%taskIndex%</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="read">fmqchan_sync</id>
-            <name access="read">fmqchan_data</id>
-        </properties>
-    </decltask>
-
-    <decltask name="Receiver">
-        <exe reachable="true">fairmq-ex-n-m-receiver --id receiver%taskIndex% --num-senders ${numSenders} --color false -P dds --max-timeframes 10 --channel-config name=data,type=pair,method=bind,numSockets=${numSenders}</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_data</id>
-        </properties>
-    </decltask>
-
-    <main name="main">
-        <task>Synchronizer</task>
-        <group name="Senders" n="${numSenders}">
-            <task>Sender</task>
-        </group>
-        <group name="Receivers" n="${numReceivers}">
-            <task>Receiver</task>
-        </group>
-    </main>
-
-</topology>
--- a/examples/n-m/ex-n-m-topology.xml
+++ b/examples/n-m/ex-n-m-topology.xml
@@ -1,44 +0,0 @@
-<topology name="myTopology">
-
-    <var name="numSenders" value="3" />
-    <var name="numReceivers" value="4" />
-
-    <property name="fmqchan_sync" />
-    <property name="fmqchan_data" />
-
-    <decltask name="Synchronizer">
-        <exe reachable="true">fairmq-ex-n-m-synchronizer --id sync --rate 100 --color false -P dds --channel-config name=sync,type=pub,method=bind</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_sync</id>
-        </properties>
-    </decltask>
-
-    <decltask name="Sender">
-        <exe reachable="true">fairmq-ex-n-m-sender --id sender%taskIndex% --timeframe-size 100000 --num-receivers ${numReceivers} --color false -P dds --channel-config name=sync,type=sub,method=connect name=data,type=push,method=connect,numSockets=${numReceivers}</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="read">fmqchan_sync</id>
-            <name access="read">fmqchan_data</id>
-        </properties>
-    </decltask>
-
-    <decltask name="Receiver">
-        <exe reachable="true">fairmq-ex-n-m-receiver --id receiver%taskIndex% --num-senders ${numSenders} --color false -P dds --max-timeframes 10 --channel-config name=data,type=pull,method=bind</exe>
-        <env reachable="false">fairmq-ex-n-m-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_data</id>
-        </properties>
-    </decltask>
-
-    <main name="main">
-        <task>Synchronizer</task>
-        <group name="Senders" n="${numSenders}">
-            <task>Sender</task>
-        </group>
-        <group name="Receivers" n="${numReceivers}">
-            <task>Receiver</task>
-        </group>
-    </main>
-
-</topology>
--- a/examples/n-m/fairmq-ex-n-m-env.sh
+++ b/examples/n-m/fairmq-ex-n-m-env.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-export PATH=@BIN_DIR@:$PATH
-
-OS=$(uname -s 2>&1)
-if [ "$OS" == "Darwin" ]; then
-   export DYLD_LIBRARY_PATH=@LIB_DIR@:$DYLD_LIBRARY_PATH
-fi
--- a/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-dds.sh.in
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-set -e
-
-cleanup() {
-  dds-session stop $1
-  echo "CLEANUP PERFORMED"
-}
-
-source @DDS_INSTALL_PREFIX@/DDS_env.sh
-export PATH=@BIN_DIR@:$PATH
-
-exec 5>&1
-output=$(dds-session start | tee >(cat - >&5))
-export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
-echo "SESSION ID: ${DDS_SESSION_ID}"
-
-trap "cleanup ${DDS_SESSION_ID}" EXIT
-
-requiredNofSlots=8
-dds-submit -r localhost --slots ${requiredNofSlots}
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-
-export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-n-m-topology.xml
-echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
-echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})"
-
-dds-info --active-topology
-dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
-dds-info --active-topology
-echo "...waiting for ${requiredNofSlots} executing slots..."
-dds-info --executing-count --wait ${requiredNofSlots}
-
-echo "------------------------"
-echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
-fairmq-dds-command-ui -w "IDLE"
-fairmq-dds-command-ui -c i
-fairmq-dds-command-ui -c k
-fairmq-dds-command-ui -c b
-fairmq-dds-command-ui -c x
-fairmq-dds-command-ui -c j
-fairmq-dds-command-ui -c r
-receivers="main/Receivers.*"
-fairmq-dds-command-ui -w "RUNNING->READY" -p $receivers
-echo "All receivers transitioned from RUNNING to READY"
-fairmq-dds-command-ui -c s
-fairmq-dds-command-ui -c t
-fairmq-dds-command-ui -c d
-fairmq-dds-command-ui -c q
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-echo "------------------------"
-
-dds-info --active-topology
-dds-topology --stop
-dds-info --active-topology
-
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
-
-# This string is used by ctest to detect success
-echo "Example successful :)"
-
-# Cleanup function is called by EXIT trap
--- a/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-pair-dds.sh.in
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-set -e
-
-cleanup() {
-  dds-session stop $1
-  echo "CLEANUP PERFORMED"
-}
-
-source @DDS_INSTALL_PREFIX@/DDS_env.sh
-export PATH=@BIN_DIR@:$PATH
-
-exec 5>&1
-output=$(dds-session start | tee >(cat - >&5))
-export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
-echo "SESSION ID: ${DDS_SESSION_ID}"
-
-trap "cleanup ${DDS_SESSION_ID}" EXIT
-
-requiredNofSlots=8
-dds-submit -r localhost --slots ${requiredNofSlots}
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-
-export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-n-m-pair-topology.xml
-echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
-echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})"
-
-dds-info --active-topology
-dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
-dds-info --active-topology
-echo "...waiting for ${requiredNofSlots} executing slots..."
-dds-info --executing-count --wait ${requiredNofSlots}
-
-echo "------------------------"
-echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
-fairmq-dds-command-ui -w "IDLE"
-fairmq-dds-command-ui -c i
-fairmq-dds-command-ui -c k
-fairmq-dds-command-ui -c b
-fairmq-dds-command-ui -c x
-fairmq-dds-command-ui -c j
-fairmq-dds-command-ui -c r
-receivers="main/Receivers.*"
-fairmq-dds-command-ui -w "RUNNING->READY" -p $receivers
-echo "All receivers transitioned from RUNNING to READY"
-fairmq-dds-command-ui -c s
-fairmq-dds-command-ui -c t
-fairmq-dds-command-ui -c d
-fairmq-dds-command-ui -c q
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-echo "------------------------"
-
-dds-info --active-topology
-dds-topology --stop
-dds-info --active-topology
-
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
-
-# This string is used by ctest to detect success
-echo "Example successful :)"
-
-# Cleanup function is called by EXIT trap
--- a/examples/n-m/fairmq-start-ex-n-m-pair.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m-pair.sh.in
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-export PATH=@BIN_DIR@:$PATH
-
-SYNC="fairmq-ex-n-m-synchronizer"
-SYNC+=" --id Sync"
-SYNC+=" --channel-config name=sync,type=pub,method=bind,address=tcp://localhost:8010"
-SYNC+=" --rate 100"
-xterm -geometry 80x25+0+0 -hold -e $SYNC &
-
-SENDER0="fairmq-ex-n-m-sender"
-SENDER0+=" --id Sender1"
-SENDER0+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER0+="                  name=data,type=pair,method=connect,address=tcp://localhost:8021,address=tcp://localhost:8022,address=tcp://localhost:8023,address=tcp://localhost:8024"
-SENDER0+=" --sender-index 0"
-SENDER0+=" --subtimeframe-size 1000000"
-SENDER0+=" --num-receivers 4"
-xterm -geometry 80x25+500+0 -hold -e $SENDER0 &
-
-SENDER1="fairmq-ex-n-m-sender"
-SENDER1+=" --id Sender2"
-SENDER1+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER1+="                  name=data,type=pair,method=connect,address=tcp://localhost:8031,address=tcp://localhost:8032,address=tcp://localhost:8033,address=tcp://localhost:8034"
-SENDER1+=" --sender-index 1"
-SENDER1+=" --subtimeframe-size 1000000"
-SENDER1+=" --num-receivers 4"
-xterm -geometry 80x25+500+350 -hold -e $SENDER1 &
-
-SENDER2="fairmq-ex-n-m-sender"
-SENDER2+=" --id Sender3"
-SENDER2+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER2+="                  name=data,type=pair,method=connect,address=tcp://localhost:8041,address=tcp://localhost:8042,address=tcp://localhost:8043,address=tcp://localhost:8044"
-SENDER2+=" --sender-index 2"
-SENDER2+=" --subtimeframe-size 1000000"
-SENDER2+=" --num-receivers 4"
-xterm -geometry 80x25+500+700 -hold -e $SENDER2 &
-
-RECEIVER0="fairmq-ex-n-m-receiver"
-RECEIVER0+=" --id Receiver1"
-RECEIVER0+=" --channel-config name=data,type=pair,method=bind,address=tcp://localhost:8021,address=tcp://localhost:8031,address=tcp://localhost:8041"
-RECEIVER0+=" --num-senders 3"
-xterm -geometry 80x25+1000+0 -hold -e $RECEIVER0 &
-
-RECEIVER1="fairmq-ex-n-m-receiver"
-RECEIVER1+=" --id Receiver2"
-RECEIVER1+=" --channel-config name=data,type=pair,method=bind,address=tcp://localhost:8022,address=tcp://localhost:8032,address=tcp://localhost:8042"
-RECEIVER1+=" --num-senders 3"
-xterm -geometry 80x25+1000+350 -hold -e $RECEIVER1 &
-
-RECEIVER2="fairmq-ex-n-m-receiver"
-RECEIVER2+=" --id Receiver3"
-RECEIVER2+=" --channel-config name=data,type=pair,method=bind,address=tcp://localhost:8023,address=tcp://localhost:8033,address=tcp://localhost:8043"
-RECEIVER2+=" --num-senders 3"
-xterm -geometry 80x25+1000+700 -hold -e $RECEIVER2 &
-
-RECEIVER3="fairmq-ex-n-m-receiver"
-RECEIVER3+=" --id Receiver4"
-RECEIVER3+=" --channel-config name=data,type=pair,method=bind,address=tcp://localhost:8024,address=tcp://localhost:8034,address=tcp://localhost:8044"
-RECEIVER3+=" --num-senders 3"
-xterm -geometry 80x25+1000+1050 -hold -e $RECEIVER3 &
--- a/examples/n-m/fairmq-start-ex-n-m.sh.in
+++ b/examples/n-m/fairmq-start-ex-n-m.sh.in
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-export PATH=@BIN_DIR@:$PATH
-
-SYNC="fairmq-ex-n-m-synchronizer"
-SYNC+=" --id Sync"
-SYNC+=" --channel-config name=sync,type=pub,method=bind,address=tcp://localhost:8010"
-SYNC+=" --rate 100"
-xterm -geometry 80x25+0+0 -hold -e $SYNC &
-
-SENDER0="fairmq-ex-n-m-sender"
-SENDER0+=" --id Sender1"
-SENDER0+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER0+="                  name=data,type=push,method=connect,address=tcp://localhost:8021,address=tcp://localhost:8022,address=tcp://localhost:8023,address=tcp://localhost:8024"
-SENDER0+=" --sender-index 0"
-SENDER0+=" --subtimeframe-size 1000000"
-SENDER0+=" --num-receivers 4"
-xterm -geometry 80x25+500+0 -hold -e $SENDER0 &
-
-SENDER1="fairmq-ex-n-m-sender"
-SENDER1+=" --id Sender2"
-SENDER1+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER1+="                  name=data,type=push,method=connect,address=tcp://localhost:8021,address=tcp://localhost:8022,address=tcp://localhost:8023,address=tcp://localhost:8024"
-SENDER1+=" --sender-index 1"
-SENDER1+=" --subtimeframe-size 1000000"
-SENDER1+=" --num-receivers 4"
-xterm -geometry 80x25+500+350 -hold -e $SENDER1 &
-
-SENDER2="fairmq-ex-n-m-sender"
-SENDER2+=" --id Sender3"
-SENDER2+=" --channel-config name=sync,type=sub,method=connect,address=tcp://localhost:8010"
-SENDER2+="                  name=data,type=push,method=connect,address=tcp://localhost:8021,address=tcp://localhost:8022,address=tcp://localhost:8023,address=tcp://localhost:8024"
-SENDER2+=" --sender-index 2"
-SENDER2+=" --subtimeframe-size 1000000"
-SENDER2+=" --num-receivers 4"
-xterm -geometry 80x25+500+700 -hold -e $SENDER2 &
-
-RECEIVER0="fairmq-ex-n-m-receiver"
-RECEIVER0+=" --id Receiver1"
-RECEIVER0+=" --channel-config name=data,type=pull,method=bind,address=tcp://localhost:8021"
-RECEIVER0+=" --num-senders 3"
-xterm -geometry 80x25+1000+0 -hold -e $RECEIVER0 &
-
-RECEIVER1="fairmq-ex-n-m-receiver"
-RECEIVER1+=" --id Receiver2"
-RECEIVER1+=" --channel-config name=data,type=pull,method=bind,address=tcp://localhost:8022"
-RECEIVER1+=" --num-senders 3"
-xterm -geometry 80x25+1000+350 -hold -e $RECEIVER1 &
-
-RECEIVER2="fairmq-ex-n-m-receiver"
-RECEIVER2+=" --id Receiver3"
-RECEIVER2+=" --channel-config name=data,type=pull,method=bind,address=tcp://localhost:8023"
-RECEIVER2+=" --num-senders 3"
-xterm -geometry 80x25+1000+700 -hold -e $RECEIVER2 &
-
-RECEIVER3="fairmq-ex-n-m-receiver"
-RECEIVER3+=" --id Receiver4"
-RECEIVER3+=" --channel-config name=data,type=pull,method=bind,address=tcp://localhost:8024"
-RECEIVER3+=" --num-senders 3"
-xterm -geometry 80x25+1000+1050 -hold -e $RECEIVER3 &
--- a/examples/n-m/runReceiver.cxx
+++ b/examples/n-m/runReceiver.cxx
@@ -1,119 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "Header.h"
-
-#include <FairMQDevice.h>
-#include <runFairMQDevice.h>
-
-#include <string>
-#include <iomanip>
-#include <chrono>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-using namespace std;
-using namespace example_n_m;
-namespace bpo = boost::program_options;
-
-struct TFBuffer
-{
-    FairMQParts parts;
-    chrono::steady_clock::time_point start;
-    chrono::steady_clock::time_point end;
-};
-
-class Receiver : public FairMQDevice
-{
-  public:
-    Receiver()
-        : fBuffer()
-        , fDiscardedSet()
-        , fNumSenders(0)
-        , fBufferTimeoutInMs(5000)
-        , fMaxTimeframes(0)
-        , fTimeframeCounter(0)
-    {
-        OnData("data", &Receiver::HandleData);
-    }
-
-    ~Receiver() = default;
-
-    void InitTask() override
-    {
-        fNumSenders = GetConfig()->GetValue<int>("num-senders");
-        fBufferTimeoutInMs = GetConfig()->GetValue<int>("buffer-timeout");
-        fMaxTimeframes = GetConfig()->GetValue<int>("max-timeframes");
-    }
-
-  protected:
-    bool HandleData(FairMQParts& parts, int /* index */)
-    {
-        Header& h = *(static_cast<Header*>(parts.At(0)->GetData()));
-        // LOG(info) << "Received sub-time frame #" << h.id << " from Sender" << h.senderIndex;
-
-        if (fDiscardedSet.find(h.id) == fDiscardedSet.end()) {
-            if (fBuffer.find(h.id) == fBuffer.end()) {
-                // if this is the first part with this ID, save the receive time.
-                fBuffer[h.id].start = chrono::steady_clock::now();
-            }
-            // if the received ID has not previously been discarded, store the data part in the buffer
-            fBuffer[h.id].parts.AddPart(move(parts.At(1)));
-        } else {
-            // if received ID has been previously discarded.
-            LOG(debug) << "Received part from an already discarded timeframe with id " << h.id;
-        }
-
-        if (fBuffer[h.id].parts.Size() == fNumSenders) {
-            LOG(info) << "Successfully completed timeframe #" << h.id;
-            fBuffer.erase(h.id);
-
-            if (fMaxTimeframes > 0 && ++fTimeframeCounter >= fMaxTimeframes) {
-                LOG(info) << "Reached configured maximum number of timeframes (" << fMaxTimeframes << "). Exiting RUNNING state.";
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    void DiscardIncompleteTimeframes()
-    {
-        auto it = fBuffer.begin();
-        while (it != fBuffer.end()) {
-            if (chrono::duration_cast<chrono::milliseconds>(chrono::steady_clock::now() - (it->second).start).count() > fBufferTimeoutInMs) {
-                LOG(debug) << "Timeframe #" << it->first << " incomplete after " << fBufferTimeoutInMs << " milliseconds, discarding";
-                fDiscardedSet.insert(it->first);
-                fBuffer.erase(it++);
-                LOG(debug) << "Number of discarded timeframes: " << fDiscardedSet.size();
-            } else {
-                // LOG(info) << "Timeframe #" << it->first << " within timeout, buffering...";
-                ++it;
-            }
-        }
-    }
-
-    unordered_map<uint16_t, TFBuffer> fBuffer;
-    unordered_set<uint16_t> fDiscardedSet;
-
-    int fNumSenders;
-    int fBufferTimeoutInMs;
-    int fMaxTimeframes;
-    int fTimeframeCounter;
-};
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("buffer-timeout", bpo::value<int>()->default_value(1000), "Buffer timeout in milliseconds")
-        ("num-senders", bpo::value<int>()->required(), "Number of senders")
-        ("max-timeframes", bpo::value<int>()->default_value(0), "Maximum number of timeframes to receive (0 - unlimited)");
-}
-
-FairMQDevice* getDevice(const FairMQProgOptions& /* config */) { return new Receiver(); }
--- a/examples/n-m/runSender.cxx
+++ b/examples/n-m/runSender.cxx
@@ -1,79 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "Header.h"
-
-#include <FairMQDevice.h>
-#include <runFairMQDevice.h>
-
-#include <string>
-
-using namespace std;
-using namespace example_n_m;
-namespace bpo = boost::program_options;
-
-class Sender : public FairMQDevice
-{
-  public:
-    Sender()
-        : fNumReceivers(0)
-        , fIndex(0)
-        , fSubtimeframeSize(10000)
-    {}
-
-    ~Sender() = default;
-
-  protected:
-    void InitTask() override
-    {
-        fIndex = GetConfig()->GetProperty<int>("sender-index");
-        fSubtimeframeSize = GetConfig()->GetProperty<int>("subtimeframe-size");
-        fNumReceivers = GetConfig()->GetProperty<int>("num-receivers");
-    }
-
-    void Run() override
-    {
-        FairMQChannel& dataInChannel = fChannels.at("sync").at(0);
-
-        while (!NewStatePending()) {
-            Header h;
-            FairMQMessagePtr id(NewMessage());
-            if (dataInChannel.Receive(id) > 0) {
-                h.id = *(static_cast<uint16_t*>(id->GetData()));
-                h.senderIndex = fIndex;
-            } else {
-                continue;
-            }
-
-            FairMQParts parts;
-            parts.AddPart(NewSimpleMessage(h));
-            parts.AddPart(NewMessage(fSubtimeframeSize));
-
-            uint64_t currentDataId = h.id;
-            int direction = currentDataId % fNumReceivers;
-
-            if (Send(parts, "data", direction, 0) < 0) {
-                LOG(debug) << "Failed to queue Subtimeframe #" << currentDataId << " to Receiver[" << direction << "]";
-            }
-        }
-    }
-
-  private:
-    int fNumReceivers;
-    unsigned int fIndex;
-    int fSubtimeframeSize;
-};
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("sender-index", bpo::value<int>()->default_value(0), "Sender Index")
-        ("subtimeframe-size", bpo::value<int>()->default_value(1000), "Subtimeframe size in bytes")
-        ("num-receivers", bpo::value<int>()->required(), "Number of EPNs");
-}
-FairMQDevice* getDevice(const FairMQProgOptions& /* config */) { return new Sender(); }
--- a/examples/n-m/runSynchronizer.cxx
+++ b/examples/n-m/runSynchronizer.cxx
@@ -1,46 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include <FairMQDevice.h>
-#include <runFairMQDevice.h>
-
-#include <string>
-#include <cstdint>
-
-using namespace std;
-namespace bpo = boost::program_options;
-
-class Synchronizer : public FairMQDevice
-{
-  public:
-    Synchronizer()
-        : fTimeframeId(0)
-    {}
-    ~Synchronizer() = default;
-
-  protected:
-    bool ConditionalRun() override
-    {
-        FairMQMessagePtr msg(NewSimpleMessage(fTimeframeId));
-
-        if (Send(msg, "sync") > 0) {
-            if (++fTimeframeId == UINT16_MAX - 1) {
-                fTimeframeId = 0;
-            }
-        } else {
-            return false;
-        }
-
-        return true;
-    }
-
-    uint16_t fTimeframeId;
-};
-
-void addCustomOptions(bpo::options_description& /* options */) {}
-FairMQDevice* getDevice(const FairMQProgOptions& /* config */) { return new Synchronizer(); }
--- a/examples/qc/CMakeLists.txt
+++ b/examples/qc/CMakeLists.txt
@@ -1,71 +0,0 @@
-################################################################################
-#    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-add_executable(fairmq-ex-qc-sampler runSampler.cxx)
-target_link_libraries(fairmq-ex-qc-sampler PRIVATE FairMQ)
-
-add_executable(fairmq-ex-qc-dispatcher runQCDispatcher.cxx)
-target_link_libraries(fairmq-ex-qc-dispatcher PRIVATE FairMQ)
-
-add_executable(fairmq-ex-qc-task runQCTask.cxx)
-target_link_libraries(fairmq-ex-qc-task PRIVATE FairMQ)
-
-add_executable(fairmq-ex-qc-sink runSink.cxx)
-target_link_libraries(fairmq-ex-qc-sink PRIVATE FairMQ)
-
-add_custom_target(ExampleQC DEPENDS fairmq-ex-qc-sampler fairmq-ex-qc-dispatcher fairmq-ex-qc-task fairmq-ex-qc-sink)
-
-list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR)
-set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
-set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-qc-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-qc-topology.xml @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-qc-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-qc-env.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-qc.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-qc.sh @ONLY)
-
-# test
-if(DDS_FOUND)
-  add_test(NAME Example.QC.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-qc.sh localhost)
-  set_tests_properties(Example.QC.localhost PROPERTIES TIMEOUT 15 RUN_SERIAL true PASS_REGULAR_EXPRESSION "Example successful")
-endif()
-
-# install
-install(
-  TARGETS
-  fairmq-ex-qc-sampler
-  fairmq-ex-qc-dispatcher
-  fairmq-ex-qc-task
-  fairmq-ex-qc-sink
-
-  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
-)
-
-# configure run script with different executable paths for build and for install directories
-set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-qc-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-qc-topology.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-qc-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-qc-env.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-qc.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-qc.sh_install @ONLY)
-
-install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-qc-topology.xml_install
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-qc-topology.xml
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-qc-env.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-ex-qc-env.sh
-)
-
-install(
-  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-qc.sh_install
-  DESTINATION ${PROJECT_INSTALL_BINDIR}
-  RENAME fairmq-start-ex-qc.sh
-)
--- a/examples/qc/README.md
+++ b/examples/qc/README.md
@@ -1,4 +0,0 @@
-QC
-==
-
-A topology consisting of 4 devices - Sampler, QCDispatcher, QCTask and Sink. The data flows from Sampler through QCDispatcher to Sink. On demand - by setting the corresponding configuration property - the QCDispatcher device will duplicate the data to the QCTask device. The property is set by the topology controller, in this example this is the `fairmq-dds-command-ui` utility.
--- a/examples/qc/ex-qc-topology.xml
+++ b/examples/qc/ex-qc-topology.xml
@@ -1,48 +0,0 @@
-<topology name="ExampleQC">
-
-    <property name="fmqchan_data1" />
-    <property name="fmqchan_data2" />
-    <property name="fmqchan_qc" />
-
-    <decltask name="Sampler">
-        <exe>fairmq-ex-qc-sampler --color false --channel-config name=data1,type=push,method=bind -P dds --max-iterations 1000</exe>
-        <env reachable="false">fairmq-ex-qc-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_data1</name>
-        </properties>
-    </decltask>
-
-    <decltask name="QCDispatcher">
-        <exe>fairmq-ex-qc-dispatcher --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect name=qc,type=push,method=connect -P dds</exe>
-        <env reachable="false">fairmq-ex-qc-env.sh</env>
-        <properties>
-            <name access="read">fmqchan_data1</name>
-            <name access="read">fmqchan_data2</name>
-            <name access="read">fmqchan_qc</name>
-        </properties>
-    </decltask>
-
-    <decltask name="QCTask">
-        <exe>fairmq-ex-qc-task --color false --channel-config name=qc,type=pull,method=bind -P dds</exe>
-        <env reachable="false">fairmq-ex-qc-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_qc</name>
-        </properties>
-    </decltask>
-
-    <decltask name="Sink">
-        <exe>fairmq-ex-qc-sink --color false --channel-config name=data2,type=pull,method=bind -P dds --max-iterations 1000</exe>
-        <env reachable="false">fairmq-ex-qc-env.sh</env>
-        <properties>
-            <name access="write">fmqchan_data2</name>
-        </properties>
-    </decltask>
-
-    <main name="main">
-        <task>Sampler</task>
-        <task>QCDispatcher</task>
-        <task>QCTask</task>
-        <task>Sink</task>
-    </main>
-
-</topology>
--- a/examples/qc/fairmq-ex-qc-env.sh
+++ b/examples/qc/fairmq-ex-qc-env.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-export PATH=@BIN_DIR@:$PATH
-
-OS=$(uname -s 2>&1)
-if [ "$OS" == "Darwin" ]; then
-   export DYLD_LIBRARY_PATH=@LIB_DIR@:$DYLD_LIBRARY_PATH
-fi
--- a/examples/qc/fairmq-start-ex-qc.sh.in
+++ b/examples/qc/fairmq-start-ex-qc.sh.in
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-# fairmq-start-ex-qc.sh -> submit agents with localhost plugin
-
-set -e
-
-cleanup() {
-  dds-session stop $1
-  echo "CLEANUP PERFORMED"
-}
-
-source @DDS_INSTALL_PREFIX@/DDS_env.sh
-export PATH=@BIN_DIR@:$PATH
-
-exec 5>&1
-output=$(dds-session start | tee >(cat - >&5))
-export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
-echo "SESSION ID: ${DDS_SESSION_ID}"
-
-trap "cleanup ${DDS_SESSION_ID}" EXIT
-
-requiredNofSlots=4
-dds-submit -r localhost --slots ${requiredNofSlots}
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-
-export FAIRMQ_DDS_TOPO_FILE=@DATA_DIR@/ex-qc-topology.xml
-echo "TOPOLOGY FILE: ${FAIRMQ_DDS_TOPO_FILE}"
-echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${FAIRMQ_DDS_TOPO_FILE})"
-
-dds-info --active-topology
-dds-topology --activate ${FAIRMQ_DDS_TOPO_FILE}
-dds-info --active-topology
-echo "...waiting for ${requiredNofSlots} executing slots..."
-dds-info --executing-count --wait ${requiredNofSlots}
-
-echo "------------------------"
-echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
-fairmq-dds-command-ui -w "IDLE"
-fairmq-dds-command-ui -c i
-fairmq-dds-command-ui -c k
-fairmq-dds-command-ui -c b
-fairmq-dds-command-ui -c x
-fairmq-dds-command-ui -c j
-allexceptqctasks="main/(Sampler|QCDispatcher|Sink)"
-fairmq-dds-command-ui -c r -p $allexceptqctasks
-qctask="main/QCTask.*"
-qcdispatcher="main/QCDispatcher.*"
-fairmq-dds-command-ui -c p --property-key qc --property-value active -p $qcdispatcher
-fairmq-dds-command-ui -c r -p $qctask
-fairmq-dds-command-ui -w "RUNNING->READY" -p $qctask
-echo "...$qctask received data and transitioned to READY, sending shutdown..."
-fairmq-dds-command-ui -c s
-fairmq-dds-command-ui -c t
-fairmq-dds-command-ui -c d
-fairmq-dds-command-ui -c q
-echo "...waiting for ${requiredNofSlots} idle slots..."
-dds-info --idle-count --wait ${requiredNofSlots}
-echo "------------------------"
-
-dds-info --active-topology
-dds-topology --stop
-dds-info --active-topology
-
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
-
-# This string is used by ctest to detect success
-echo "Example successful :)"
-
-# Cleanup function is called by EXIT trap
--- a/examples/qc/runQCDispatcher.cxx
+++ b/examples/qc/runQCDispatcher.cxx
@@ -1,59 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "runFairMQDevice.h"
-#include "FairMQDevice.h"
-
-class QCDispatcher : public FairMQDevice
-{
-  public:
-    QCDispatcher()
-        : fDoQC(false)
-    {
-        OnData("data1", &QCDispatcher::HandleData);
-    }
-
-    void InitTask() override
-    {
-        GetConfig()->Subscribe<std::string>("qcdevice", [&](const std::string& key, std::string value) {
-            if (key == "qc") {
-                if (value == "active") {
-                    fDoQC.store(true);
-                } else if (value == "inactive") {
-                    fDoQC.store(false);
-                }
-            }
-        });
-    }
-
-  protected:
-    bool HandleData(FairMQMessagePtr& msg, int)
-    {
-        if (fDoQC.load() == true) {
-            FairMQMessagePtr msgCopy(NewMessage());
-            msgCopy->Copy(*msg);
-            if (Send(msg, "qc") < 0) {
-                return false;
-            }
-        }
-
-        if (Send(msg, "data2") < 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    void ResetTask() override { GetConfig()->Unsubscribe<std::string>("qcdevice"); }
-
-  private:
-    std::atomic<bool> fDoQC;
-};
-
-void addCustomOptions(boost::program_options::options_description& /*options*/) {}
-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/) { return new QCDispatcher(); }
--- a/examples/qc/runQCTask.cxx
+++ b/examples/qc/runQCTask.cxx
@@ -1,26 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "runFairMQDevice.h"
-#include "FairMQDevice.h"
-
-class QCTask : public FairMQDevice
-{
-  public:
-    QCTask()
-    {
-        OnData("qc", [](FairMQMessagePtr& /*msg*/, int) {
-            LOG(info) << "received data";
-            return false;
-        });
-    }
-};
-
-namespace bpo = boost::program_options;
-void addCustomOptions(bpo::options_description& /*options*/) {}
-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/) { return new QCTask(); }
--- a/examples/readout/Builder.h
+++ b/examples/readout/Builder.h
@@ -5,42 +5,36 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
+
 #ifndef FAIRMQEXAMPLEREGIONBUILDER_H
 #define FAIRMQEXAMPLEREGIONBUILDER_H

+#include <atomic>
+
 #include "FairMQDevice.h"

-#include <string>
-
-namespace example_readout
+namespace example_region
 {

 class Builder : public FairMQDevice
 {
  public:
-    Builder()
-        : fOutputChannelName()
-    {}
-
-    void Init() override
-    {
-        fOutputChannelName = fConfig->GetProperty<std::string>("output-name");
-        OnData("rb", &Builder::HandleData);
+    Builder() {
+        OnData("data1", &Builder::HandleData);
    }
+    virtual ~Builder() {}

+  protected:
    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
    {
-        if (Send(msg, fOutputChannelName) < 0) {
+        if (Send(msg, "data2") < 0) {
            return false;
        }

        return true;
    }
-
-  private:
-    std::string fOutputChannelName;
 };

-} // namespace example_readout
+} // namespace example_region

 #endif /* FAIRMQEXAMPLEREGIONBUILDER_H */
--- a/examples/readout/CMakeLists.txt
+++ b/examples/readout/CMakeLists.txt
@@ -6,35 +6,38 @@
 #                  copied verbatim in the file "LICENSE"                       #
 ################################################################################

-add_executable(fairmq-ex-readout-readout runReadout.cxx)
-target_link_libraries(fairmq-ex-readout-readout PRIVATE FairMQ)
+add_library(ExampleReadoutLib STATIC
+    "Sampler.cxx"
+    "Sampler.h"
+    "Builder.h"
+    "Sink.cxx"
+    "Sink.h"
+)
+
+target_link_libraries(ExampleReadoutLib PUBLIC FairMQ)
+
+add_executable(fairmq-ex-readout-sampler runSampler.cxx)
+target_link_libraries(fairmq-ex-readout-sampler PRIVATE ExampleReadoutLib)

 add_executable(fairmq-ex-readout-builder runBuilder.cxx)
-target_link_libraries(fairmq-ex-readout-builder PRIVATE FairMQ)
+target_link_libraries(fairmq-ex-readout-builder PRIVATE ExampleReadoutLib)

-add_executable(fairmq-ex-readout-processor runProcessor.cxx)
-target_link_libraries(fairmq-ex-readout-processor PRIVATE FairMQ)
+add_executable(fairmq-ex-readout-sink runSink.cxx)
+target_link_libraries(fairmq-ex-readout-sink PRIVATE ExampleReadoutLib)

-add_executable(fairmq-ex-readout-sender runSender.cxx)
-target_link_libraries(fairmq-ex-readout-sender PRIVATE FairMQ)
-
-add_executable(fairmq-ex-readout-receiver runReceiver.cxx)
-target_link_libraries(fairmq-ex-readout-receiver PRIVATE FairMQ)
+add_custom_target(ExampleReadout DEPENDS fairmq-ex-readout-sampler fairmq-ex-readout-builder fairmq-ex-readout-sink)

 set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh)

 # install

 install(
    TARGETS
-    fairmq-ex-readout-readout
+    fairmq-ex-readout-sampler
    fairmq-ex-readout-builder
-    fairmq-ex-readout-processor
-    fairmq-ex-readout-sender
-    fairmq-ex-readout-receiver
+    fairmq-ex-readout-sink

    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
@@ -44,16 +47,9 @@ install(
 set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
 set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install)

 install(
    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install
    DESTINATION ${PROJECT_INSTALL_BINDIR}
    RENAME fairmq-start-ex-readout.sh
 )
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-start-ex-readout-processing.sh
-)
--- a/examples/readout/Processor.h
+++ b/examples/readout/Processor.h
@@ -1,37 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONPROCESSOR_H
-#define FAIRMQEXAMPLEREGIONPROCESSOR_H
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Processor : public FairMQDevice
-{
-  public:
-    Processor() {
-        OnData("bp", &Processor::HandleData);
-    }
-
-  protected:
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        FairMQMessagePtr msg2(NewMessageFor("ps", 0, msg->GetSize()));
-        if (Send(msg2, "ps") < 0) {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONPROCESSOR_H */
--- a/examples/readout/README.md
+++ b/examples/readout/README.md
@@ -1,27 +0,0 @@
-# Readout example
-
-This examples shows two possible topologies (out of many) for a node connected to a detector readout (followed by a processing node).
-
-## Setup without new data generation
-
-```
-|------------------------------- Readout Node ---------------------------|     |- Processing Node -|
-| Readout            -->            Builder          -->          Sender | --> |     Receiver      |
-| [# shared memory segment (unused in this topology) ##################] | ofi |                   |
-| [# shmem unmanaged region (readout writes here, others read) ########] |     |                   |
-|------------------------------------------------------------------------|     |-------------------|
-```
-
-The devices one the Readout Node communicate via shared memory transport. Readout device writes into shared memory unmanaged region. The data is then forwarded through Builder to Sender process, which sends it out via OFI transport.
-
-## Setup with generating new data on the Readout node
-
-```
-|------------------------------- Readout Node ---------------------------|     |- Processing Node -|
-| Readout     -->     Builder      -->      Processor     -->     Sender | --> |     Receiver      |
-| [# shared memory segment (used between Proccessor and Sender) #######] | ofi |                   |
-| [# shmem unmanaged region (readout writes here, builder & proc read) ] |     |                   |
-|------------------------------------------------------------------------|     |-------------------|
-```
-
-In this topology one more device is added - Processor. It examines the arriving data and creates new data in shared memory. This data is not part of the unmanaged region, but lives in the general shared memory segment (unused in the previous setup). This new data is then forwarded to Sender and the Readout device is notified that the corresponding data piece in the unmanaged region is no longer used.
--- a/examples/readout/Readout.h
+++ b/examples/readout/Readout.h
@@ -1,91 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREADOUTREADOUT_H
-#define FAIRMQEXAMPLEREADOUTREADOUT_H
-
-#include <atomic>
-#include <thread>
-#include <chrono>
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Readout : public FairMQDevice
-{
-  public:
-    Readout()
-        : fMsgSize(10000)
-        , fMaxIterations(0)
-        , fNumIterations(0)
-        , fRegion(nullptr)
-        , fNumUnackedMsgs(0)
-    {}
-
-  protected:
-    void InitTask() override
-    {
-        fMsgSize = fConfig->GetProperty<int>("msg-size");
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-
-        fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegionFor("rb",
-                                                                0,
-                                                                10000000,
-                                                                [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport
-                                                                    --fNumUnackedMsgs;
-                                                                    if (fMaxIterations > 0) {
-                                                                        LOG(debug) << "Received ack";
-                                                                    }
-                                                                }
-                                                                ));
-    }
-
-    bool ConditionalRun() override
-    {
-        FairMQMessagePtr msg(NewMessageFor("rb", // channel
-                                            0, // sub-channel
-                                            fRegion, // region
-                                            fRegion->GetData(), // ptr within region
-                                            fMsgSize, // offset from ptr
-                                            nullptr // hint
-                                            ));
-
-        if (Send(msg, "rb", 0) > 0) {
-            ++fNumUnackedMsgs;
-
-            if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-                LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-                return false;
-            }
-        }
-
-        return true;
-    }
-    void ResetTask() override
-    {
-        // if not all messages acknowledged, wait for a bit. But only once, since receiver could be already dead.
-        if (fNumUnackedMsgs != 0) {
-            LOG(debug) << "waiting for all acknowledgements... (" << fNumUnackedMsgs << ")";
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-            LOG(debug) << "done, still unacked: " << fNumUnackedMsgs;
-        }
-        fRegion.reset();
-    }
-
-  private:
-    int fMsgSize;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
-    FairMQUnmanagedRegionPtr fRegion;
-    std::atomic<uint64_t> fNumUnackedMsgs;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREADOUTREADOUT_H */
--- a/examples/readout/Receiver.h
+++ b/examples/readout/Receiver.h
@@ -1,54 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONRECEIVER_H
-#define FAIRMQEXAMPLEREGIONRECEIVER_H
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Receiver : public FairMQDevice
-{
-  public:
-    Receiver()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
-
-  protected:
-    void InitTask() override
-    {
-        // Get the fMaxIterations value from the command line options (via fConfig)
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    void Run() override
-    {
-        FairMQChannel& dataInChannel = fChannels.at("sr").at(0);
-
-        while (!NewStatePending()) {
-            FairMQMessagePtr msg(dataInChannel.Transport()->CreateMessage());
-            dataInChannel.Receive(msg);
-            // void* ptr = msg->GetData();
-
-            if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-                LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-                break;
-            }
-        }
-    }
-
-  private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONRECEIVER_H */
--- a/examples/readout/Sampler.cxx
+++ b/examples/readout/Sampler.cxx
@@ -0,0 +1,86 @@
+/********************************************************************************
+ *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ *                                                                              *
+ *              This software is distributed under the terms of the             *
+ *              GNU Lesser General Public Licence (LGPL) version 3,             *
+ *                  copied verbatim in the file "LICENSE"                       *
+ ********************************************************************************/
+/**
+ * Sampler.cpp
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sampler.h"
+
+#include <thread>
+
+using namespace std;
+
+namespace example_region
+{
+
+Sampler::Sampler()
+    : fMsgSize(10000)
+    , fMaxIterations(0)
+    , fNumIterations(0)
+    , fRegion(nullptr)
+    , fNumUnackedMsgs(0)
+{
+}
+
+void Sampler::InitTask()
+{
+    fMsgSize = fConfig->GetValue<int>("msg-size");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
+
+    fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegion(10000000,
+                                                          [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport
+                                                              --fNumUnackedMsgs;
+                                                              if (fMaxIterations > 0)
+                                                              {
+                                                                  LOG(debug) << "Received ack";
+                                                              }
+                                                          }));
+}
+
+bool Sampler::ConditionalRun()
+{
+    FairMQMessagePtr msg(NewMessage(fRegion, // region
+                                    fRegion->GetData(), // ptr within region
+                                    fMsgSize, // offset from ptr
+                                    nullptr // hint
+                                    ));
+
+    if (Send(msg, "data1", 0) > 0)
+    {
+        ++fNumUnackedMsgs;
+
+        if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+        {
+            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void Sampler::ResetTask()
+{
+    // if not all messages acknowledged, wait for a bit. But only once, since receiver could be already dead.
+    if (fNumUnackedMsgs != 0)
+    {
+        LOG(debug) << "waiting for all acknowledgements... (" << fNumUnackedMsgs << ")";
+        this_thread::sleep_for(chrono::milliseconds(500));
+        LOG(debug) << "done, still unacked: " << fNumUnackedMsgs;
+    }
+    fRegion.reset();
+}
+
+Sampler::~Sampler()
+{
+}
+
+} // namespace example_region
--- a/examples/readout/Sampler.h
+++ b/examples/readout/Sampler.h
@@ -5,32 +5,42 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
+/**
+ * Sampler.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLEREGIONSAMPLER_H
+#define FAIRMQEXAMPLEREGIONSAMPLER_H
+
+#include <atomic>

-#include "runFairMQDevice.h"
 #include "FairMQDevice.h"

-#include <thread> // this_thread::sleep_for
-#include <chrono>
+namespace example_region
+{

 class Sampler : public FairMQDevice
 {
  public:
-    Sampler() {}
+    Sampler();
+    virtual ~Sampler();

  protected:
-    virtual bool ConditionalRun()
-    {
-        FairMQMessagePtr msg(NewMessage(1000));
+    virtual void InitTask();
+    virtual bool ConditionalRun();
+    virtual void ResetTask();

-        if (Send(msg, "data1") < 0) {
-            return false;
-        }
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        return true;
-    }
+  private:
+    int fMsgSize;
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+    FairMQUnmanagedRegionPtr fRegion;
+    std::atomic<uint64_t> fNumUnackedMsgs;
 };

-namespace bpo = boost::program_options;
-void addCustomOptions(bpo::options_description&) {}
-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/) { return new Sampler(); }
+} // namespace example_region
+
+#endif /* FAIRMQEXAMPLEREGIONSAMPLER_H */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexey Rybalchenko	92632a022c	Support region callbacks when no channel is specified	2019-03-08 11:06:30 +01:00
Alexey Rybalchenko	bd5105d609	Remove hint parameter from builder	2019-03-06 16:35:02 +01:00
Alexey Rybalchenko	080dd0a9df	Remove wrong readme file	2019-03-06 16:35:02 +01:00
Alexey Rybalchenko	a9dfe39bf7	Add a hack to set the expected msg size via cmd option	2019-03-06 16:35:02 +01:00
Alexey Rybalchenko	e1b1e5e21b	Temporary remove the OFI control band	2019-03-06 16:35:02 +01:00
Alexey Rybalchenko	763c21ffdd	Remove azmq on send, make connect/bind blocking	2019-03-06 16:35:02 +01:00