Support region callbacks when no channel is specified

Remove hint parameter from builder
Remove wrong readme file
2025-10-15 17:41: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
75 changed files with 1151 additions and 2208 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,13 @@
 ################################################################################

 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-cmake_policy(VERSION 3.10...3.14)
+

 # 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)
@@ -60,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)
@@ -73,33 +77,9 @@ if(BUILD_NANOMSG_TRANSPORT)
  )
 endif()

-if(BUILD_DDS_PLUGIN)
-  find_package2(PRIVATE DDS REQUIRED
-    VERSION 2.4
-  )
-  set(DDS_Boost_COMPONENTS system log log_setup)
-  set(DDS_Boost_VERSION 1.67)
-endif()
-
-if(BUILD_PMIX_PLUGIN)
-  find_package2(PRIVATE PMIx REQUIRED
-    VERSION 2.1.4
-  )
-endif()
-
 if(BUILD_FAIRMQ)
-  find_package2(PUBLIC FairLogger REQUIRED
-    VERSION 1.2.0
-  )
-
-  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()
  find_package2(PUBLIC Boost REQUIRED
-    VERSION 1.64
+    VERSION 1.64 ${asiofi_Boost_VERSION}

    COMPONENTS
    container
@@ -107,17 +87,24 @@ if(BUILD_FAIRMQ)
    filesystem
    date_time
    regex
-
-    ADD_REQUIREMENTS_OF
-    asiofi
-    DDS
-    FairLogger
+    ${asiofi_Boost_COMPONENTS}
+  )
+  find_package2(PUBLIC FairLogger REQUIRED
+    VERSION 1.2.0
  )
  find_package2(PRIVATE ZeroMQ REQUIRED
    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 REQUIRED
    VERSION 1.7.0
@@ -202,6 +189,16 @@ if(BUILD_FAIRMQ)
    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
@@ -244,11 +241,7 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
  foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
    if(${dep}_VERSION)
      if(${dep} STREQUAL Boost)
-        if(Boost_VERSION_MAJOR)
-          set(version_str "${BGreen}${${dep}_VERSION_MAJOR}.${${dep}_VERSION_MINOR}${CR}")
-        else()
-          set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
-        endif()
+        set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
      else()
        set(version_str "${BGreen}${${dep}_VERSION}${CR}")
      endif()
@@ -265,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)
@@ -282,16 +271,6 @@ 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)
-      get_target_property(dds_include DDS::dds_intercom_lib INTERFACE_INCLUDE_DIRECTORIES)
-      get_filename_component(prefix ${dds_include}/.. ABSOLUTE)
-    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)
@@ -356,26 +335,4 @@ else()
 endif()
 message(STATUS "  ${BWhite}docs${CR}               ${docs_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}RUN STATIC ANALYSIS  ${static_ana_summary}")
-message(STATUS "  ")
 ################################################################################
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ a simulation, reconstruction and analysis framework.
  * 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/)
+[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.

@@ -51,7 +51,7 @@ cmake -DCMAKE_INSTALL_PREFIX=./fairmq_install ../fairmq
 cmake --build . --target install
 ```

-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` 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

@@ -126,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

@@ -159,10 +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)
-
--- a/cmake/FairMQConfig.cmake.in
+++ b/cmake/FairMQConfig.cmake.in
@@ -24,9 +24,6 @@ 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})
--- 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])
 #
@@ -166,34 +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}" "-color")
-    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()
 endmacro()

 function(join VALUES GLUE OUTPUT)
@@ -288,8 +280,6 @@ macro(install_cmake_package)
  )
  generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
  generate_package_components() # fills ${PACKAGE_COMPONENTS}
-  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
@@ -303,74 +293,30 @@ 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) 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.
-#
-# 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()
+  set(CMAKE_PREFIX_PATH ${old_CPP})
+  unset(old_CPP)

  if(${pkgname}_FOUND)
    if(${qualifier} STREQUAL PRIVATE)
@@ -392,8 +338,4 @@ macro(find_package2 qualifier pkgname)
  endif()

  unset(__version__)
-  unset(__components__)
-  unset(__required_versions__)
-  set(CMAKE_PREFIX_PATH ${__old_cpp__})
-  unset(__old_cpp__)
 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/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.

--- 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/images/device_states.png
+++ b/docs/images/device_states.png
--- a/docs/images/device_states.svg
+++ b/docs/images/device_states.svg
--- 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/ex-dds-topology.xml
+++ b/examples/dds/ex-dds-topology.xml
@@ -1,47 +1,47 @@
-<topology name="ExampleDDS">
+<topology id="ExampleDDS">

-    <property name="data1" />
-    <property name="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">
+    <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">data1</name>
+            <id access="write">data1</id>
        </properties>
    </decltask>

-    <decltask name="Processor">
+    <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">data1</name>
-            <name access="read">data2</name>
+            <id access="read">data1</id>
+            <id access="read">data2</id>
        </properties>
    </decltask>

-    <decltask name="Sink">
+    <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">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/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 5 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 5 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 5 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 5 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
@@ -53,13 +53,6 @@ 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);
-
    LOG(info) << "Sending body of size: " << parts.At(1)->GetSize();

    Send(parts, "data");
@@ -81,4 +74,4 @@ Sampler::~Sampler()
 {
 }

-} // namespace example_multipart
+} // namespace example_multipart
--- 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"
+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/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->GetValue<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/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->GetValue<int>("msg-size");
-        fMaxIterations = fConfig->GetValue<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->GetValue<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,42 +5,42 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONSENDER_H
-#define FAIRMQEXAMPLEREGIONSENDER_H
+/**
+ * Sampler.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLEREGIONSAMPLER_H
+#define FAIRMQEXAMPLEREGIONSAMPLER_H
+
+#include <atomic>

 #include "FairMQDevice.h"

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

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

-    void Init() override
-    {
-        fInputChannelName = fConfig->GetValue<std::string>("input-name");
-        OnData(fInputChannelName, &Sender::HandleData);
-    }
-
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        if (Send(msg, "sr") < 0) {
-            return false;
-        }
-
-        return true;
-    }
+  protected:
+    virtual void InitTask();
+    virtual bool ConditionalRun();
+    virtual void ResetTask();

  private:
-    std::string fInputChannelName;
+    int fMsgSize;
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+    FairMQUnmanagedRegionPtr fRegion;
+    std::atomic<uint64_t> fNumUnackedMsgs;
 };

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

-#endif /* FAIRMQEXAMPLEREGIONSENDER_H */
+#endif /* FAIRMQEXAMPLEREGIONSAMPLER_H */
--- a/examples/readout/Sink.cxx
+++ b/examples/readout/Sink.cxx
@@ -0,0 +1,56 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.cxx
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sink.h"
+
+using namespace std;
+
+namespace example_region
+{
+
+Sink::Sink()
+    : fMaxIterations(0)
+    , fNumIterations(0)
+{
+}
+
+void Sink::InitTask()
+{
+    // Get the fMaxIterations value from the command line options (via fConfig)
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
+}
+
+void Sink::Run()
+{
+    FairMQChannel& dataInChannel = fChannels.at("data").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;
+        }
+    }
+}
+
+Sink::~Sink()
+{
+}
+
+} // namespace example_region
--- a/examples/readout/Processor.h
+++ b/examples/readout/Processor.h
@@ -5,33 +5,38 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONPROCESSOR_H
-#define FAIRMQEXAMPLEREGIONPROCESSOR_H
+/**
+ * Sink.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLEREGIONSINK_H
+#define FAIRMQEXAMPLEREGIONSINK_H
+
+#include <string>

 #include "FairMQDevice.h"

-namespace example_readout
+namespace example_region
 {

-class Processor : public FairMQDevice
+class Sink : public FairMQDevice
 {
  public:
-    Processor() {
-        OnData("bp", &Processor::HandleData);
-    }
+    Sink();
+    virtual ~Sink();

  protected:
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        FairMQMessagePtr msg2(NewMessageFor("ps", 0, msg->GetSize()));
-        if (Send(msg2, "ps") < 0) {
-            return false;
-        }
+    virtual void Run();
+    virtual void InitTask();

-        return true;
-    }
+  private:
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
 };

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

-#endif /* FAIRMQEXAMPLEREGIONPROCESSOR_H */
+#endif /* FAIRMQEXAMPLEREGIONSINK_H */
--- a/examples/readout/fairmq-start-ex-readout-processing.sh.in
+++ b/examples/readout/fairmq-start-ex-readout-processing.sh.in
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-msgSize="1000000"
-
-if [[ $1 =~ ^[0-9]+$ ]]; then
-    msgSize=$1
-fi
-
-READOUT="fairmq-ex-readout-readout"
-READOUT+=" --id readout1"
-READOUT+=" --msg-size $msgSize"
-READOUT+=" --channel-config name=rb,type=pair,method=bind,address=tcp://localhost:7777,transport=shmem"
-xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$READOUT &
-
-BUILDER="fairmq-ex-readout-builder"
-BUILDER+=" --id builder1"
-BUILDER+=" --output-name bp"
-BUILDER+=" --channel-config name=rb,type=pair,method=connect,address=tcp://localhost:7777,transport=shmem"
-BUILDER+="                  name=bp,type=pair,method=connect,address=tcp://localhost:7778,transport=shmem"
-xterm -geometry 80x23+500+0 -hold -e @EX_BIN_DIR@/$BUILDER &
-
-PROCESSOR="fairmq-ex-readout-processor"
-PROCESSOR+=" --id processor1"
-PROCESSOR+=" --channel-config name=bp,type=pair,method=bind,address=tcp://localhost:7778,transport=shmem"
-PROCESSOR+="                  name=ps,type=pair,method=connect,address=tcp://localhost:7779,transport=shmem"
-xterm -geometry 80x23+750+500 -hold -e @EX_BIN_DIR@/$PROCESSOR &
-
-SENDER="fairmq-ex-readout-sender"
-SENDER+=" --id sender1"
-SENDER+=" --input-name ps"
-SENDER+=" --channel-config name=ps,type=pair,method=bind,address=tcp://localhost:7779,transport=shmem"
-SENDER+="                  name=sr,type=pair,method=connect,address=tcp://localhost:7780,transport=ofi"
-xterm -geometry 80x23+1000+0 -hold -e @EX_BIN_DIR@/$SENDER &
-
-RECEIVER="fairmq-ex-readout-receiver"
-RECEIVER+=" --id receiver1"
-RECEIVER+=" --channel-config name=sr,type=pair,method=bind,address=tcp://localhost:7780,transport=ofi"
-xterm -geometry 80x23+1500+0 -hold -e @EX_BIN_DIR@/$RECEIVER &
--- a/examples/readout/fairmq-start-ex-readout.sh.in
+++ b/examples/readout/fairmq-start-ex-readout.sh.in
@@ -2,33 +2,31 @@

 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

-msgSize="1000000"
+msgSize="2000000"

 if [[ $1 =~ ^[0-9]+$ ]]; then
    msgSize=$1
 fi

-READOUT="fairmq-ex-readout-readout"
-READOUT+=" --id readout1"
-READOUT+=" --msg-size $msgSize"
-READOUT+=" --channel-config name=rb,type=pair,method=bind,address=tcp://localhost:7777,transport=shmem"
-xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$READOUT &
+SAMPLER="fairmq-ex-readout-sampler"
+SAMPLER+=" --id sampler1"
+SAMPLER+=" --severity debug"
+SAMPLER+=" --transport shmem"
+SAMPLER+=" --msg-size $msgSize"
+# SAMPLER+=" --rate 10"
+SAMPLER+=" --channel-config name=data1,type=pair,method=bind,address=tcp://127.0.0.1:7777,transport=shmem"
+xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$SAMPLER &

 BUILDER="fairmq-ex-readout-builder"
 BUILDER+=" --id builder1"
-BUILDER+=" --output-name bs"
-BUILDER+=" --channel-config name=rb,type=pair,method=connect,address=tcp://localhost:7777,transport=shmem"
-BUILDER+="                  name=bs,type=pair,method=connect,address=tcp://localhost:7778,transport=shmem"
+BUILDER+=" --severity debug"
+BUILDER+=" --channel-config name=data1,type=pair,method=connect,address=tcp://127.0.0.1:7777,transport=shmem"
+BUILDER+="                  name=data2,type=pair,method=connect,address=tcp://127.0.0.1:7778,transport=ofi"
 xterm -geometry 80x23+500+0 -hold -e @EX_BIN_DIR@/$BUILDER &

-SENDER="fairmq-ex-readout-sender"
-SENDER+=" --id sender1"
-SENDER+=" --input-name bs"
-SENDER+=" --channel-config name=bs,type=pair,method=bind,address=tcp://localhost:7778,transport=shmem"
-SENDER+="                  name=sr,type=pair,method=connect,address=tcp://localhost:7779,transport=ofi"
-xterm -geometry 80x23+1000+0 -hold -e @EX_BIN_DIR@/$SENDER &
-
-RECEIVER="fairmq-ex-readout-receiver"
-RECEIVER+=" --id receiver1"
-RECEIVER+=" --channel-config name=sr,type=pair,method=bind,address=tcp://localhost:7779,transport=ofi"
-xterm -geometry 80x23+1500+0 -hold -e @EX_BIN_DIR@/$RECEIVER &
+SINK="fairmq-ex-readout-sink"
+SINK+=" --id sink1"
+SINK+=" --severity debug"
+SINK+=" --ofi-size-hint $msgSize"
+SINK+=" --channel-config name=data,type=pair,method=bind,address=tcp://127.0.0.1:7778,transport=ofi"
+xterm -geometry 80x23+1000+0 -hold -e @EX_BIN_DIR@/$SINK &
--- a/examples/readout/runBuilder.cxx
+++ b/examples/readout/runBuilder.cxx
@@ -11,13 +11,10 @@

 namespace bpo = boost::program_options;

-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("output-name", bpo::value<std::string>()->default_value("bs"), "Output channel name");
-}
+void addCustomOptions(bpo::options_description& /* options */)
+{}

 FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
-    return new example_readout::Builder();
+    return new example_region::Builder();
 }
--- a/examples/readout/runProcessor.cxx
+++ b/examples/readout/runProcessor.cxx
@@ -1,20 +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 "Processor.h"
-
-namespace bpo = boost::program_options;
-
-void addCustomOptions(bpo::options_description& /* options */)
-{}
-
-FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
-{
-    return new example_readout::Processor();
-}
--- a/examples/readout/runSampler.cxx
+++ b/examples/readout/runSampler.cxx
@@ -7,7 +7,7 @@
 ********************************************************************************/

 #include "runFairMQDevice.h"
-#include "Readout.h"
+#include "Sampler.h"

 namespace bpo = boost::program_options;

@@ -20,5 +20,5 @@ void addCustomOptions(bpo::options_description& options)

 FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
-    return new example_readout::Readout();
+    return new example_region::Sampler();
 }
--- a/examples/readout/runSender.cxx
+++ b/examples/readout/runSender.cxx
@@ -1,23 +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 "Sender.h"
-
-namespace bpo = boost::program_options;
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("input-name", bpo::value<std::string>()->default_value("bs"), "Input channel name");
-}
-
-FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
-{
-    return new example_readout::Sender();
-}
--- a/examples/readout/runReceiver.cxx
+++ b/examples/readout/runReceiver.cxx
@@ -7,7 +7,7 @@
 ********************************************************************************/

 #include "runFairMQDevice.h"
-#include "Receiver.h"
+#include "Sink.h"

 namespace bpo = boost::program_options;

@@ -19,5 +19,5 @@ void addCustomOptions(bpo::options_description& options)

 FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
-    return new example_readout::Receiver();
+    return new example_region::Sink();
 }
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -224,6 +224,7 @@ if(BUILD_OFI_TRANSPORT)
  set(OFI_DEPS
    asiofi::asiofi
    Boost::container
+    AZMQ::AZMQ
  )
 endif()
 set(optional_deps ${NANOMSG_DEPS} ${OFI_DEPS})
--- a/fairmq/FairMQChannel.h
+++ b/fairmq/FairMQChannel.h
@@ -345,11 +345,6 @@ class FairMQChannel
        return Transport()->NewStaticMessage(data);
    }

-    FairMQUnmanagedRegionPtr NewUnmanagedRegion(const size_t size, FairMQRegionCallback callback = nullptr)
-    {
-        return Transport()->CreateUnmanagedRegion(size, callback);
-    }
-
  private:
    std::shared_ptr<FairMQTransportFactory> fTransportFactory;
    fair::mq::Transport fTransportType;
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -26,34 +26,33 @@
 #include <algorithm> // std::max

 using namespace std;
-using namespace fair::mq;

-static map<Transition, State> backwardsCompatibilityWaitForEndOfStateHelper =
+static map<fair::mq::Transition, fair::mq::State> backwardsCompatibilityWaitForEndOfStateHelper =
 {
-    { Transition::InitDevice,   State::InitializingDevice },
-    { Transition::CompleteInit, State::Initialized },
-    { Transition::Bind,         State::Bound },
-    { Transition::Connect,      State::DeviceReady },
-    { Transition::InitTask,     State::Ready },
-    { Transition::Run,          State::Ready },
-    { Transition::Stop,         State::Ready },
-    { Transition::ResetTask,    State::DeviceReady },
-    { Transition::ResetDevice,  State::Idle }
+    { fair::mq::Transition::InitDevice,   fair::mq::State::InitializingDevice },
+    { fair::mq::Transition::CompleteInit, fair::mq::State::Initialized },
+    { fair::mq::Transition::Bind,         fair::mq::State::Bound },
+    { fair::mq::Transition::Connect,      fair::mq::State::DeviceReady },
+    { fair::mq::Transition::InitTask,     fair::mq::State::Ready },
+    { fair::mq::Transition::Run,          fair::mq::State::Ready },
+    { fair::mq::Transition::Stop,         fair::mq::State::Ready },
+    { fair::mq::Transition::ResetTask,    fair::mq::State::DeviceReady },
+    { fair::mq::Transition::ResetDevice,  fair::mq::State::Idle }
 };

-static map<int, Transition> backwardsCompatibilityChangeStateHelper =
+static map<int, fair::mq::Transition> backwardsCompatibilityChangeStateHelper =
 {
-    { FairMQDevice::Event::INIT_DEVICE,           Transition::InitDevice },
-    { FairMQDevice::Event::internal_DEVICE_READY, Transition::Auto },
-    { FairMQDevice::Event::INIT_TASK,             Transition::InitTask },
-    { FairMQDevice::Event::internal_READY,        Transition::Auto },
-    { FairMQDevice::Event::RUN,                   Transition::Run },
-    { FairMQDevice::Event::STOP,                  Transition::Stop },
-    { FairMQDevice::Event::RESET_TASK,            Transition::ResetTask },
-    { FairMQDevice::Event::RESET_DEVICE,          Transition::ResetDevice },
-    { FairMQDevice::Event::internal_IDLE,         Transition::Auto },
-    { FairMQDevice::Event::END,                   Transition::End },
-    { FairMQDevice::Event::ERROR_FOUND,           Transition::ErrorFound }
+    { FairMQDevice::Event::INIT_DEVICE, fair::mq::Transition::InitDevice },
+    { FairMQDevice::Event::internal_DEVICE_READY, fair::mq::Transition::Auto },
+    { FairMQDevice::Event::INIT_TASK, fair::mq::Transition::InitTask },
+    { FairMQDevice::Event::internal_READY, fair::mq::Transition::Auto },
+    { FairMQDevice::Event::RUN, fair::mq::Transition::Run },
+    { FairMQDevice::Event::STOP, fair::mq::Transition::Stop },
+    { FairMQDevice::Event::RESET_TASK, fair::mq::Transition::ResetTask },
+    { FairMQDevice::Event::RESET_DEVICE, fair::mq::Transition::ResetDevice },
+    { FairMQDevice::Event::internal_IDLE, fair::mq::Transition::Auto },
+    { FairMQDevice::Event::END, fair::mq::Transition::End },
+    { FairMQDevice::Event::ERROR_FOUND, fair::mq::Transition::ErrorFound }
 };

 FairMQDevice::FairMQDevice()
@@ -66,21 +65,21 @@ FairMQDevice::FairMQDevice(FairMQProgOptions& config)
 {
 }

-FairMQDevice::FairMQDevice(const tools::Version version)
+FairMQDevice::FairMQDevice(const fair::mq::tools::Version version)
    : FairMQDevice(nullptr, version)
 {
 }

-FairMQDevice::FairMQDevice(FairMQProgOptions& config, const tools::Version version)
+FairMQDevice::FairMQDevice(FairMQProgOptions& config, const fair::mq::tools::Version version)
    : FairMQDevice(&config, version)
 {
 }

-FairMQDevice::FairMQDevice(FairMQProgOptions* config, const tools::Version version)
+FairMQDevice::FairMQDevice(FairMQProgOptions* config, const fair::mq::tools::Version version)
    : fTransportFactory(nullptr)
    , fTransports()
    , fChannels()
-    , fInternalConfig(config ? nullptr : tools::make_unique<FairMQProgOptions>())
+    , fInternalConfig(config ? nullptr : fair::mq::tools::make_unique<FairMQProgOptions>())
    , fConfig(config ? config : fInternalConfig.get())
    , fId()
    , fDefaultTransportType(fair::mq::Transport::ZMQ)
@@ -100,11 +99,11 @@ FairMQDevice::FairMQDevice(FairMQProgOptions* config, const tools::Version versi
    , fMaxRunRuntimeInS(0)
    , fRawCmdLineArgs()
 {
-    SubscribeToNewTransition("device", [&](Transition transition) {
+    SubscribeToNewTransition("device", [&](fair::mq::Transition transition) {
        LOG(trace) << "device notified on new transition: " << transition;

        switch (transition) {
-            case Transition::Stop:
+            case fair::mq::Transition::Stop:
                UnblockTransports();
                break;
            default:
@@ -119,7 +118,7 @@ FairMQDevice::FairMQDevice(FairMQProgOptions* config, const tools::Version versi
            lock_guard<mutex> lock(fStatesMtx);
            fStates.push(state);
        }
-        fStatesCV.notify_all();
+        fStatesCV.notify_one();

        switch (state) {
            case fair::mq::State::InitializingDevice:
@@ -183,7 +182,7 @@ bool FairMQDevice::ChangeState(const int transition)
    return ChangeState(backwardsCompatibilityChangeStateHelper.at(transition));
 }

-void FairMQDevice::WaitForEndOfState(Transition transition)
+void FairMQDevice::WaitForEndOfState(fair::mq::Transition transition)
 {
    WaitForState(backwardsCompatibilityWaitForEndOfStateHelper.at(transition));
 }
@@ -227,7 +226,7 @@ void FairMQDevice::InitWrapper()
        int subChannelIndex = 0;
        for (auto& vi : mi.second) {
            // set channel name: name + vector index
-            vi.fName = tools::ToString(mi.first, "[", subChannelIndex, "]");
+            vi.fName = fair::mq::tools::ToString(mi.first, "[", subChannelIndex, "]");

            // set channel transport
            LOG(debug) << "Initializing transport for channel " << vi.fName << ": " << fair::mq::TransportNames.at(vi.fTransportType);
@@ -238,9 +237,9 @@ void FairMQDevice::InitWrapper()
                if (vi.fAddress == "unspecified" || vi.fAddress == "") {
                    // if the configured network interface is default, get its name from the default route
                    if (networkInterface == "default") {
-                        networkInterface = tools::getDefaultRouteNetworkInterface();
+                        networkInterface = fair::mq::tools::getDefaultRouteNetworkInterface();
                    }
-                    vi.fAddress = "tcp://" + tools::getInterfaceIP(networkInterface) + ":1";
+                    vi.fAddress = "tcp://" + fair::mq::tools::getInterfaceIP(networkInterface) + ":1";
                }
                // fill the uninitialized list
                fUninitializedBindingChannels.push_back(&vi);
@@ -252,14 +251,14 @@ void FairMQDevice::InitWrapper()
                fUninitializedConnectingChannels.push_back(&vi);
            } else {
                LOG(error) << "Cannot update configuration. Socket method (bind/connect) for channel '" << vi.fName << "' not specified.";
-                throw runtime_error(tools::ToString("Cannot update configuration. Socket method (bind/connect) for channel ", vi.fName, " not specified."));
+                throw runtime_error(fair::mq::tools::ToString("Cannot update configuration. Socket method (bind/connect) for channel ", vi.fName, " not specified."));
            }

            subChannelIndex++;
        }
    }

-    // ChangeState(Transition::Auto);
+    // ChangeState(fair::mq::Transition::Auto);
 }

 void FairMQDevice::BindWrapper()
@@ -270,12 +269,12 @@ void FairMQDevice::BindWrapper()

    if (!fUninitializedBindingChannels.empty()) {
        LOG(error) << fUninitializedBindingChannels.size() << " of the binding channels could not initialize. Initial configuration incomplete.";
-        throw runtime_error(tools::ToString(fUninitializedBindingChannels.size(), " of the binding channels could not initialize. Initial configuration incomplete."));
+        throw runtime_error(fair::mq::tools::ToString(fUninitializedBindingChannels.size(), " of the binding channels could not initialize. Initial configuration incomplete."));
    }

    Bind();

-    ChangeState(Transition::Auto);
+    ChangeState(fair::mq::Transition::Auto);
 }

 void FairMQDevice::ConnectWrapper()
@@ -302,7 +301,7 @@ void FairMQDevice::ConnectWrapper()

        if (numAttempts++ > maxAttempts) {
            LOG(error) << "could not connect all channels after " << initializationTimeoutInS << " attempts";
-            throw runtime_error(tools::ToString("could not connect all channels after ", initializationTimeoutInS, " attempts"));
+            throw runtime_error(fair::mq::tools::ToString("could not connect all channels after ", initializationTimeoutInS, " attempts"));
        }

        AttachChannels(fUninitializedConnectingChannels);
@@ -314,7 +313,7 @@ void FairMQDevice::ConnectWrapper()

    Connect();

-    ChangeState(Transition::Auto);
+    ChangeState(fair::mq::Transition::Auto);
 }

 void FairMQDevice::AttachChannels(vector<FairMQChannel*>& chans)
@@ -367,7 +366,7 @@ bool FairMQDevice::AttachChannel(FairMQChannel& chan)
            string hostPart = addressString.substr(0, pos);
            if (!(bind && hostPart == "*")) {
                string portPart = addressString.substr(pos + 1);
-                string resolvedHost = tools::getIpFromHostname(hostPart);
+                string resolvedHost = fair::mq::tools::getIpFromHostname(hostPart);
                if (resolvedHost == "") {
                    return false;
                }
@@ -415,7 +414,7 @@ void FairMQDevice::InitTaskWrapper()
 {
    InitTask();

-    ChangeState(Transition::Auto);
+    ChangeState(fair::mq::Transition::Auto);
 }

 bool FairMQDevice::SortSocketsByAddress(const FairMQChannel &lhs, const FairMQChannel &rhs)
@@ -434,7 +433,7 @@ void FairMQDevice::SortChannel(const string& name, const bool reindex)
            for (auto vi = fChannels.at(name).begin(); vi != fChannels.at(name).end(); ++vi)
            {
                // set channel name: name + vector index
-                vi->fName = tools::ToString(name, "[", vi - fChannels.at(name).begin(), "]");
+                vi->fName = fair::mq::tools::ToString(name, "[", vi - fChannels.at(name).begin(), "]");
            }
        }
    }
@@ -468,7 +467,7 @@ void FairMQDevice::RunWrapper()
                HandleMultipleChannelInput();
            }
        } else {
-            tools::RateLimiter rateLimiter(fRate);
+            fair::mq::tools::RateLimiter rateLimiter(fRate);

            while (!NewStatePending() && ConditionalRun()) {
                if (fRate > 0.001) {
@@ -482,7 +481,7 @@ void FairMQDevice::RunWrapper()
        // if Run() exited and the state is still RUNNING, transition to READY.
        if (!NewStatePending()) {
            UnblockTransports();
-            ChangeState(Transition::Stop);
+            ChangeState(fair::mq::Transition::Stop);
        }

        PostRun();
@@ -490,10 +489,10 @@ void FairMQDevice::RunWrapper()
    } catch (const out_of_range& oor) {
        LOG(error) << "out of range: " << oor.what();
        LOG(error) << "incorrect/incomplete channel configuration?";
-        ChangeState(Transition::ErrorFound);
+        ChangeState(fair::mq::Transition::ErrorFound);
        throw;
    } catch (...) {
-        ChangeState(Transition::ErrorFound);
+        ChangeState(fair::mq::Transition::ErrorFound);
        throw;
    }

@@ -665,7 +664,7 @@ void FairMQDevice::PollForTransport(const FairMQTransportFactory* factory, const
    catch (exception& e)
    {
        LOG(error) << "FairMQDevice::PollForTransport() failed: " << e.what() << ", going to ERROR state.";
-        throw runtime_error(tools::ToString("FairMQDevice::PollForTransport() failed: ", e.what(), ", going to ERROR state."));
+        throw runtime_error(fair::mq::tools::ToString("FairMQDevice::PollForTransport() failed: ", e.what(), ", going to ERROR state."));
    }
 }

@@ -739,7 +738,7 @@ void FairMQDevice::LogSocketRates()
                filteredSockets.push_back(vi->fSocket.get());
                logIntervals.push_back(vi->fRateLogging);
                intervalCounters.push_back(0);
-                filteredChannelNames.push_back(tools::ToString(mi.first, "[", vi - (mi.second).begin(), "]"));
+                filteredChannelNames.push_back(fair::mq::tools::ToString(mi.first, "[", vi - (mi.second).begin(), "]"));
                chanNameLen = max(chanNameLen, filteredChannelNames.back().length());
            }
        }
@@ -815,7 +814,7 @@ void FairMQDevice::LogSocketRates()

        t0 = t1;
        if (fMaxRunRuntimeInS > 0 && ++secondsElapsed >= fMaxRunRuntimeInS) {
-            ChangeState(Transition::Stop);
+            ChangeState(fair::mq::Transition::Stop);
        }
    }
 }
@@ -831,7 +830,7 @@ void FairMQDevice::ResetTaskWrapper()
 {
    ResetTask();

-    ChangeState(Transition::Auto);
+    ChangeState(fair::mq::Transition::Auto);
 }

 void FairMQDevice::ResetWrapper()
@@ -851,7 +850,7 @@ void FairMQDevice::ResetWrapper()

    Reset();

-    ChangeState(Transition::Auto);
+    ChangeState(fair::mq::Transition::Auto);
 }

 FairMQDevice::~FairMQDevice()
--- a/fairmq/FairMQDevice.h
+++ b/fairmq/FairMQDevice.h
@@ -191,58 +191,50 @@ class FairMQDevice
        return fTransportFactory.get();
    }

-    // creates message with the default device transport
    template<typename... Args>
    FairMQMessagePtr NewMessage(Args&&... args)
    {
        return Transport()->CreateMessage(std::forward<Args>(args)...);
    }

-    // creates message with the transport of the specified channel
    template<typename... Args>
    FairMQMessagePtr NewMessageFor(const std::string& channel, int index, Args&&... args)
    {
        return GetChannel(channel, index).NewMessage(std::forward<Args>(args)...);
    }

-    // creates a message that will not be cleaned up after transfer, with the default device transport
    template<typename T>
    FairMQMessagePtr NewStaticMessage(const T& data)
    {
        return Transport()->NewStaticMessage(data);
    }

-    // creates a message that will not be cleaned up after transfer, with the transport of the specified channel
    template<typename T>
    FairMQMessagePtr NewStaticMessageFor(const std::string& channel, int index, const T& data)
    {
        return GetChannel(channel, index).NewStaticMessage(data);
    }

-    // creates a message with a copy of the provided data, with the default device transport
    template<typename T>
    FairMQMessagePtr NewSimpleMessage(const T& data)
    {
        return Transport()->NewSimpleMessage(data);
    }

-    // creates a message with a copy of the provided data, with the transport of the specified channel
    template<typename T>
    FairMQMessagePtr NewSimpleMessageFor(const std::string& channel, int index, const T& data)
    {
        return GetChannel(channel, index).NewSimpleMessage(data);
    }

-    // creates unamanaged region with the default device transport
    FairMQUnmanagedRegionPtr NewUnmanagedRegion(const size_t size, FairMQRegionCallback callback = nullptr)
    {
        return Transport()->CreateUnmanagedRegion(size, callback);
    }

-    // creates unmanaged region with the transport of the specified channel
    FairMQUnmanagedRegionPtr NewUnmanagedRegionFor(const std::string& channel, int index, const size_t size, FairMQRegionCallback callback = nullptr)
    {
-        return GetChannel(channel, index).NewUnmanagedRegion(size, callback);
+        return GetChannel(channel, index).Transport()->CreateUnmanagedRegion(size, callback);
    }

    template<typename ...Ts>
@@ -366,9 +358,8 @@ class FairMQDevice
    try {
        return fChannels.at(channelName).at(index);
    } catch (const std::out_of_range& oor) {
-        LOG(error) << "requested channel has not been configured? check channel names/configuration.";
-        LOG(error) << "channel: " << channelName << ", index: " << index;
        LOG(error) << "out of range: " << oor.what();
+        LOG(error) << "requested channel has not been configured? check channel names/configuration.";
        throw;
    }

@@ -431,7 +422,7 @@ class FairMQDevice
    template<class Rep, class Period>
    bool WaitFor(std::chrono::duration<Rep, Period> const& duration)
    {
-        return !fStateMachine.WaitForPendingStateFor(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count());
+        return fStateMachine.WaitForPendingStateFor(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count());
    }

  protected:
--- a/fairmq/FairMQParts.h
+++ b/fairmq/FairMQParts.h
@@ -31,9 +31,6 @@ class FairMQParts
    FairMQParts(FairMQParts&& p) = default;
    /// Assignment operator
    FairMQParts& operator=(const FairMQParts&) = delete;
-    /// Constructor from argument pack of std::unique_ptr<FairMQMessage> rvalues
-    template <typename... Ts>
-    FairMQParts(Ts&&... messages) : fParts() {AddPart(std::forward<Ts>(messages)...);}
    /// Default destructor
    ~FairMQParts() {};

@@ -44,6 +41,14 @@ class FairMQParts
        fParts.push_back(std::unique_ptr<FairMQMessage>(msg));
    }

+    /// Adds part (std::unique_ptr<FairMQMessage>&) to the container (move)
+    /// @param msg unique pointer to FairMQMessage
+    /// lvalue ref (move not required when passing argument)
+    // inline void AddPart(std::unique_ptr<FairMQMessage>& msg)
+    // {
+    //     fParts.push_back(std::move(msg));
+    // }
+
    /// Adds part (std::unique_ptr<FairMQMessage>&) to the container (move)
    /// @param msg unique pointer to FairMQMessage
    /// rvalue ref (move required when passing argument)
@@ -52,23 +57,6 @@ class FairMQParts
        fParts.push_back(std::move(msg));
    }

-    /// Add variable list of parts to the container (move)
-    template <typename... Ts>
-    void AddPart(std::unique_ptr<FairMQMessage>&& first, Ts&&... remaining)
-    {
-        AddPart(std::move(first));
-        AddPart(std::forward<Ts>(remaining)...);
-    }
-
-    /// Add content of another object by move
-    void AddPart(FairMQParts&& other)
-    {
-      container parts = std::move(other.fParts);
-      for (auto& part : parts) {
-	fParts.push_back(std::move(part));
-      }
-    }
-
    /// Get reference to part in the container at index (without bounds check)
    /// @param index container index
    FairMQMessage& operator[](const int index) { return *(fParts[index]); }
--- a/fairmq/PluginServices.h
+++ b/fairmq/PluginServices.h
@@ -196,7 +196,6 @@ class PluginServices
            || (currentState == DeviceState::Binding)
            || (currentState == DeviceState::Bound)
            || (currentState == DeviceState::Connecting)
-            || (currentState == DeviceState::Ready)
            || (currentState == DeviceState::Idle && key == "channel-config")) {
            fConfig.SetValue(key, val);
        } else {
--- a/fairmq/StateMachine.cxx
+++ b/fairmq/StateMachine.cxx
@@ -28,7 +28,6 @@
 #include <array>
 #include <unordered_map>
 #include <mutex>
-#include <stdexcept>

 using namespace std;
 using namespace boost::msm;
@@ -168,6 +167,7 @@ struct Machine_ : public state_machine_def<Machine_>
    Machine_()
        : fLastTransitionResult(true)
        , fNewStatePending(false)
+        , fWorkOngoing(false)
    {}

    virtual ~Machine_() {}
@@ -258,7 +258,9 @@ struct Machine_ : public state_machine_def<Machine_>

    mutex fStateMtx;
    atomic<bool> fNewStatePending;
+    atomic<bool> fWorkOngoing;
    condition_variable fNewStatePendingCV;
+    condition_variable fWorkDoneCV;

    boost::signals2::signal<void(const State)> fStateChangeSignal;
    boost::signals2::signal<void(const State)> fStateHandleSignal;
@@ -281,6 +283,7 @@ struct Machine_ : public state_machine_def<Machine_>
                LOG(state) << fState << " ---> " << fNewState;
                fState = static_cast<State>(fNewState);
                fNewStatePending = false;
+                fWorkOngoing = true;

                if (fState == State::Exiting || fState == State::Error) {
                    stop = true;
@@ -289,10 +292,12 @@ struct Machine_ : public state_machine_def<Machine_>

            CallStateChangeCallbacks(fState);
            CallStateHandler(fState);
-        }

-        if (fState == State::Error) {
-            throw StateMachine::ErrorStateException("Device transitioned to error state");
+            {
+                lock_guard<mutex> lock(fStateMtx);
+                fWorkOngoing = false;
+                fWorkDoneCV.notify_one();
+            }
        }
    }

@@ -458,15 +463,13 @@ void StateMachine::ProcessWork()
    try {
        fsm->CallStateChangeCallbacks(State::Idle);
        fsm->ProcessWork();
-    } catch(ErrorStateException& ese) {
-        LOG(trace) << "ErrorStateException caught in ProcessWork(), rethrowing";
-        throw;
    } catch(...) {
-        LOG(debug) << "Exception caught in ProcessWork(), going to Error state and rethrowing";
        {
            lock_guard<mutex> lock(fsm->fStateMtx);
            fsm->fState = State::Error;
            fsm->CallStateChangeCallbacks(State::Error);
+            fsm->fWorkOngoing = false;
+            fsm->fWorkDoneCV.notify_one();
        }
        ChangeState(Transition::ErrorFound);
        throw;
@@ -477,4 +480,3 @@ string StateMachine::GetStateName(const State state) { return stateNames.at(stat
 string StateMachine::GetTransitionName(const Transition transition) { return transitionNames.at(static_cast<int>(transition)); }
 State StateMachine::GetState(const string& state) { return stateNumbers.at(state); }
 Transition StateMachine::GetTransition(const string& transition) { return transitionNumbers.at(transition); }
-
--- a/fairmq/StateMachine.h
+++ b/fairmq/StateMachine.h
@@ -94,8 +94,6 @@ class StateMachine
    static State GetState(const std::string& state);
    static Transition GetTransition(const std::string& transition);

-    struct ErrorStateException : std::runtime_error { using std::runtime_error::runtime_error; };
-
  private:
    std::shared_ptr<void> fFsm;
 };
--- a/fairmq/Version.h.in
+++ b/fairmq/Version.h.in
@@ -21,7 +21,7 @@
 #define FAIRMQ_GIT_DATE "@PROJECT_GIT_DATE@"
 #define FAIRMQ_REPO_URL "https://github.com/FairRootGroup/FairMQ"
 #define FAIRMQ_LICENSE "LGPL-3.0"
-#define FAIRMQ_COPYRIGHT "2012-2019 GSI"
+#define FAIRMQ_COPYRIGHT "2012-2018 GSI"
 #define FAIRMQ_BUILD_TYPE "@CMAKE_BUILD_TYPE@"

 #endif // FAIR_MQ_VERSION_H
--- a/fairmq/ofi/Context.cxx
+++ b/fairmq/ofi/Context.cxx
@@ -37,7 +37,7 @@ Context::Context(FairMQTransportFactory& sendFactory,
    : fIoWork(fIoContext)
    , fReceiveFactory(receiveFactory)
    , fSendFactory(sendFactory)
-    , fSizeHint(0)
+    , fSizeHint(2000000) // temporary hack to provide expected message size for receive
 {
    InitThreadPool(numberIoThreads);
 }
@@ -48,24 +48,15 @@ auto Context::InitThreadPool(int numberIoThreads) -> void

    for (int i = 1; i <= numberIoThreads; ++i) {
        fThreadPool.emplace_back([&, i, numberIoThreads]{
-            try {
-                LOG(debug) << "OFI transport: I/O thread #" << i << " of " << numberIoThreads << " started";
-                fIoContext.run();
-                LOG(debug) << "OFI transport: I/O thread #" << i << " of " << numberIoThreads << " stopped";
-            } catch (const std::exception& e) {
-                LOG(error) << "OFI transport: Uncaught exception in I/O thread #" << i << ": " << e.what();
-            } catch (...) {
-                LOG(error) << "OFI transport: Uncaught exception in I/O thread #" << i;
-            }
+            LOG(debug) << "OFI transport: I/O thread #" << i << " of " << numberIoThreads << " started";
+            fIoContext.run();
+            LOG(debug) << "OFI transport: I/O thread #" << i << " of " << numberIoThreads << " stopped";
        });
    }
 }

 auto Context::Reset() -> void
 {
-    // TODO "Linger", rethink this
-    std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-
    fIoContext.stop();
 }

--- a/fairmq/ofi/Context.h
+++ b/fairmq/ofi/Context.h
@@ -72,8 +72,8 @@ class Context
    auto Reset() -> void;
    auto MakeReceiveMessage(size_t size) -> MessagePtr;
    auto MakeSendMessage(size_t size) -> MessagePtr;
-    auto GetSizeHint() -> size_t { return fSizeHint; }
-    auto SetSizeHint(size_t size) -> void { fSizeHint = size; }
+    size_t GetSizeHint() { return fSizeHint; } // temporary hack to provide expected message size for receive
+    void SetSizeHint(size_t size) { fSizeHint = size; } // temporary hack to provide expected message size for receive

  private:
    boost::asio::io_context fIoContext;
@@ -81,7 +81,8 @@ class Context
    std::vector<std::thread> fThreadPool;
    FairMQTransportFactory& fReceiveFactory;
    FairMQTransportFactory& fSendFactory;
-    size_t fSizeHint;
+
+    size_t fSizeHint; // temporary hack to provide expected message size for receive

    auto InitThreadPool(int numberIoThreads) -> void;
 }; /* class Context */
--- a/fairmq/ofi/ControlMessages.h
+++ b/fairmq/ofi/ControlMessages.h
@@ -35,76 +35,59 @@ namespace ofi {

 enum class ControlMessageType
 {
-    Empty = 1,
+    DataAddressAnnouncement = 1,
    PostBuffer,
-    PostMultiPartStartBuffer
-};
-
-struct Empty
-{};
-
-struct PostBuffer
-{
-    uint64_t size;   // buffer size (size_t)
-};
-
-struct PostMultiPartStartBuffer
-{
-    uint32_t numParts;   // buffer size (size_t)
-    uint64_t size;       // buffer size (size_t)
-};
-
-union ControlMessageContent
-{
-    PostBuffer postBuffer;
-    PostMultiPartStartBuffer postMultiPartStartBuffer;
+    PostBufferAcknowledgement
 };

 struct ControlMessage
 {
    ControlMessageType type;
-    ControlMessageContent msg;
+};
+
+struct DataAddressAnnouncement : ControlMessage
+{
+    uint32_t ipv4;   // in_addr_t from <netinet/in.h>
+    uint32_t port;   // in_port_t from <netinet/in.h>
+};
+
+struct PostBuffer : ControlMessage
+{
+    uint64_t size;   // buffer size (size_t)
 };

 template<typename T>
 using unique_ptr = std::unique_ptr<T, std::function<void(T*)>>;

 template<typename T, typename... Args>
-auto MakeControlMessageWithPmr(boost::container::pmr::memory_resource& pmr, Args&&... args)
-    -> ofi::unique_ptr<ControlMessage>
+auto MakeControlMessageWithPmr(boost::container::pmr::memory_resource* pmr, Args&&... args)
+    -> ofi::unique_ptr<T>
 {
-    void* mem = pmr.allocate(sizeof(ControlMessage));
-    ControlMessage* ctrl = new (mem) ControlMessage();
+    void* mem = pmr->allocate(sizeof(T));
+    T* ctrl = new (mem) T(std::forward<Args>(args)...);

-    if (std::is_same<T, PostBuffer>::value) {
+    if (std::is_same<T, DataAddressAnnouncement>::value) {
+        ctrl->type = ControlMessageType::DataAddressAnnouncement;
+    } else if (std::is_same<T, PostBuffer>::value) {
        ctrl->type = ControlMessageType::PostBuffer;
-        ctrl->msg.postBuffer = PostBuffer(std::forward<Args>(args)...);
-    } else if (std::is_same<T, PostMultiPartStartBuffer>::value) {
-        ctrl->type = ControlMessageType::PostMultiPartStartBuffer;
-        ctrl->msg.postMultiPartStartBuffer = PostMultiPartStartBuffer(std::forward<Args>(args)...);
-    } else if (std::is_same<T, Empty>::value) {
-        ctrl->type = ControlMessageType::Empty;
    }

-    return ofi::unique_ptr<ControlMessage>(ctrl, [&pmr](ControlMessage* p) {
-        p->~ControlMessage();
-        pmr.deallocate(p, sizeof(T));
+    return ofi::unique_ptr<T>(ctrl, [=](T* p) {
+        p->~T();
+        pmr->deallocate(p, sizeof(T));
    });
 }

 template<typename T, typename... Args>
-auto MakeControlMessage(Args&&... args) -> ControlMessage
+auto MakeControlMessage(Args&&... args) -> T
 {
-    ControlMessage ctrl;
+    T ctrl = T(std::forward<Args>(args)...);

-    if (std::is_same<T, PostBuffer>::value) {
+    if (std::is_same<T, DataAddressAnnouncement>::value) {
+        ctrl.type = ControlMessageType::DataAddressAnnouncement;
+    } else if (std::is_same<T, PostBuffer>::value) {
        ctrl.type = ControlMessageType::PostBuffer;
-    } else if (std::is_same<T, PostMultiPartStartBuffer>::value) {
-        ctrl.type = ControlMessageType::PostMultiPartStartBuffer;
-    } else if (std::is_same<T, Empty>::value) {
-        ctrl.type = ControlMessageType::Empty;
    }
-    ctrl.msg = T(std::forward<Args>(args)...);

    return ctrl;
 }
--- a/fairmq/ofi/Message.cxx
+++ b/fairmq/ofi/Message.cxx
@@ -43,6 +43,8 @@ Message::Message(boost::container::pmr::memory_resource* pmr, const size_t size)
    , fPmr(pmr)
 {
    if (size) {
+        // static void* buffer = fPmr->allocate(size);
+        // fData = buffer;
        fData = fPmr->allocate(size);
        assert(fData);
    }
--- a/fairmq/ofi/Socket.cxx
+++ b/fairmq/ofi/Socket.cxx
@@ -13,17 +13,20 @@
 #include <FairMQLogger.h>

 #include <asiofi.hpp>
+#include <azmq/message.hpp>
 #include <boost/asio/buffer.hpp>
-#include <boost/asio/dispatch.hpp>
 #include <boost/asio/post.hpp>
 #include <chrono>
 #include <cstring>
 #include <functional>
 #include <memory>
 #include <sstream>
+#include <string.h>
+#include <sys/socket.h>
 #include <thread>
+
 #include <mutex>
-#include <queue>
+#include <condition_variable>

 namespace fair
 {
@@ -41,7 +44,6 @@ Socket::Socket(Context& context, const string& type, const string& name, const s
    , fOfiDomain(nullptr)
    , fPassiveEndpoint(nullptr)
    , fDataEndpoint(nullptr)
-    , fControlEndpoint(nullptr)
    , fId(id + "." + name + "." + type)
    , fBytesTx(0)
    , fBytesRx(0)
@@ -49,15 +51,33 @@ Socket::Socket(Context& context, const string& type, const string& name, const s
    , fMessagesRx(0)
    , fSndTimeout(100)
    , fRcvTimeout(100)
-    , fMultiPartRecvCounter(-1)
-    , fSendPushSem(fContext.GetIoContext(), 384)
-    , fSendPopSem(fContext.GetIoContext(), 0)
-    , fRecvPushSem(fContext.GetIoContext(), 384)
-    , fRecvPopSem(fContext.GetIoContext(), 0)
+    , fRecvQueueWrite(fContext.GetIoContext(), ZMQ_PUSH)
+    , fRecvQueueRead(fContext.GetIoContext(), ZMQ_PULL)
+    , fSendSem(fContext.GetIoContext(), 300)
+    , fRecvSem(fContext.GetIoContext(), 300)
    , fNeedOfiMemoryRegistration(false)
+    , fBound(false)
+    , fConnected(false)
 {
    if (type != "pair") {
        throw SocketError{tools::ToString("Socket type '", type, "' not implemented for ofi transport.")};
+    } else {
+        // TODO wire this up with config
+        azmq::socket::snd_hwm send_max(300);
+        azmq::socket::rcv_hwm recv_max(300);
+        fRecvQueueRead.set_option(send_max);
+        fRecvQueueRead.set_option(recv_max);
+        fRecvQueueWrite.set_option(send_max);
+        fRecvQueueWrite.set_option(recv_max);
+
+        // Setup internal queue
+        auto hashed_id = hash<string>()(fId);
+        auto queue_id = tools::ToString("inproc://TXQUEUE", hashed_id);
+        queue_id = tools::ToString("inproc://RXQUEUE", hashed_id);
+        LOG(debug) << "OFI transport (" << fId << "): " << "Binding RQR: " << queue_id;
+        fRecvQueueRead.bind(queue_id);
+        LOG(debug) << "OFI transport (" << fId << "): " << "Connecting RQW: " << queue_id;
+        fRecvQueueWrite.connect(queue_id);
    }
 }

@@ -74,12 +94,12 @@ auto Socket::InitOfi(Address addr) -> void
          hints.set_provider("verbs");
      }
      if (fRemoteAddr == addr) {
-          fOfiInfo = tools::make_unique<asiofi::info>(addr.Ip.c_str(), std::to_string(addr.Port).c_str(), 0, hints);
+          fOfiInfo = tools::make_unique<asiofi::info>(addr.Ip.c_str(), to_string(addr.Port).c_str(), 0, hints);
      } else {
-          fOfiInfo = tools::make_unique<asiofi::info>(addr.Ip.c_str(), std::to_string(addr.Port).c_str(), FI_SOURCE, hints);
+          fOfiInfo = tools::make_unique<asiofi::info>(addr.Ip.c_str(), to_string(addr.Port).c_str(), FI_SOURCE, hints);
      }

-      LOG(debug) << "OFI transport (" << fId << "): " << *fOfiInfo;
+      LOG(debug) << "OFI transport: " << *fOfiInfo;

      fOfiFabric = tools::make_unique<asiofi::fabric>(*fOfiInfo);

@@ -89,6 +109,7 @@ auto Socket::InitOfi(Address addr) -> void

 auto Socket::Bind(const string& addr) -> bool
 try {
+    fBound = false;
    fLocalAddr = Context::VerifyAddress(addr);
    if (fLocalAddr.Protocol == "verbs") {
        fNeedOfiMemoryRegistration = true;
@@ -99,80 +120,39 @@ try {
    fPassiveEndpoint = tools::make_unique<asiofi::passive_endpoint>(fContext.GetIoContext(), *fOfiFabric);
    //fPassiveEndpoint->set_local_address(Context::ConvertAddress(fLocalAddr));

-    BindControlEndpoint();
-
-    return true;
-}
-// TODO catch the correct ofi error
-catch (const SilentSocketError& e)
-{
-    // do not print error in this case, this is handled by FairMQDevice
-    // in case no connection could be established after trying a number of random ports from a range.
-    return false;
-}
-catch (const std::exception& e)
-{
-    LOG(error) << "OFI transport: " << e.what();
-    return false;
-}
-catch (...)
-{
-    LOG(error) << "OFI transport: Unknown exception in ofi::Socket::Bind";
-    return false;
-}
-
-auto Socket::BindControlEndpoint() -> void
-{
-    assert(!fControlEndpoint);
-
-    fPassiveEndpoint->listen([&](asiofi::info&& info) {
-        LOG(debug) << "OFI transport (" << fId
-                   << "): control band connection request received. Accepting ...";
-        fControlEndpoint = tools::make_unique<asiofi::connected_endpoint>(
-            fContext.GetIoContext(), *fOfiDomain, info);
-        fControlEndpoint->enable();
-        fControlEndpoint->accept([&]() {
-            LOG(debug) << "OFI transport (" << fId << "): control band connection accepted.";
-
-            BindDataEndpoint();
-        });
-    });
-
-    LOG(debug) << "OFI transport (" << fId << "): control band bound to " << fLocalAddr;
-}
-
-auto Socket::BindDataEndpoint() -> void
-{
    assert(!fDataEndpoint);

    fPassiveEndpoint->listen([&](asiofi::info&& info) {
-        LOG(debug) << "OFI transport (" << fId
-                   << "): data band connection request received. Accepting ...";
-        fDataEndpoint = tools::make_unique<asiofi::connected_endpoint>(
-            fContext.GetIoContext(), *fOfiDomain, info);
+        LOG(debug) << "OFI transport (" << fId << "): data band connection request received. Accepting ...";
+        fDataEndpoint = tools::make_unique<asiofi::connected_endpoint>(fContext.GetIoContext(), *fOfiDomain, info);
        fDataEndpoint->enable();
        fDataEndpoint->accept([&]() {
            LOG(debug) << "OFI transport (" << fId << "): data band connection accepted.";

-            if (fContext.GetSizeHint()) {
-                boost::asio::post(fContext.GetIoContext(),
-                                  std::bind(&Socket::SendQueueReaderStatic, this));
-                boost::asio::post(fContext.GetIoContext(),
-                                  std::bind(&Socket::RecvQueueReaderStatic, this));
-            } else {
-                boost::asio::post(fContext.GetIoContext(),
-                                  std::bind(&Socket::SendQueueReader, this));
-                boost::asio::post(fContext.GetIoContext(),
-                                  std::bind(&Socket::RecvControlQueueReader, this));
-            }
+            boost::asio::post(fContext.GetIoContext(), bind(&Socket::RecvQueueReader, this));
+            fBound = true;
        });
    });

    LOG(debug) << "OFI transport (" << fId << "): data band bound to " << fLocalAddr;
+
+    while (!fBound) {
+        this_thread::sleep_for(chrono::milliseconds(100));
+    }
+
+    return true;
+} catch (const SilentSocketError& e) {// TODO catch the correct ofi error
+    // do not print error in this case, this is handled by FairMQDevice
+    // in case no connection could be established after trying a number of random ports from a range.
+    return false;
+} catch (const SocketError& e) {
+    LOG(error) << "OFI transport: " << e.what();
+    return false;
 }

 auto Socket::Connect(const string& address) -> bool
 try {
+    fConnected = false;
    fRemoteAddr = Context::VerifyAddress(address);
    if (fRemoteAddr.Protocol == "verbs") {
        fNeedOfiMemoryRegistration = true;
@@ -180,421 +160,185 @@ try {

    InitOfi(fRemoteAddr);

-    ConnectEndpoint(fControlEndpoint, Band::Control);
-    ConnectEndpoint(fDataEndpoint, Band::Data);
+    assert(!fDataEndpoint);

-    if (fContext.GetSizeHint()) {
-        boost::asio::post(fContext.GetIoContext(), std::bind(&Socket::SendQueueReaderStatic, this));
-        boost::asio::post(fContext.GetIoContext(), std::bind(&Socket::RecvQueueReaderStatic, this));
-    } else {
-        boost::asio::post(fContext.GetIoContext(), std::bind(&Socket::SendQueueReader, this));
-        boost::asio::post(fContext.GetIoContext(), std::bind(&Socket::RecvControlQueueReader, this));
+    fDataEndpoint = tools::make_unique<asiofi::connected_endpoint>(fContext.GetIoContext(), *fOfiDomain);
+    fDataEndpoint->enable();
+
+    LOG(debug) << "OFI transport (" << fId << "): Sending data band connection request to " << fRemoteAddr;
+
+    fDataEndpoint->connect(Context::ConvertAddress(fRemoteAddr), [&](asiofi::eq::event event) {
+        LOG(debug) << "OFI transport (" << fId << "): data band conn event happened";
+        if (event == asiofi::eq::event::connected) {
+            LOG(debug) << "OFI transport (" << fId << "): data band connected.";
+            boost::asio::post(fContext.GetIoContext(), bind(&Socket::RecvQueueReader, this));
+            fConnected = true;
+        } else {
+            LOG(error) << "Could not connect on the first try";
+        }
+    });
+
+    while (!fConnected) {
+        this_thread::sleep_for(chrono::milliseconds(100));
    }

    return true;
-}
-catch (const SilentSocketError& e)
-{
+} catch (const SilentSocketError& e) {
    // do not print error in this case, this is handled by FairMQDevice
    return false;
-}
-catch (const std::exception& e)
-{
+} catch (const exception& e) {
    LOG(error) << "OFI transport: " << e.what();
    return false;
 }
-catch (...)
-{
-    LOG(error) << "OFI transport: Unknown exception in ofi::Socket::Connect";
-    return false;
-}
-
-auto Socket::ConnectEndpoint(std::unique_ptr<asiofi::connected_endpoint>& endpoint, Band type) -> void
-{
-    assert(!endpoint);
-
-    std::string band(type == Band::Control ? "control" : "data");
-
-    endpoint = tools::make_unique<asiofi::connected_endpoint>(fContext.GetIoContext(), *fOfiDomain);
-    endpoint->enable();
-
-    LOG(debug) << "OFI transport (" << fId << "): Sending " << band << " band connection request to " << fRemoteAddr;
-
-    std::mutex mtx;
-    std::condition_variable cv;
-    bool notified(false), connected(false);
-
-    while (true) {
-        endpoint->connect(Context::ConvertAddress(fRemoteAddr), [&, band](asiofi::eq::event event) {
-            // LOG(debug) << "OFI transport (" << fId << "): " << band << " band conn event happened";
-            std::unique_lock<std::mutex> lk2(mtx);
-            notified = true;
-            if (event == asiofi::eq::event::connected) {
-                LOG(debug) << "OFI transport (" << fId << "): " << band << " band connected.";
-                connected = true;
-            } else {
-                // LOG(debug) << "OFI transport (" << fId << "): " << band << " band connection refused. Trying again.";
-            }
-            lk2.unlock();
-            cv.notify_one();
-        });
-
-        {
-            std::unique_lock<std::mutex> lk(mtx);
-            cv.wait(lk, [&] { return notified; });
-
-            if (connected) {
-                break;
-            } else {
-                notified = false;
-                lk.unlock();
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-            }
-        }
-    }
-}

 auto Socket::Send(MessagePtr& msg, const int /*timeout*/) -> int
 {
-    // timeout argument not yet implemented
+    // LOG(debug) << "OFI transport (" << fId << "): ENTER Send: data=" << msg->GetData() << ",size=" << msg->GetSize();

-    std::vector<MessagePtr> msgVec;
-    msgVec.reserve(1);
-    msgVec.emplace_back(std::move(msg));
-
-    return Send(msgVec);
-}
-
-auto Socket::Send(std::vector<MessagePtr>& msgVec, const int /*timeout*/) -> int64_t
-try {
-    // timeout argument not yet implemented
-
-    int size(0);
-    for (auto& msg : msgVec) {
-        size += msg->GetSize();
-    } 
-
-    fSendPushSem.wait();
-    {
-        std::lock_guard<std::mutex> lk(fSendQueueMutex);
-        fSendQueue.emplace(std::move(msgVec));
+    try {
+        fSendSem.wait();
+        size_t size = msg->GetSize();
+        OnSend(msg);
+        return size;
+    } catch (const exception& e) {
+        LOG(error) << e.what();
+        return -1;
+    } catch (const boost::system::error_code& e) {
+        LOG(error) << e;
+        return -1;
    }
-    fSendPopSem.signal();
-
-    return size;
-} catch (const std::exception& e) {
-    LOG(error) << e.what();
-    return -1;
 }

-auto Socket::SendQueueReader() -> void
+auto Socket::OnSend(MessagePtr& msg) -> void
 {
-    fSendPopSem.async_wait([&] {
-        // Read msg from send queue
-        std::unique_lock<std::mutex> lk(fSendQueueMutex);
-        std::vector<MessagePtr> msgVec(std::move(fSendQueue.front()));
-        fSendQueue.pop();
-        lk.unlock();
+    // LOG(debug) << "OFI transport (" << fId << "): ENTER OnSend";

-        bool postMultiPartStartBuffer = msgVec.size() > 1;
-        for (auto& msg : msgVec) {
-            // Create control message
-            ofi::unique_ptr<ControlMessage> ctrl(nullptr);
-            if (postMultiPartStartBuffer) {
-                postMultiPartStartBuffer = false;
-                ctrl = MakeControlMessageWithPmr<PostMultiPartStartBuffer>(fControlMemPool);
-                ctrl->msg.postMultiPartStartBuffer.numParts = msgVec.size();
-                ctrl->msg.postMultiPartStartBuffer.size = msg->GetSize();
-            } else {
-                ctrl = MakeControlMessageWithPmr<PostBuffer>(fControlMemPool);
-                ctrl->msg.postBuffer.size = msg->GetSize();
-            }
+    auto size = msg->GetSize();

-            // Send control message
-            boost::asio::mutable_buffer ctrlMsg(ctrl.get(), sizeof(ControlMessage));
+    // LOG(debug) << "OFI transport (" << fId << "):       OnSend: data=" << msg->GetData() << ",size=" << msg->GetSize();

-            if (fNeedOfiMemoryRegistration) {
-                asiofi::memory_region mr(*fOfiDomain, ctrlMsg, asiofi::mr::access::send);
-                auto desc = mr.desc();
-                fControlEndpoint->send(ctrlMsg,
-                                       desc,
-                                       [&, ctrl2 = std::move(ctrlMsg), mr2 = std::move(mr)](
-                                           boost::asio::mutable_buffer) mutable {});
-            } else {
-                fControlEndpoint->send(
-                    ctrlMsg, [&, ctrl2 = std::move(ctrl)](boost::asio::mutable_buffer) mutable {});
-            }
+    boost::asio::mutable_buffer buffer(msg->GetData(), size);

-            // Send data message
-            const auto size = msg->GetSize();
+    if (fNeedOfiMemoryRegistration) {
+        asiofi::memory_region mr(*fOfiDomain, buffer, asiofi::mr::access::send);
+        auto desc = mr.desc();

-            if (size) {
-                boost::asio::mutable_buffer buffer(msg->GetData(), size);
-
-                if (fNeedOfiMemoryRegistration) {
-                    asiofi::memory_region mr(*fOfiDomain, buffer, asiofi::mr::access::send);
-                    auto desc = mr.desc();
-
-                    fDataEndpoint->send(buffer,
-                                        desc,
-                                        [&, size, msg2 = std::move(msg), mr2 = std::move(mr)](
-                                            boost::asio::mutable_buffer) mutable {
-                                            fBytesTx += size;
-                                            fMessagesTx++;
-                                            fSendPushSem.signal();
-                                        });
-                } else {
-                    fDataEndpoint->send(
-                        buffer, [&, size, msg2 = std::move(msg)](boost::asio::mutable_buffer) mutable {
-                            fBytesTx += size;
-                            fMessagesTx++;
-                            fSendPushSem.signal();
-                        });
+        fDataEndpoint->send(buffer, desc, [&, size, msg2 = move(msg), mr2 = move(mr)](boost::asio::mutable_buffer) mutable {
+            // LOG(debug) << "OFI transport (" << fId << "): >>>>> Data buffer sent";
+            fBytesTx += size;
+            fMessagesTx++;
+            fSendSem.async_signal([&](const boost::system::error_code& ec) {
+                if (!ec) {
+                    // LOG(debug) << "OFI transport (" << fId << "):     > Signal fSendSem=" << fSendSem.get_value();
                }
-            } else {
-                ++fMessagesTx;
-                fSendPushSem.signal();
-            }
-        }
+            });
+        });
+    } else {
+        fDataEndpoint->send(buffer, [&, size, msg2 = move(msg)](boost::asio::mutable_buffer) mutable {
+            // LOG(debug) << "OFI transport (" << fId << "): >>>>> Data buffer sent";
+            fBytesTx += size;
+            fMessagesTx++;
+            fSendSem.async_signal([&](const boost::system::error_code& ec) {
+                if (!ec) {
+                    // LOG(debug) << "OFI transport (" << fId << "):     > Signal fSendSem=" << fSendSem.get_value();
+                }
+            });
+        });
+    }

-        boost::asio::dispatch(fContext.GetIoContext(), std::bind(&Socket::SendQueueReader, this));
-    });
-}
-
-auto Socket::SendQueueReaderStatic() -> void
-{
-    fSendPopSem.async_wait([&] {
-        // Read msg from send queue
-        std::unique_lock<std::mutex> lk(fSendQueueMutex);
-        std::vector<MessagePtr> msgVec(std::move(fSendQueue.front()));
-        fSendQueue.pop();
-        lk.unlock();
-
-        bool postMultiPartStartBuffer = msgVec.size() > 1;
-        if (postMultiPartStartBuffer) {
-            throw SocketError{tools::ToString("Multipart API not supported in static size mode.")};
-        }
-
-        MessagePtr& msg = msgVec[0];
-
-        // Send data message
-        const auto size = msg->GetSize();
-
-        if (size) {
-            boost::asio::mutable_buffer buffer(msg->GetData(), size);
-
-            if (fNeedOfiMemoryRegistration) {
-                asiofi::memory_region mr(*fOfiDomain, buffer, asiofi::mr::access::send);
-                auto desc = mr.desc();
-
-                fDataEndpoint->send(buffer,
-                                    desc,
-                                    [&, size, msg2 = std::move(msg), mr2 = std::move(mr)](
-                                        boost::asio::mutable_buffer) mutable {
-                                        fBytesTx += size;
-                                        fMessagesTx++;
-                                        fSendPushSem.signal();
-                                    });
-            } else {
-                fDataEndpoint->send(
-                    buffer, [&, size, msg2 = std::move(msg)](boost::asio::mutable_buffer) mutable {
-                        fBytesTx += size;
-                        fMessagesTx++;
-                        fSendPushSem.signal();
-                    });
-            }
-        } else {
-            ++fMessagesTx;
-            fSendPushSem.signal();
-        }
-
-        boost::asio::dispatch(fContext.GetIoContext(), std::bind(&Socket::SendQueueReaderStatic, this));
-    });
+    // LOG(debug) << "OFI transport (" << fId << "): LEAVE OnSend";
 }

 auto Socket::Receive(MessagePtr& msg, const int /*timeout*/) -> int
 try {
-    // timeout argument not yet implemented
+    // LOG(debug) << "OFI transport (" << fId << "): ENTER Receive";
+    azmq::message zmsg;
+    auto recv = fRecvQueueRead.receive(zmsg);

-    fRecvPopSem.wait();
-    {
-        std::lock_guard<std::mutex> lk(fRecvQueueMutex);
-        msg = std::move(fRecvQueue.front().front());
-        fRecvQueue.pop();
+    size_t size = 0;
+    if (recv > 0) {
+        msg = move(*(static_cast<MessagePtr*>(zmsg.buffer().data())));
+        size = msg->GetSize();
    }
-    fRecvPushSem.signal();

-    int size(msg->GetSize());
    fBytesRx += size;
-    ++fMessagesRx;
+    fMessagesRx++;

+    // LOG(debug) << "OFI transport (" << fId << "): LEAVE Receive";
    return size;
-} catch (const std::exception& e) {
+} catch (const exception& e) {
    LOG(error) << e.what();
    return -1;
+} catch (const boost::system::error_code& e) {
+    LOG(error) << e;
+    return -1;
 }

-auto Socket::Receive(std::vector<MessagePtr>& msgVec, const int /*timeout*/) -> int64_t
-try {
-    // timeout argument not yet implemented
-
-    fRecvPopSem.wait();
-    {
-        std::lock_guard<std::mutex> lk(fRecvQueueMutex);
-        msgVec = std::move(fRecvQueue.front());
-        fRecvQueue.pop();
-    }
-    fRecvPushSem.signal();
-
-    int64_t size(0);
-    for (auto& msg : msgVec) {
-        size += msg->GetSize();
-    } 
-    fBytesRx += size;
-    ++fMessagesRx;
-
-    return size; 
-} catch (const std::exception& e) {
-    LOG(error) << e.what();
-    return -1;
+auto Socket::Receive(vector<MessagePtr>& msgVec, const int timeout) -> int64_t
+{
+    return ReceiveImpl(msgVec, 0, timeout);
 }

-auto Socket::RecvControlQueueReader() -> void
+auto Socket::RecvQueueReader() -> void
 {
-    fRecvPushSem.async_wait([&] {
-        // Receive control message
-        ofi::unique_ptr<ControlMessage> ctrl(MakeControlMessageWithPmr<Empty>(fControlMemPool));
-        boost::asio::mutable_buffer ctrlMsg(ctrl.get(), sizeof(ControlMessage));
+    fRecvSem.async_wait([&](const boost::system::error_code& ec) {
+        if (!ec) {
+            static size_t size = fContext.GetSizeHint(); // temporary hack to provide expected message size for receive

-        if (fNeedOfiMemoryRegistration) {
-            asiofi::memory_region mr(*fOfiDomain, ctrlMsg, asiofi::mr::access::recv);
-            auto desc = mr.desc();
-
-            fControlEndpoint->recv(
-                ctrlMsg,
-                desc,
-                [&, ctrl2 = std::move(ctrl), mr2 = std::move(mr)](
-                    boost::asio::mutable_buffer) mutable { OnRecvControl(std::move(ctrl2)); });
-        } else {
-            fControlEndpoint->recv(
-                ctrlMsg, [&, ctrl2 = std::move(ctrl)](boost::asio::mutable_buffer) mutable {
-                    OnRecvControl(std::move(ctrl2));
-                });
-        }
-    });
-}
-
-auto Socket::OnRecvControl(ofi::unique_ptr<ControlMessage> ctrl) -> void
-{
-    // Check control message type
-    auto size(0);
-    if (ctrl->type == ControlMessageType::PostMultiPartStartBuffer) {
-        size = ctrl->msg.postMultiPartStartBuffer.size;
-        if (fMultiPartRecvCounter == -1) {
-            fMultiPartRecvCounter = ctrl->msg.postMultiPartStartBuffer.numParts;
-            assert(fInflightMultiPartMessage.empty());
-            fInflightMultiPartMessage.reserve(ctrl->msg.postMultiPartStartBuffer.numParts);
-        } else {
-            throw SocketError{tools::ToString(
-                "OFI transport: Received control start of new multi part message without completed "
-                "reception of previous multi part message. Number of parts missing: ",
-                fMultiPartRecvCounter)};
-        }
-    } else if (ctrl->type == ControlMessageType::PostBuffer) {
-        size = ctrl->msg.postBuffer.size;
-    } else {
-        throw SocketError{tools::ToString("OFI transport: Unknown control message type: '",
-                                          static_cast<int>(ctrl->type))};
-    }
-
-    // Receive data
-    auto msg = fContext.MakeReceiveMessage(size);
-
-    if (size) {
-        boost::asio::mutable_buffer buffer(msg->GetData(), size);
-
-        if (fNeedOfiMemoryRegistration) {
-            asiofi::memory_region mr(*fOfiDomain, buffer, asiofi::mr::access::recv);
-            auto desc = mr.desc();
-
-            fDataEndpoint->recv(
-                buffer,
-                desc,
-                [&, msg2 = std::move(msg), mr2 = std::move(mr)](
-                    boost::asio::mutable_buffer) mutable { DataMessageReceived(std::move(msg2)); });
-
-        } else {
-            fDataEndpoint->recv(buffer,
-                                [&, msg2 = std::move(msg)](boost::asio::mutable_buffer) mutable {
-                                    DataMessageReceived(std::move(msg2));
-                                });
-        }
-    } else {
-        DataMessageReceived(std::move(msg));
-    }
-
-    boost::asio::dispatch(fContext.GetIoContext(),
-                          std::bind(&Socket::RecvControlQueueReader, this));
-}
-
-auto Socket::RecvQueueReaderStatic() -> void
-{
-    fRecvPushSem.async_wait([&] {
-        static size_t size = fContext.GetSizeHint();
-        // Receive data
-        auto msg = fContext.MakeReceiveMessage(size);
-
-        if (size) {
+            auto msg = fContext.MakeReceiveMessage(size);
            boost::asio::mutable_buffer buffer(msg->GetData(), size);

            if (fNeedOfiMemoryRegistration) {
                asiofi::memory_region mr(*fOfiDomain, buffer, asiofi::mr::access::recv);
                auto desc = mr.desc();

-                fDataEndpoint->recv(buffer,
-                                    desc,
-                                    [&, msg2 = std::move(msg), mr2 = std::move(mr)](
-                                        boost::asio::mutable_buffer) mutable {
-                                        DataMessageReceived(std::move(msg2));
-                                    });
-
-            } else {
-                fDataEndpoint->recv(
-                    buffer, [&, msg2 = std::move(msg)](boost::asio::mutable_buffer) mutable {
-                        DataMessageReceived(std::move(msg2));
+                fDataEndpoint->recv(buffer, desc, [&, msg2 = move(msg), mr2 = move(mr)](boost::asio::mutable_buffer) mutable {
+                    MessagePtr* msgptr(new std::unique_ptr<Message>(move(msg2)));
+                    fRecvQueueWrite.async_send(azmq::message(boost::asio::const_buffer(msgptr, sizeof(MessagePtr))), [&](const boost::system::error_code& ec2, size_t /*bytes_transferred2*/) {
+                        if (!ec2) {
+                            // LOG(debug) << "OFI transport (" << fId << "): <<<<< Data buffer received, bytes_transferred2=" << bytes_transferred2;
+                            fRecvSem.async_signal([&](const boost::system::error_code& ec3) {
+                                if (!ec3) {
+                                    // LOG(debug) << "OFI transport (" << fId << "):     < Signal fRecvSem";
+                                }
+                            });
+                        }
                    });
+                });
+            } else {
+                fDataEndpoint->recv(buffer, [&, msg2 = move(msg)](boost::asio::mutable_buffer) mutable {
+                    MessagePtr* msgptr(new std::unique_ptr<Message>(move(msg2)));
+                    fRecvQueueWrite.async_send(azmq::message(boost::asio::const_buffer(msgptr, sizeof(MessagePtr))), [&](const boost::system::error_code& ec2, size_t /*bytes_transferred2*/) {
+                        if (!ec2) {
+                            // LOG(debug) << "OFI transport (" << fId << "): <<<<< Data buffer received, bytes_transferred2=" << bytes_transferred2;
+                            fRecvSem.async_signal([&](const boost::system::error_code& ec3) {
+                                if (!ec3) {
+                                    // LOG(debug) << "OFI transport (" << fId << "):     < Signal fRecvSem";
+                                }
+                            });
+                        }
+                    });
+                });
            }
-        } else {
-            DataMessageReceived(std::move(msg));
-        }

-        boost::asio::dispatch(fContext.GetIoContext(),
-                              std::bind(&Socket::RecvQueueReaderStatic, this));
+            boost::asio::post(fContext.GetIoContext(), bind(&Socket::RecvQueueReader, this));
+        }
    });
 }

-auto Socket::DataMessageReceived(MessagePtr msg) -> void
+auto Socket::Send(vector<MessagePtr>& msgVec, const int timeout) -> int64_t
 {
-    if (fMultiPartRecvCounter > 0) {
-        --fMultiPartRecvCounter;
-        fInflightMultiPartMessage.push_back(std::move(msg));
-    }
+    return SendImpl(msgVec, 0, timeout);
+}

-    if (fMultiPartRecvCounter == 0) {
-        std::unique_lock<std::mutex> lk(fRecvQueueMutex);
-        fRecvQueue.push(std::move(fInflightMultiPartMessage));
-        lk.unlock();
-        fMultiPartRecvCounter = -1;
-        fRecvPopSem.signal();
-    } else if (fMultiPartRecvCounter == -1) {
-        std::vector<MessagePtr> msgVec;
-        msgVec.push_back(std::move(msg));
-        std::unique_lock<std::mutex> lk(fRecvQueueMutex);
-        fRecvQueue.push(std::move(msgVec));
-        lk.unlock();
-        fRecvPopSem.signal();
-    }
+auto Socket::SendImpl(vector<FairMQMessagePtr>& /*msgVec*/, const int /*flags*/, const int /*timeout*/) -> int64_t 
+{
+    throw SocketError{"Not yet implemented."};
+}

+auto Socket::ReceiveImpl(vector<FairMQMessagePtr>& /*msgVec*/, const int /*flags*/, const int /*timeout*/) -> int64_t
+{
+    throw SocketError{"Not yet implemented."};
 }

 auto Socket::Close() -> void {}
@@ -615,62 +359,121 @@ auto Socket::GetOption(const string& /*option*/, void* /*value*/, size_t* /*valu

 void Socket::SetLinger(const int /*value*/)
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::linger opt(value);
+    // fControlEndpoint.set_option(opt);
 }

 int Socket::GetLinger() const
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::linger opt(0);
+    // fControlEndpoint.get_option(opt);
+    // return opt.value();
    return 0;
 }

 void Socket::SetSndBufSize(const int /*value*/)
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::snd_hwm opt(value);
+    // fControlEndpoint.set_option(opt);
 }

 int Socket::GetSndBufSize() const
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::snd_hwm opt(0);
+    // fControlEndpoint.get_option(opt);
+    // return opt.value();
    return 0;
 }

 void Socket::SetRcvBufSize(const int /*value*/)
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::rcv_hwm opt(value);
+    // fControlEndpoint.set_option(opt);
 }

 int Socket::GetRcvBufSize() const
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::rcv_hwm opt(0);
+    // fControlEndpoint.get_option(opt);
+    // return opt.value();
    return 0;
 }

 void Socket::SetSndKernelSize(const int /*value*/)
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::snd_buf opt(value);
+    // fControlEndpoint.set_option(opt);
 }

 int Socket::GetSndKernelSize() const
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::snd_buf opt(0);
+    // fControlEndpoint.get_option(opt);
+    // return opt.value();
    return 0;
 }

 void Socket::SetRcvKernelSize(const int /*value*/)
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::rcv_buf opt(value);
+    // fControlEndpoint.set_option(opt);
 }

 int Socket::GetRcvKernelSize() const
 {
-    LOG(debug) << "OFI transport (" << fId << "): Not yet implemented.";
+    // azmq::socket::rcv_buf opt(0);
+    // fControlEndpoint.get_option(opt);
+    // return opt.value();
    return 0;
 }

-auto Socket::GetConstant(const string& /*constant*/) -> int
+auto Socket::GetConstant(const string& constant) -> int
 {
-    LOG(debug) << "OFI transport: Not yet implemented.";
+    if (constant == "")
+        return 0;
+    if (constant == "sub")
+        return ZMQ_SUB;
+    if (constant == "pub")
+        return ZMQ_PUB;
+    if (constant == "xsub")
+        return ZMQ_XSUB;
+    if (constant == "xpub")
+        return ZMQ_XPUB;
+    if (constant == "push")
+        return ZMQ_PUSH;
+    if (constant == "pull")
+        return ZMQ_PULL;
+    if (constant == "req")
+        return ZMQ_REQ;
+    if (constant == "rep")
+        return ZMQ_REP;
+    if (constant == "dealer")
+        return ZMQ_DEALER;
+    if (constant == "router")
+        return ZMQ_ROUTER;
+    if (constant == "pair")
+        return ZMQ_PAIR;
+
+    if (constant == "snd-hwm")
+        return ZMQ_SNDHWM;
+    if (constant == "rcv-hwm")
+        return ZMQ_RCVHWM;
+    if (constant == "snd-size")
+        return ZMQ_SNDBUF;
+    if (constant == "rcv-size")
+        return ZMQ_RCVBUF;
+    if (constant == "snd-more")
+        return ZMQ_SNDMORE;
+    if (constant == "rcv-more")
+        return ZMQ_RCVMORE;
+
+    if (constant == "linger")
+        return ZMQ_LINGER;
+    if (constant == "no-block")
+        return ZMQ_DONTWAIT;
+    if (constant == "snd-more no-block")
+        return ZMQ_DONTWAIT|ZMQ_SNDMORE;
+
    return -1;
 }

--- a/fairmq/ofi/Socket.h
+++ b/fairmq/ofi/Socket.h
@@ -18,10 +18,10 @@
 #include <asiofi/memory_resources.hpp>
 #include <asiofi/passive_endpoint.hpp>
 #include <asiofi/semaphore.hpp>
+#include <azmq/socket.hpp>
 #include <boost/asio.hpp>
 #include <memory> // unique_ptr
-#include <mutex>
-
+#include <netinet/in.h>

 namespace fair
 {
@@ -82,12 +82,11 @@ class Socket final : public fair::mq::Socket

  private:
    Context& fContext;
-    asiofi::allocated_pool_resource fControlMemPool;
    std::unique_ptr<asiofi::info> fOfiInfo;
    std::unique_ptr<asiofi::fabric> fOfiFabric;
    std::unique_ptr<asiofi::domain> fOfiDomain;
    std::unique_ptr<asiofi::passive_endpoint> fPassiveEndpoint;
-    std::unique_ptr<asiofi::connected_endpoint> fDataEndpoint, fControlEndpoint;
+    std::unique_ptr<asiofi::connected_endpoint> fDataEndpoint;
    std::string fId;
    std::atomic<unsigned long> fBytesTx;
    std::atomic<unsigned long> fBytesRx;
@@ -97,24 +96,22 @@ class Socket final : public fair::mq::Socket
    Address fLocalAddr;
    int fSndTimeout;
    int fRcvTimeout;
-    std::mutex fSendQueueMutex, fRecvQueueMutex;
-    std::queue<std::vector<MessagePtr>> fSendQueue, fRecvQueue;
-    std::vector<MessagePtr> fInflightMultiPartMessage;
-    int64_t fMultiPartRecvCounter;
-    asiofi::synchronized_semaphore fSendPushSem, fSendPopSem, fRecvPushSem, fRecvPopSem;
+    azmq::socket fRecvQueueWrite, fRecvQueueRead;
+    asiofi::semaphore fSendSem, fRecvSem;
    std::atomic<bool> fNeedOfiMemoryRegistration;
+    std::atomic<bool> fBound;
+    std::atomic<bool> fConnected;

+    auto OnSend(MessagePtr& msg) -> void;
+    auto RecvQueueReader() -> void;
+    auto ReceiveImpl(MessagePtr& msg, const int flags, const int timeout) -> int;
+    auto SendImpl(std::vector<MessagePtr>& msgVec, const int flags, const int timeout) -> int64_t;
+    auto ReceiveImpl(std::vector<MessagePtr>& msgVec, const int flags, const int timeout) -> int64_t;
+
+    // auto WaitForControlPeer() -> void;
+    // auto AnnounceDataAddress() -> void;
    auto InitOfi(Address addr) -> void;
-    auto BindControlEndpoint() -> void;
-    auto BindDataEndpoint() -> void;
-    enum class Band { Control, Data };
-    auto ConnectEndpoint(std::unique_ptr<asiofi::connected_endpoint>& endpoint, Band type) -> void;
-    auto SendQueueReader() -> void;
-    auto SendQueueReaderStatic() -> void;
-    auto RecvControlQueueReader() -> void;
-    auto RecvQueueReaderStatic() -> void;
-    auto OnRecvControl(ofi::unique_ptr<ControlMessage> ctrl) -> void;
-    auto DataMessageReceived(MessagePtr msg) -> void;
+    // auto ReceiveDataAddressAnnouncement() -> void;
 }; /* class Socket */

 struct SilentSocketError : SocketError { using SocketError::SocketError; };
--- a/fairmq/ofi/TransportFactory.cxx
+++ b/fairmq/ofi/TransportFactory.cxx
@@ -27,10 +27,10 @@ TransportFactory::TransportFactory(const string& id, const FairMQProgOptions* co
 try : FairMQTransportFactory(id)
    , fContext(*this, *this, 1)
 {
-    LOG(debug) << "OFI transport: asiofi (" << fContext.GetAsiofiVersion() << ")";
-
+    LOG(debug) << "OFI transport: Using AZMQ & "
+               << "asiofi (" << fContext.GetAsiofiVersion() << ")";
    if (config) {
-        fContext.SetSizeHint(config->GetValue<size_t>("ofi-size-hint"));
+        fContext.SetSizeHint(config->GetValue<size_t>("ofi-size-hint")); // temporary hack to provide expected message size for receive
    }
 } catch (ContextError& e) {
    throw TransportFactoryError{e.what()};
--- a/fairmq/options/FairMQProgOptions.cxx
+++ b/fairmq/options/FairMQProgOptions.cxx
@@ -66,7 +66,7 @@ FairMQProgOptions::FairMQProgOptions()
        ("print-channels",         po::value<bool    >()->implicit_value(true),      "Print registered channel endpoints in a machine-readable format (<channel name>:<min num subchannels>:<max num subchannels>)")
        ("shm-segment-size",       po::value<size_t  >()->default_value(2000000000), "Shared memory: size of the shared memory segment (in bytes).")
        ("shm-monitor",            po::value<bool    >()->default_value(true),       "Shared memory: run monitor daemon.")
-        ("ofi-size-hint",          po::value<size_t  >()->default_value(0),          "EXPERIMENTAL: OFI size hint for the allocator.")
+        ("ofi-size-hint",          po::value<size_t  >()->default_value(2000000),    "EXPERIMENTAL: OFI size hint for the allocator.")
        ("rate",                   po::value<float   >()->default_value(0.),         "Rate for conditional run loop (Hz).")
        ("session",                po::value<string  >()->default_value("default"),  "Session name.");

--- a/fairmq/plugins/Control.cxx
+++ b/fairmq/plugins/Control.cxx
@@ -29,7 +29,8 @@ namespace
        ++gSignalCount;
        gLastSignal = signal;

-        if (gSignalCount > 1) {
+        if (gSignalCount > 1)
+        {
            std::abort();
        }
    }
@@ -56,18 +57,11 @@ Control::Control(const string& name, const Plugin::Version version, const string
 {
    SubscribeToDeviceStateChange([&](DeviceState newState) {
        LOG(trace) << "control plugin notified on new state: " << newState;
-
        {
            lock_guard<mutex> lock{fEventsMutex};
            fEvents.push(newState);
        }
        fNewEvent.notify_one();
-
-        if (newState == DeviceState::Error) {
-            fPluginShutdownRequested = true;
-            fDeviceShutdownRequested = true;
-            // throw DeviceErrorState("Controlled device transitioned to error state.");
-        }
    });

    try {
@@ -116,25 +110,6 @@ auto Control::RunStartupSequence() -> void
    while (WaitForNextState() != DeviceState::Running) {}
 }

-auto Control::WaitForNextState() -> DeviceState
-{
-    unique_lock<mutex> lock{fEventsMutex};
-    while (fEvents.empty()) {
-        fNewEvent.wait_for(lock, chrono::milliseconds(50));
-    }
-
-    auto result = fEvents.front();
-
-    if (result == DeviceState::Error) {
-        ReleaseDeviceControl();
-        throw DeviceErrorState("Controlled device transitioned to error state.");
-    }
-
-    fEvents.pop();
-
-    return result;
-}
-
 auto ControlPluginProgramOptions() -> Plugin::ProgOptions
 {
    namespace po = boost::program_options;
@@ -189,7 +164,7 @@ try {
    bool keepRunning = true;

    while (keepRunning) {
-        if (poll(cinfd, 1, 100)) {
+        if (poll(cinfd, 1, 500)) {
            if (fDeviceShutdownRequested) {
                break;
            }
@@ -203,10 +178,9 @@ try {
                break;
                case 'i':
                    cout << "\n --> [i] init device\n\n" << flush;
-                    if (ChangeDeviceState(DeviceStateTransition::InitDevice)) {
-                        while (WaitForNextState() != DeviceState::InitializingDevice) {}
-                        ChangeDeviceState(DeviceStateTransition::CompleteInit);
-                    }
+                    ChangeDeviceState(DeviceStateTransition::InitDevice);
+                    while (WaitForNextState() != DeviceState::InitializingDevice) {}
+                    ChangeDeviceState(DeviceStateTransition::CompleteInit);
                break;
                case 'b':
                    cout << "\n --> [b] bind\n\n" << flush;
@@ -274,7 +248,6 @@ try {
        }

        if (GetCurrentDeviceState() == DeviceState::Error) {
-            ReleaseDeviceControl();
            throw DeviceErrorState("Controlled device transitioned to error state.");
        }

@@ -325,13 +298,13 @@ void Control::PrintStateMachineColor()
       << " ║ \033[01;33mINITIALIZING DEVICE\033[0m ║ ║  \033[01;33mRESETTING DEVICE\033[0m  ║ \n"
       << " ╚══════════╦══════════╝ ╚════════ ▲ ═════════╝ \n"
       << " ┌───────── ▼ ─────────┐           │  ┌────────────────────────────┐ \n"
-       << " │     \033[01;36mINITIALIZED\033[0m    [\033[01;32md\033[0m]──────────┤  │ Legend:                    │ \n"
+       << " │     \033[01;36mINITIALIZED\033[0m     │           │  │ Legend:                    │ \n"
       << " └─────────[\033[01;32mb\033[0m]─────────┘           │  │----------------------------│ \n"
       << " ╔═════════ ▼ ═════════╗           │  │ [\033[01;32mk\033[0m] keyboard shortcut for  │ \n"
       << " ║       \033[01;33mBINDING\033[0m       ║           │  │     interactive controller │ \n"
       << " ╚══════════╦══════════╝           │  │ ┌────────────────────────┐ │ \n"
       << " ┌───────── ▼ ─────────┐           │  │ │      \033[01;36mIDLING STATE\033[0m      │ │ \n"
-       << " │        \033[01;36mBOUND\033[0m       [\033[01;32md\033[0m]──────────┤  │ └────────────────────────┘ │ \n"
+       << " │        \033[01;36mBOUND\033[0m        │           │  │ └────────────────────────┘ │ \n"
       << " └─────────[\033[01;32mx\033[0m]─────────┘           │  │ ╔════════════════════════╗ │ \n"
       << " ╔═════════ ▼ ═════════╗           │  │ ║      \033[01;33mWORKING STATE\033[0m     ║ │ \n"
       << " ║     \033[01;33mCONNECTING\033[0m      ║           │  │ ╚════════════════════════╝ │ \n"
@@ -363,13 +336,13 @@ void Control::PrintStateMachine()
       << " ║ INITIALIZING DEVICE ║ ║  RESETTING DEVICE  ║                      \n"
       << " ╚══════════╦══════════╝ ╚════════ ▲ ═════════╝                      \n"
       << " ┌───────── ▼ ─────────┐           │  ┌────────────────────────────┐ \n"
-       << " │     INITIALIZED    [d]──────────┤  │ Legend:                    │ \n"
+       << " │     INITIALIZED     │           │  │ Legend:                    │ \n"
       << " └─────────[b]─────────┘           │  │----------------------------│ \n"
       << " ╔═════════ ▼ ═════════╗           │  │ [k] keyboard shortcut for  │ \n"
       << " ║       BINDING       ║           │  │     interactive controller │ \n"
       << " ╚══════════╦══════════╝           │  │ ┌────────────────────────┐ │ \n"
       << " ┌───────── ▼ ─────────┐           │  │ │      IDLING STATE      │ │ \n"
-       << " │        BOUND       [d]──────────┤  │ └────────────────────────┘ │ \n"
+       << " │        BOUND        │           │  │ └────────────────────────┘ │ \n"
       << " └─────────[x]─────────┘           │  │ ╔════════════════════════╗ │ \n"
       << " ╔═════════ ▼ ═════════╗           │  │ ║      WORKING STATE     ║ │ \n"
       << " ║     CONNECTING      ║           │  │ ╚════════════════════════╝ │ \n"
@@ -390,38 +363,64 @@ void Control::PrintStateMachine()
    cout << ss.str() << flush;
 }

+auto Control::WaitForNextState() -> DeviceState
+{
+    unique_lock<mutex> lock{fEventsMutex};
+    while (fEvents.empty()) {
+        fNewEvent.wait_for(lock, chrono::milliseconds(50));
+    }
+
+    auto result = fEvents.front();
+
+    if (result == DeviceState::Error) {
+        throw DeviceErrorState("Controlled device transitioned to error state.");
+    }
+
+    fEvents.pop();
+
+    return result;
+}
+
 auto Control::StaticMode() -> void
-try {
+try
+{
    RunStartupSequence();

    {
        // Wait for next state, which is DeviceState::Ready,
        // or for device shutdown request (Ctrl-C)
        unique_lock<mutex> lock{fEventsMutex};
-        while (fEvents.empty() && !fDeviceShutdownRequested) {
+        while (fEvents.empty() && !fDeviceShutdownRequested)
+        {
            fNewEvent.wait_for(lock, chrono::milliseconds(50));
        }

-        if (fEvents.front() == DeviceState::Error) {
-            ReleaseDeviceControl();
+        if (fEvents.front() == DeviceState::Error)
+        {
            throw DeviceErrorState("Controlled device transitioned to error state.");
        }
    }

    RunShutdownSequence();
-} catch (PluginServices::DeviceControlError& e) {
+}
+catch (PluginServices::DeviceControlError& e)
+{
    // If we are here, it means another plugin has taken control. That's fine, just print the exception message and do nothing else.
    LOG(debug) << e.what();
-} catch (DeviceErrorState&) {
+}
+catch (DeviceErrorState&)
+{
 }

 auto Control::SignalHandler() -> void
 {
-    while (gSignalCount == 0 && !fPluginShutdownRequested) {
+    while (gSignalCount == 0 && !fPluginShutdownRequested)
+    {
        this_thread::sleep_for(chrono::milliseconds(100));
    }

-    if (!fPluginShutdownRequested) {
+    if (!fPluginShutdownRequested)
+    {
        LOG(info) << "Received device shutdown request (signal " << gLastSignal << ").";
        LOG(info) << "Waiting for graceful device shutdown. Hit Ctrl-C again to abort immediately.";

@@ -432,14 +431,20 @@ auto Control::SignalHandler() -> void
            if (fControllerThread.joinable()) fControllerThread.join();
        }

-        if (!fDeviceHasShutdown) {
+        if (!fDeviceHasShutdown)
+        {
            // Take over control and attempt graceful shutdown
            StealDeviceControl();
-            try {
+            try
+            {
                RunShutdownSequence();
-            } catch (PluginServices::DeviceControlError& e) {
+            }
+            catch (PluginServices::DeviceControlError& e)
+            {
                LOG(info) << "Graceful device shutdown failed: " << e.what() << " If hanging, hit Ctrl-C again to abort immediately.";
-            } catch (...) {
+            }
+            catch (...)
+            {
                LOG(info) << "Graceful device shutdown failed. If hanging, hit Ctrl-C again to abort immediately.";
            }
        }
--- a/fairmq/plugins/DDS/CMakeLists.txt
+++ b/fairmq/plugins/DDS/CMakeLists.txt
@@ -8,13 +8,13 @@

 set(plugin FairMQPlugin_dds)
 add_library(${plugin} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/DDS.cxx ${CMAKE_CURRENT_SOURCE_DIR}/DDS.h)
-target_link_libraries(${plugin} FairMQ DDS::dds_intercom_lib DDS::dds_protocol_lib)
+target_link_libraries(${plugin} FairMQ DDS::dds_intercom_lib DDS::dds_protocol_lib DDS::dds-user-defaults)
 target_include_directories(${plugin} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 set_target_properties(${plugin} PROPERTIES CXX_VISIBILITY_PRESET hidden)

 set(exe fairmq-dds-command-ui)
 add_executable(${exe} ${CMAKE_CURRENT_SOURCE_DIR}/runDDSCommandUI.cxx)
-target_link_libraries(${exe} FairMQ DDS::dds_intercom_lib DDS::dds_protocol_lib)
+target_link_libraries(${exe} FairMQ DDS::dds_intercom_lib DDS::dds_protocol_lib DDS::dds-user-defaults)
 target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

 install(TARGETS ${plugin} ${exe}
--- a/fairmq/plugins/DDS/DDS.h
+++ b/fairmq/plugins/DDS/DDS.h
@@ -11,7 +11,7 @@

 #include <fairmq/Plugin.h>

-#include <DDS/dds_intercom.h>
+#include <dds_intercom.h>

 #include <condition_variable>
 #include <mutex>
--- a/fairmq/plugins/DDS/runDDSCommandUI.cxx
+++ b/fairmq/plugins/DDS/runDDSCommandUI.cxx
@@ -6,7 +6,7 @@
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/

-#include <DDS/dds_intercom.h>
+#include <dds_intercom.h>

 #include <termios.h> // raw mode console input

--- a/fairmq/run/startMQBenchmark.sh.in
+++ b/fairmq/run/startMQBenchmark.sh.in
@@ -72,6 +72,7 @@ SINK+=" --id sink1"
 #SINK+=" --io-threads 2"
 #SINK+=" --control static"
 SINK+=" --transport $transport"
+SINK+=" --ofi-size-hint $msgSize"
 SINK+=" --severity debug"
 SINK+=" --multipart false"
 SINK+=" --max-iterations $maxIterations"
--- a/fairmq/shmem/FairMQMessageSHM.cxx
+++ b/fairmq/shmem/FairMQMessageSHM.cxx
@@ -327,19 +327,50 @@ void FairMQMessageSHM::CloseMessage()
        }
        else
        {
-            if (!fRegionPtr)
-            {
-                fRegionPtr = fManager.GetRemoteRegion(fRegionId);
-            }
+            // send notification back to the receiver
+            // RegionBlock block(fHandle, fSize);
+            // if (fManager.GetRegionQueue(fRegionId).try_send(static_cast<void*>(&block), sizeof(RegionBlock), 0))
+            // {
+            //     // LOG(info) << "true";
+            // }
+            // // else
+            // // {
+            // //     LOG(debug) << "could not send ack";
+            // // }

-            if (fRegionPtr)
+            // timed version
+            RegionBlock block(fHandle, fSize, fHint);
+            bool success = false;
+            do
            {
-                fRegionPtr->ReleaseBlock({fHandle, fSize, fHint});
-            }
-            else
-            {
-                LOG(warn) << "region ack queue for id " << fRegionId << " no longer exist. Not sending ack";
+                auto sndTill = bpt::microsec_clock::universal_time() + bpt::milliseconds(200);
+                if (!fRegionPtr)
+                {
+                    fRegionPtr = fManager.GetRemoteRegion(fRegionId);
+                }
+                if (fRegionPtr)
+                {
+                    // LOG(debug) << "sending ack";
+                    if (fRegionPtr->fQueue->timed_send(&block, sizeof(RegionBlock), 0, sndTill))
+                    {
+                        success = true;
+                    }
+                    else
+                    {
+                        if (fInterrupted)
+                        {
+                            break;
+                        }
+                        LOG(debug) << "region ack queue is full, retrying...";
+                    }
+                }
+                else
+                {
+                    // LOG(warn) << "region ack queue for id " << fRegionId << " no longer exist. Not sending ack";
+                    success = true;
+                }
            }
+            while (!success);
        }
    }

--- a/fairmq/shmem/Manager.cxx
+++ b/fairmq/shmem/Manager.cxx
@@ -19,7 +19,7 @@ namespace mq
 namespace shmem
 {

-std::unordered_map<uint64_t, std::unique_ptr<Region>> Manager::fRegions;
+std::unordered_map<uint64_t, Region> Manager::fRegions;

 Manager::Manager(const string& name, size_t size)
    : fSessionName(name)
@@ -43,7 +43,7 @@ void Manager::Resume()
    // close remote regions before processing new transfers
    for (auto it = fRegions.begin(); it != fRegions.end(); /**/)
    {
-        if (it->second->fRemote)
+        if (it->second.fRemote)
        {
           it = fRegions.erase(it);
        }
@@ -64,11 +64,11 @@ bipc::mapped_region* Manager::CreateRegion(const size_t size, const uint64_t id,
    }
    else
    {
-        auto r = fRegions.emplace(id, fair::mq::tools::make_unique<Region>(*this, id, size, false, callback));
+        auto r = fRegions.emplace(id, Region{*this, id, size, false, callback});

-        r.first->second->StartReceivingAcks();
+        r.first->second.StartReceivingAcks();

-        return &(r.first->second->fRegion);
+        return &(r.first->second.fRegion);
    }
 }

@@ -78,14 +78,14 @@ Region* Manager::GetRemoteRegion(const uint64_t id)
    auto it = fRegions.find(id);
    if (it != fRegions.end())
    {
-        return it->second.get();
+        return &(it->second);
    }
    else
    {
        try
        {
-            auto r = fRegions.emplace(id, fair::mq::tools::make_unique<Region>(*this, id, 0, true, nullptr));
-            return r.first->second.get();
+            auto r = fRegions.emplace(id, Region{*this, id, 0, true, nullptr});
+            return &(r.first->second);
        }
        catch (bipc::interprocess_exception& e)
        {
--- a/fairmq/shmem/Manager.h
+++ b/fairmq/shmem/Manager.h
@@ -66,7 +66,7 @@ class Manager
    std::string fManagementSegmentName;
    boost::interprocess::managed_shared_memory fSegment;
    boost::interprocess::managed_shared_memory fManagementSegment;
-    static std::unordered_map<uint64_t, std::unique_ptr<Region>> fRegions;
+    static std::unordered_map<uint64_t, Region> fRegions;
 };

 } // namespace shmem
--- a/fairmq/shmem/Region.cxx
+++ b/fairmq/shmem/Region.cxx
@@ -12,8 +12,6 @@

 #include <boost/date_time/posix_time/posix_time.hpp>

-#include <chrono>
-
 using namespace std;

 namespace bipc = ::boost::interprocess;
@@ -34,8 +32,7 @@ Region::Region(Manager& manager, uint64_t id, uint64_t size, bool remote, FairMQ
    , fQueueName("fmq_" + fManager.fSessionName +"_rgq_" + to_string(id))
    , fShmemObject()
    , fQueue(nullptr)
-    , fReceiveAcksWorker()
-    , fSendAcksWorker()
+    , fWorker()
    , fCallback(callback)
 {
    if (fRemote)
@@ -52,118 +49,52 @@ Region::Region(Manager& manager, uint64_t id, uint64_t size, bool remote, FairMQ
        LOG(debug) << "shmem: created region: " << fName;
        fShmemObject.truncate(size);

-        fQueue = fair::mq::tools::make_unique<bipc::message_queue>(bipc::create_only, fQueueName.c_str(), 1024, fAckBunchSize * sizeof(RegionBlock));
+        fQueue = fair::mq::tools::make_unique<bipc::message_queue>(bipc::create_only, fQueueName.c_str(), 10000, sizeof(RegionBlock));
        LOG(debug) << "shmem: created region queue: " << fQueueName;
    }
    fRegion = bipc::mapped_region(fShmemObject, bipc::read_write); // TODO: add HUGEPAGES flag here
    // fRegion = bipc::mapped_region(fShmemObject, bipc::read_write, 0, 0, 0, MAP_ANONYMOUS | MAP_HUGETLB);
-
-    fSendAcksWorker = std::thread(&Region::SendAcks, this);
 }

 void Region::StartReceivingAcks()
 {
-    fReceiveAcksWorker = std::thread(&Region::ReceiveAcks, this);
+    fWorker = std::thread(&Region::ReceiveAcks, this);
 }

 void Region::ReceiveAcks()
 {
    unsigned int priority;
    bipc::message_queue::size_type recvdSize;
-    std::unique_ptr<RegionBlock[]> blocks = fair::mq::tools::make_unique<RegionBlock[]>(fAckBunchSize);

    while (!fStop) // end thread condition (should exist until region is destroyed)
    {
-        auto rcvTill = bpt::microsec_clock::universal_time() + bpt::milliseconds(500);
-
-        while (fQueue->timed_receive(blocks.get(), fAckBunchSize * sizeof(RegionBlock), recvdSize, priority, rcvTill))
+        auto rcvTill = bpt::microsec_clock::universal_time() + bpt::milliseconds(200);
+        RegionBlock block;
+        if (fQueue->timed_receive(&block, sizeof(RegionBlock), recvdSize, priority, rcvTill))
        {
            // LOG(debug) << "received: " << block.fHandle << " " << block.fSize << " " << block.fMessageId;
            if (fCallback)
            {
-                const auto numBlocks = recvdSize / sizeof(RegionBlock);
-                for (size_t i = 0; i < numBlocks; i++)
-                {
-                    fCallback(reinterpret_cast<char*>(fRegion.get_address()) + blocks[i].fHandle, blocks[i].fSize, reinterpret_cast<void*>(blocks[i].fHint));
-                }
+                fCallback(reinterpret_cast<char*>(fRegion.get_address()) + block.fHandle, block.fSize, reinterpret_cast<void*>(block.fHint));
            }
        }
+        else
+        {
+            // LOG(debug) << "queue " << fQueueName << " timeout!";
+        }
    } // while !fStop

-    LOG(debug) << "receive ack worker for " << fName << " leaving.";
-}
-
-void Region::ReleaseBlock(const RegionBlock &block)
-{
-    std::unique_lock<std::mutex> lock(fBlockLock);
-
-    fBlocksToFree.emplace_back(block);
-
-    if (fBlocksToFree.size() >= fAckBunchSize)
-    {
-        lock.unlock(); // reduces contention on fBlockLock
-        fBlockSendCV.notify_one();
-    }
-}
-
-void Region::SendAcks()
-{
-    std::unique_ptr<RegionBlock[]> blocks = fair::mq::tools::make_unique<RegionBlock[]>(fAckBunchSize);
-
-    while (true) // we'll try to send all acks before stopping
-    {
-        size_t blocksToSend = 0;
-
-        {   // mutex locking block
-            std::unique_lock<std::mutex> lock(fBlockLock);
-
-            // try to get more blocks without waiting (we can miss a notify from CloseMessage())
-            if (!fStop && (fBlocksToFree.size() < fAckBunchSize))
-            {
-                // cv.wait() timeout: send whatever blocks we have
-                fBlockSendCV.wait_for(lock, std::chrono::milliseconds(500));
-            }
-
-            blocksToSend = std::min(fBlocksToFree.size(), fAckBunchSize);
-
-            std::copy_n(fBlocksToFree.end() - blocksToSend, blocksToSend, blocks.get());
-            fBlocksToFree.resize(fBlocksToFree.size() - blocksToSend);
-        } // unlock the block mutex here while sending over IPC
-
-        if (blocksToSend > 0)
-        {
-            while (!fQueue->try_send(blocks.get(), blocksToSend * sizeof(RegionBlock), 0) && !fStop)
-            {
-                // receiver slow? yield and try again...
-                this_thread::yield();
-            }
-        }
-        else // blocksToSend == 0
-        {
-            if (fStop)
-            {
-                break;
-            }
-        }
-    }
-
-    LOG(debug) << "send ack worker for " << fName << " leaving.";
+    LOG(debug) << "worker for " << fName << " leaving.";
 }

 Region::~Region()
 {
-    fStop = true;
-
-    if (fSendAcksWorker.joinable())
-    {
-        fSendAcksWorker.join();
-    }
-
    if (!fRemote)
    {
-        if (fReceiveAcksWorker.joinable())
+        fStop = true;
+        if (fWorker.joinable())
        {
-            fReceiveAcksWorker.join();
+            fWorker.join();
        }

        if (bipc::shared_memory_object::remove(fName.c_str()))
--- a/fairmq/shmem/Region.h
+++ b/fairmq/shmem/Region.h
@@ -19,14 +19,11 @@
 #include "FairMQUnmanagedRegion.h"

 #include <fairmq/Tools.h>
-#include <fairmq/shmem/Common.h>

 #include <boost/interprocess/managed_shared_memory.hpp>
 #include <boost/interprocess/ipc/message_queue.hpp>

 #include <thread>
-#include <mutex>
-#include <condition_variable>
 #include <unordered_map>

 namespace fair
@@ -50,9 +47,6 @@ struct Region
    void StartReceivingAcks();
    void ReceiveAcks();

-    void ReleaseBlock(const RegionBlock &);
-    void SendAcks();
-
    ~Region();

    Manager& fManager;
@@ -62,15 +56,8 @@ struct Region
    std::string fQueueName;
    boost::interprocess::shared_memory_object fShmemObject;
    boost::interprocess::mapped_region fRegion;
-
-    std::mutex fBlockLock;
-    std::condition_variable fBlockSendCV;
-    std::vector<RegionBlock> fBlocksToFree;
-    const std::size_t fAckBunchSize = 256;
    std::unique_ptr<boost::interprocess::message_queue> fQueue;
-
-    std::thread fReceiveAcksWorker;
-    std::thread fSendAcksWorker;
+    std::thread fWorker;
    FairMQRegionCallback fCallback;
 };

--- a/fairmq/tools/CppSTL.h
+++ b/fairmq/tools/CppSTL.h
@@ -27,13 +27,6 @@ std::unique_ptr<T> make_unique(Args&& ...args)
    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }

-// make_unique implementation (array variant), until C++14 is default
-template<typename T>
-std::unique_ptr<T> make_unique(std::size_t size)
-{
-    return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
-}
-
 // provide an enum hasher to compensate std::hash not supporting enums in C++11
 template<typename Enum>
 struct HashEnum
--- a/fairmq/tools/Process.cxx
+++ b/fairmq/tools/Process.cxx
@@ -7,13 +7,8 @@
 ********************************************************************************/

 #include <fairmq/tools/Process.h>
-#include <fairmq/tools/Strings.h>

 #include <boost/process.hpp>
-#include <boost/asio.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-#include <signal.h> // kill, signals

 #include <iostream>
 #include <sstream>
@@ -22,28 +17,6 @@

 using namespace std;
 namespace bp = boost::process;
-namespace ba = boost::asio;
-namespace bs = boost::system;
-
-class LinePrinter
-{
-  public:
-    LinePrinter(stringstream& out, const string& prefix)
-        : fOut(out)
-        , fPrefix(prefix)
-    {}
-
-    // prints line with prefix on both cout (thread-safe) and output stream
-    void Print(const string& line)
-    {
-        cout << fair::mq::tools::ToString(fPrefix, line, "\n") << flush;
-        fOut << fPrefix << line << endl;
-    }
-
-  private:
-    stringstream& fOut;
-    const string fPrefix;
-};

 namespace fair
 {
@@ -60,111 +33,57 @@ namespace tools
 * @param[in] log_prefix How to prefix each captured output line with
 * @return Captured stdout output and exit code
 */
-execute_result execute(const string& cmd, const string& prefix, const string& input, int sig)
+execute_result execute(const string& cmd, const string& prefix, const string& input)
 {
    execute_result result;
    stringstream out;

-    LinePrinter p(out, prefix);
+    // print full line thread-safe
+    stringstream printCmd;
+    printCmd << prefix << " " << cmd << "\n";
+    cout << printCmd.str() << flush;

-    p.Print(cmd);
+    out << prefix << cmd << endl;

-    ba::io_service ios;
+    // Execute command and capture stdout, add prefix line by line
+    bp::ipstream c_stdout;
+    bp::opstream c_stdin;
+    bp::child c(cmd, bp::std_out > c_stdout, bp::std_in < c_stdin);

-    // containers for std_in
-    ba::const_buffer inputBuffer(ba::buffer(input));
-    bp::async_pipe inputPipe(ios);
-    // containers for std_out
-    ba::streambuf outputBuffer;
-    bp::async_pipe outputPipe(ios);
-    // containers for std_err
-    ba::streambuf errorBuffer;
-    bp::async_pipe errorPipe(ios);
+    while (c.valid() && !c.running()) {
+        ;
+    }

-    const string delimiter = "\n";
-    ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(100));
-    ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(100));
+    if (!c.valid()) {
+        throw runtime_error("Can't execute the given process.");
+    }

-    // child process
-    bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe);
-    int pid = c.id();
-    p.Print(ToString("fair::mq::tools::execute: pid: ", pid));
-
-    // handle std_in with a delay
+    // Optionally, write to stdin of the child
    if (input != "") {
-        inputTimer.async_wait([&](const bs::error_code& ec1) {
-            if (!ec1) {
-                ba::async_write(inputPipe, inputBuffer, [&](const bs::error_code& ec2, size_t /* n */) {
-                    if (!ec2) {
-                        // inputPipe.async_close();
-                    } else {
-                        p.Print(ToString("error in boost::asio::async_write: ", ec2.message()));
-                    }
-                });
-            } else {
-                p.Print(ToString("error in boost::asio::deadline_timer.async_wait: ", ec1.message()));
-            }
-        });
+        this_thread::sleep_for(chrono::milliseconds(100));
+        c_stdin << input;
+        c_stdin.flush();
    }

-    if (sig != -1) {
-        signalTimer.async_wait([&](const bs::error_code& ec1) {
-            if (!ec1) {
-                kill(pid, sig);
-            } else {
-                p.Print(ToString("error in boost::asio::deadline_timer.async_wait: ", ec1.message()));
-            }
-        });
+    string line;
+    while (c.running() && getline(c_stdout, line)) {
+        // print full line thread-safe
+        stringstream printLine;
+        printLine << prefix << line << "\n";
+        cout << printLine.str() << flush;
+
+        out << prefix << line << "\n";
    }

-    // handle std_out line by line
-    function<void(const bs::error_code&, size_t)> onStdOut = [&](const bs::error_code& ec, size_t /* n */) {
-        if (!ec) {
-            istream is(&outputBuffer);
-            string line;
-            getline(is, line);
-
-            p.Print(line);
-
-            ba::async_read_until(outputPipe, outputBuffer, delimiter, onStdOut);
-        } else {
-            if (ec == ba::error::eof) {
-                // outputPipe.async_close();
-            } else {
-                p.Print(ec.message());
-            }
-        }
-    };
-    ba::async_read_until(outputPipe, outputBuffer, delimiter, onStdOut);
-
-    // handle std_err line by line
-    function<void(const bs::error_code&, size_t)> onStdErr = [&](const bs::error_code& ec, size_t /* n */) {
-        if (!ec) {
-            istream is(&errorBuffer);
-            string line;
-            getline(is, line);
-
-            p.Print(ToString("error: ", line));
-
-            ba::async_read_until(errorPipe, errorBuffer, delimiter, onStdErr);
-        } else {
-            if (ec == ba::error::eof) {
-                // errorPipe.async_close();
-            } else {
-                p.Print(ec.message());
-            }
-        }
-    };
-    ba::async_read_until(errorPipe, errorBuffer, delimiter, onStdErr);
-
-    ios.run();
    c.wait();

+    // Capture exit code
    result.exit_code = c.exit_code();
+    out << prefix << " Exit code: " << result.exit_code << endl;

-    p.Print(ToString("fair::mq::tools::execute: exit code: ", result.exit_code));
    result.console_out = out.str();

+    // Return result
    return result;
 }

--- a/fairmq/tools/Process.h
+++ b/fairmq/tools/Process.h
@@ -38,8 +38,7 @@ struct execute_result
 */
 execute_result execute(const std::string& cmd,
                       const std::string& prefix = "",
-                       const std::string& input = "",
-                       int sig = -1);
+                       const std::string& input = "");

 } /* namespace tools */
 } /* namespace mq */
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -105,8 +105,6 @@ add_testsuite(Device
    device/_config.cxx
    device/_waitfor.cxx
    device/_exceptions.cxx
-    device/_error_state.cxx
-    device/_signals.cxx

    LINKS FairMQ
    DEPENDS testhelper_runTestDevice
--- a/test/device/TestReceiver.h
+++ b/test/device/TestReceiver.h
@@ -38,9 +38,12 @@ class Receiver : public FairMQDevice
    auto Run() -> void override
    {
        auto msg = FairMQMessagePtr{NewMessage()};
-        if (Receive(msg, fChannelName) >= 0) {
+        if (Receive(msg, fChannelName) >= 0)
+        {
            LOG(info) << "received empty message";
-        } else {
+        }
+        else
+        {
            LOG(error) << "fair::mq::test::Receiver::Run(): Receive(msg, fChannelName) < 0";
        }
    };
--- a/test/device/TestSender.h
+++ b/test/device/TestSender.h
@@ -38,9 +38,12 @@ class Sender : public FairMQDevice
    auto Run() -> void override
    {
        auto msg = FairMQMessagePtr{NewMessage()};
-        if (Send(msg, fChannelName) >= 0) {
+        if (Send(msg, fChannelName) >= 0)
+        {
            LOG(info) << "sent empty message";
-        } else {
+        }
+        else
+        {
            LOG(error) << "fair::mq::test::Sender::Run(): Send(msg, fChannelName) < 0";
        }
    };
--- a/test/device/_error_state.cxx
+++ b/test/device/_error_state.cxx
@@ -1,121 +0,0 @@
-/********************************************************************************
- *    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"                       *
- ********************************************************************************/
-
-#include "runner.h"
-
-#include <gtest/gtest.h>
-#include <boost/process.hpp>
-#include <fairmq/Tools.h>
-
-#include <string>
-#include <thread>
-#include <iostream>
-
-namespace
-{
-
-using namespace std;
-using namespace fair::mq::test;
-using namespace fair::mq::tools;
-
-void RunErrorStateIn(const string& state, const string& control, const string& input = "")
-{
-    size_t session{fair::mq::tools::UuidHash()};
-
-    execute_result result{"", 100};
-    thread device_thread([&]() {
-        stringstream cmd;
-        cmd << runTestDevice
-            << " --id error_state_" << state << "_"
-            << " --control " << control
-            << " --session " << session
-            << " --color false";
-        result = execute(cmd.str(), "[ErrorFound IN " + state + "]", input);
-    });
-
-    device_thread.join();
-
-    ASSERT_NE(string::npos, result.console_out.find("going to change to Error state from " + state + "()"));
-
-    exit(result.exit_code);
-}
-
-TEST(ErrorState, static_InInit)
-{
-    EXPECT_EXIT(RunErrorStateIn("Init", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InBind)
-{
-    EXPECT_EXIT(RunErrorStateIn("Bind", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InConnect)
-{
-    EXPECT_EXIT(RunErrorStateIn("Connect", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InInitTask)
-{
-    EXPECT_EXIT(RunErrorStateIn("InitTask", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InPreRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("PreRun", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("Run", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InPostRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("PostRun", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InResetTask)
-{
-    EXPECT_EXIT(RunErrorStateIn("ResetTask", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, static_InReset)
-{
-    EXPECT_EXIT(RunErrorStateIn("Reset", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InInit)
-{
-    EXPECT_EXIT(RunErrorStateIn("Init", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InBind)
-{
-    EXPECT_EXIT(RunErrorStateIn("Bind", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InConnect)
-{
-    EXPECT_EXIT(RunErrorStateIn("Connect", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InInitTask)
-{
-    EXPECT_EXIT(RunErrorStateIn("InitTask", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InPreRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("PreRun", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("Run", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InPostRun)
-{
-    EXPECT_EXIT(RunErrorStateIn("PostRun", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InResetTask)
-{
-    EXPECT_EXIT(RunErrorStateIn("ResetTask", "interactive", "q"), ::testing::ExitedWithCode(1), "");
-}
-TEST(ErrorState, interactive_InReset)
-{
-    EXPECT_EXIT(RunErrorStateIn("Reset", "interactive", "q"), ::testing::ExitedWithCode(1), "");
-}
-
-} // namespace
--- a/test/device/_exceptions.cxx
+++ b/test/device/_exceptions.cxx
@@ -23,7 +23,7 @@ using namespace std;
 using namespace fair::mq::test;
 using namespace fair::mq::tools;

-void RunExceptionIn(const string& state, const string& control, const string& input = "")
+void RunExceptionIn(const std::string& state, const std::string& input = "")
 {
    size_t session{fair::mq::tools::UuidHash()};

@@ -32,7 +32,7 @@ void RunExceptionIn(const string& state, const string& control, const string& in
        stringstream cmd;
        cmd << runTestDevice
            << " --id exceptions_" << state << "_"
-            << " --control " << control
+            << " --control " << ((input == "") ? "static" : "interactive")
            << " --session " << session
            << " --color false";
        result = execute(cmd.str(), "[EXCEPTION IN " + state + "]", input);
@@ -40,82 +40,86 @@ void RunExceptionIn(const string& state, const string& control, const string& in

    device_thread.join();

-    ASSERT_NE(string::npos, result.console_out.find("exception in " + state + "()"));
+    ASSERT_NE(std::string::npos, result.console_out.find("exception in " + state + "()"));

    exit(result.exit_code);
 }

 TEST(Exceptions, static_InInit)
 {
-    EXPECT_EXIT(RunExceptionIn("Init", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(Exceptions, static_InBind)
-{
-    EXPECT_EXIT(RunExceptionIn("Bind", "static"), ::testing::ExitedWithCode(1), "");
-}
-TEST(Exceptions, static_InConnect)
-{
-    EXPECT_EXIT(RunExceptionIn("Connect", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Init"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InInitTask)
 {
-    EXPECT_EXIT(RunExceptionIn("InitTask", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("InitTask"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InPreRun)
 {
-    EXPECT_EXIT(RunExceptionIn("PreRun", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("PreRun"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InRun)
 {
-    EXPECT_EXIT(RunExceptionIn("Run", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Run"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InPostRun)
 {
-    EXPECT_EXIT(RunExceptionIn("PostRun", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("PostRun"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InResetTask)
 {
-    EXPECT_EXIT(RunExceptionIn("ResetTask", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("ResetTask"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, static_InReset)
 {
-    EXPECT_EXIT(RunExceptionIn("Reset", "static"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Reset"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InInit)
 {
-    EXPECT_EXIT(RunExceptionIn("Init", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(Exceptions, interactive_InBind)
-{
-    EXPECT_EXIT(RunExceptionIn("Bind", "interactive"), ::testing::ExitedWithCode(1), "");
-}
-TEST(Exceptions, interactive_InConnect)
-{
-    EXPECT_EXIT(RunExceptionIn("Connect", "interactive"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Init", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InInitTask)
 {
-    EXPECT_EXIT(RunExceptionIn("InitTask", "interactive"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("InitTask", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InPreRun)
 {
-    EXPECT_EXIT(RunExceptionIn("PreRun", "interactive"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("PreRun", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InRun)
 {
-    EXPECT_EXIT(RunExceptionIn("Run", "interactive"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Run", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InPostRun)
 {
-    EXPECT_EXIT(RunExceptionIn("PostRun", "interactive"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("PostRun", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InResetTask)
 {
-    EXPECT_EXIT(RunExceptionIn("ResetTask", "interactive", "q"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("ResetTask", "q"), ::testing::ExitedWithCode(1), "");
 }
 TEST(Exceptions, interactive_InReset)
 {
-    EXPECT_EXIT(RunExceptionIn("Reset", "interactive", "q"), ::testing::ExitedWithCode(1), "");
+    EXPECT_EXIT(RunExceptionIn("Reset", "q"), ::testing::ExitedWithCode(1), "");
+}
+TEST(Exceptions, interactive_invalid_InInit)
+{
+    EXPECT_EXIT(RunExceptionIn("Init", "_"), ::testing::ExitedWithCode(1), "");
+}
+TEST(Exceptions, interactive_invalid_InInitTask)
+{
+    EXPECT_EXIT(RunExceptionIn("InitTask", "_"), ::testing::ExitedWithCode(1), "");
+}
+TEST(Exceptions, interactive_invalid_InPreRun)
+{
+    EXPECT_EXIT(RunExceptionIn("PreRun", "_"), ::testing::ExitedWithCode(1), "");
+}
+TEST(Exceptions, interactive_invalid_InRun)
+{
+    EXPECT_EXIT(RunExceptionIn("Run", "_"), ::testing::ExitedWithCode(1), "");
+}
+TEST(Exceptions, interactive_invalid_InPostRun)
+{
+    EXPECT_EXIT(RunExceptionIn("PostRun", "_"), ::testing::ExitedWithCode(1), "");
 }

 } // namespace
--- a/test/device/_signals.cxx
+++ b/test/device/_signals.cxx
@@ -1,121 +0,0 @@
-/********************************************************************************
- *    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"                       *
- ********************************************************************************/
-
-#include "runner.h"
-
-#include <gtest/gtest.h>
-#include <boost/process.hpp>
-#include <fairmq/Tools.h>
-
-#include <string>
-#include <thread>
-#include <iostream>
-
-namespace
-{
-
-using namespace std;
-using namespace fair::mq::test;
-using namespace fair::mq::tools;
-
-void RunSignalIn(const string& state, const string& control, const string& input = "")
-{
-    size_t session{fair::mq::tools::UuidHash()};
-
-    execute_result result{"", 100};
-    thread device_thread([&]() {
-        stringstream cmd;
-        cmd << runTestDevice
-            << " --id signals_" << state << "_"
-            << " --control " << control
-            << " --session " << session
-            << " --color false";
-        result = execute(cmd.str(), "[SIGINT IN " + state + "]", input);
-    });
-
-    device_thread.join();
-
-    ASSERT_NE(string::npos, result.console_out.find("raising SIGINT from " + state + "()"));
-
-    exit(result.exit_code);
-}
-
-TEST(Signal_SIGINT, static_InInit)
-{
-    EXPECT_EXIT(RunSignalIn("Init", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InBind)
-{
-    EXPECT_EXIT(RunSignalIn("Bind", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InConnect)
-{
-    EXPECT_EXIT(RunSignalIn("Connect", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InInitTask)
-{
-    EXPECT_EXIT(RunSignalIn("InitTask", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InPreRun)
-{
-    EXPECT_EXIT(RunSignalIn("PreRun", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InRun)
-{
-    EXPECT_EXIT(RunSignalIn("Run", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InPostRun)
-{
-    EXPECT_EXIT(RunSignalIn("PostRun", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InResetTask)
-{
-    EXPECT_EXIT(RunSignalIn("ResetTask", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, static_InReset)
-{
-    EXPECT_EXIT(RunSignalIn("Reset", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InInit)
-{
-    EXPECT_EXIT(RunSignalIn("Init", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InBind)
-{
-    EXPECT_EXIT(RunSignalIn("Bind", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InConnect)
-{
-    EXPECT_EXIT(RunSignalIn("Connect", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InInitTask)
-{
-    EXPECT_EXIT(RunSignalIn("InitTask", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InPreRun)
-{
-    EXPECT_EXIT(RunSignalIn("PreRun", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InRun)
-{
-    EXPECT_EXIT(RunSignalIn("Run", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InPostRun)
-{
-    EXPECT_EXIT(RunSignalIn("PostRun", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InResetTask)
-{
-    EXPECT_EXIT(RunSignalIn("ResetTask", "interactive", "q"), ::testing::ExitedWithCode(0), "");
-}
-TEST(Signal_SIGINT, interactive_InReset)
-{
-    EXPECT_EXIT(RunSignalIn("Reset", "interactive", "q"), ::testing::ExitedWithCode(0), "");
-}
-
-} // namespace
--- a/test/device/_waitfor.cxx
+++ b/test/device/_waitfor.cxx
@@ -9,65 +9,66 @@
 #include "runner.h"

 #include <gtest/gtest.h>
-#include <fairmq/Tools.h>
+#include <boost/process.hpp>

-#include <signal.h> // kill
+#include <sys/types.h>
+#include <signal.h>

 #include <string>
 #include <thread>
+#include <chrono>
 #include <iostream>
+#include <future> // std::async, std::future

 namespace
 {

 using namespace std;
 using namespace fair::mq::test;
-using namespace fair::mq::tools;

-void RunWaitFor(const string& state, const string& control)
+void RunWaitFor()
 {
-    execute_result result;
-    thread device_thread([&] {
+    std::mutex mtx;
+    std::condition_variable cv;
+
+    int pid = 0;
+    int exit_code = 0;
+
+    thread deviceThread([&]() {
        stringstream cmd;
-        cmd << runTestDevice
-            << " --id waitfor_" << state
-            << " --control " << control
-            << " --session " << UuidHash()
-            << " --severity debug"
-            << " --color false";
-        result = execute(cmd.str(), "[WaitFor]", "", SIGINT);
+        cmd << runTestDevice << " --id waitfor_" << " --control static " << " --severity nolog";
+
+        boost::process::ipstream stdout;
+        boost::process::child c(cmd.str(), boost::process::std_out > stdout);
+        string line;
+        getline(stdout, line);
+
+        {
+            std::lock_guard<std::mutex> lock(mtx);
+            pid = c.id();
+        }
+        cv.notify_one();
+
+        c.wait();
+
+        exit_code = c.exit_code();
    });

-    device_thread.join();
+    {
+        std::unique_lock<std::mutex> lock(mtx);
+        cv.wait(lock, [&pid]{ return pid != 0; });
+    }

-    ASSERT_NE(string::npos, result.console_out.find("Sleeping Done. Interrupted."));
+    kill(pid, SIGINT);

-    exit(result.exit_code);
+    deviceThread.join();
+
+    exit(exit_code);
 }

-TEST(WaitFor, static_InPreRun)
+TEST(Device, WaitFor)
 {
-    EXPECT_EXIT(RunWaitFor("PreRun", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(WaitFor, static_InRun)
-{
-    EXPECT_EXIT(RunWaitFor("Run", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(WaitFor, static_InPostRun)
-{
-    EXPECT_EXIT(RunWaitFor("PostRun", "static"), ::testing::ExitedWithCode(0), "");
-}
-TEST(WaitFor, interactive_InPreRun)
-{
-    EXPECT_EXIT(RunWaitFor("PreRun", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(WaitFor, interactive_InRun)
-{
-    EXPECT_EXIT(RunWaitFor("Run", "interactive"), ::testing::ExitedWithCode(0), "");
-}
-TEST(WaitFor, interactive_InPostRun)
-{
-    EXPECT_EXIT(RunWaitFor("PostRun", "interactive"), ::testing::ExitedWithCode(0), "");
+    EXPECT_EXIT(RunWaitFor(), ::testing::ExitedWithCode(0), "");
 }

 } // namespace
--- a/test/helper/devices/TestErrorState.h
+++ b/test/helper/devices/TestErrorState.h
@@ -1,113 +0,0 @@
-/********************************************************************************
- *   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"                       *
- ********************************************************************************/
-
-#ifndef FAIR_MQ_TEST_ERROR_STATE_H
-#define FAIR_MQ_TEST_ERROR_STATE_H
-
-#include <FairMQDevice.h>
-#include <FairMQLogger.h>
-
-#include <iostream>
-
-namespace fair
-{
-namespace mq
-{
-namespace test
-{
-
-class ErrorState : public FairMQDevice
-{
-  public:
-    void Init() override
-    {
-        std::string state("Init");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void Bind() override
-    {
-        std::string state("Bind");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void Connect() override
-    {
-        std::string state("Connect");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void InitTask() override
-    {
-        std::string state("InitTask");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void PreRun() override
-    {
-        std::string state("PreRun");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void Run() override
-    {
-        std::string state("Run");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void PostRun() override
-    {
-        std::string state("PostRun");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void ResetTask() override
-    {
-        std::string state("ResetTask");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-
-    void Reset() override
-    {
-        std::string state("Reset");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "going to change to Error state from " << state << "()";
-            ChangeState(fair::mq::Transition::ErrorFound);
-        }
-    }
-};
-
-} // namespace test
-} // namespace mq
-} // namespace fair
-
-#endif /* FAIR_MQ_TEST_ERROR_STATE_H */
--- a/test/helper/devices/TestExceptions.h
+++ b/test/helper/devices/TestExceptions.h
@@ -33,22 +33,6 @@ class Exceptions : public FairMQDevice
        }
    }

-    auto Bind() -> void override
-    {
-        std::string state("Bind");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            throw std::runtime_error("exception in " + state + "()");
-        }
-    }
-
-    auto Connect() -> void override
-    {
-        std::string state("Connect");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            throw std::runtime_error("exception in " + state + "()");
-        }
-    }
-
    auto InitTask() -> void override
    {
        std::string state("InitTask");
--- a/test/helper/devices/TestPairLeft.h
+++ b/test/helper/devices/TestPairLeft.h
@@ -57,7 +57,6 @@ class PairLeft : public FairMQDevice
        if (counter == 6) LOG(info) << "Simple message with short text data successfull";

        assert(counter == 6);
-        if (counter == 6) LOG(info) << "PAIR test successfull.";
    };
 };

--- a/test/helper/devices/TestPairRight.h
+++ b/test/helper/devices/TestPairRight.h
@@ -55,6 +55,9 @@ class PairRight : public FairMQDevice
        auto msg6(NewSimpleMessageFor("data", 0, "testdata1234"));
        if (Send(msg6, "data") >= 0) counter++;
        if (counter == 6) LOG(info) << "Simple message with short text data successfull";
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+        if (counter == 6) LOG(info) << "PAIR test successfull.";
    };
 };

@@ -62,4 +65,4 @@ class PairRight : public FairMQDevice
 } // namespace mq
 } // namespace fair

-#endif /* FAIR_MQ_TEST_PAIRRIGHT_H */
+#endif /* FAIR_MQ_TEST_PAIRRIGHT_H */
--- a/test/helper/devices/TestSignals.h
+++ b/test/helper/devices/TestSignals.h
@@ -1,112 +0,0 @@
-/********************************************************************************
- *   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"                       *
- ********************************************************************************/
-
-#ifndef FAIR_MQ_TEST_SIGNALS_H
-#define FAIR_MQ_TEST_SIGNALS_H
-
-#include <FairMQDevice.h>
-#include <FairMQLogger.h>
-
-#include <iostream>
-#include <csignal>
-
-namespace fair
-{
-namespace mq
-{
-namespace test
-{
-
-class Signals : public FairMQDevice
-{
-  public:
-    void Init() override
-    {
-        std::string state("Init");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-    void Bind() override
-    {
-        std::string state("Bind");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-    void Connect() override
-    {
-        std::string state("Connect");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void InitTask() override
-    {
-        std::string state("InitTask");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void PreRun() override
-    {
-        std::string state("PreRun");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void Run() override
-    {
-        std::string state("Run");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void PostRun() override
-    {
-        std::string state("PostRun");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void ResetTask() override
-    {
-        std::string state("ResetTask");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-
-    void Reset() override
-    {
-        std::string state("Reset");
-        if (std::string::npos != GetId().find("_" + state + "_")) {
-            LOG(debug) << "raising SIGINT from " << state << "()";
-            raise(SIGINT);
-        }
-    }
-};
-
-} // namespace test
-} // namespace mq
-} // namespace fair
-
-#endif /* FAIR_MQ_TEST_SIGNALS_H */
--- a/test/helper/devices/TestWaitFor.h
+++ b/test/helper/devices/TestWaitFor.h
@@ -24,34 +24,10 @@ namespace test
 class TestWaitFor : public FairMQDevice
 {
  public:
-    void PreRun() override
+    void Run()
    {
-        std::string state("PreRun");
-        if (std::string::npos != GetId().find("_" + state)) {
-            LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
-            bool result = WaitFor(std::chrono::seconds(60));
-            LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
-        }
-    }
-
-    void Run() override
-    {
-        std::string state("Run");
-        if (std::string::npos != GetId().find("_" + state)) {
-            LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
-            bool result = WaitFor(std::chrono::seconds(60));
-            LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
-        }
-    }
-
-    void PostRun() override
-    {
-        std::string state("PostRun");
-        if (std::string::npos != GetId().find("_" + state)) {
-            LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
-            bool result = WaitFor(std::chrono::seconds(60));
-            LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
-        }
+        std::cout << "hello" << std::endl;
+        WaitFor(std::chrono::seconds(60));
    }
 };

--- a/test/helper/runTestDevice.cxx
+++ b/test/helper/runTestDevice.cxx
@@ -19,8 +19,6 @@
 #include "devices/TestTransferTimeout.h"
 #include "devices/TestWaitFor.h"
 #include "devices/TestExceptions.h"
-#include "devices/TestErrorState.h"
-#include "devices/TestSignals.h"

 #include <runFairMQDevice.h>

@@ -42,38 +40,60 @@ auto getDevice(const FairMQProgOptions& config) -> FairMQDevicePtr
    using namespace fair::mq::test;

    auto id = config.GetValue<std::string>("id");
-
-    if (0 == id.find("pull_")) {
+    if (0 == id.find("pull_"))
+    {
        return new Pull;
-    } else if (0 == id.find("push_")) {
+    }
+    else if (0 == id.find("push_"))
+    {
        return new Push;
-    } else if (0 == id.find("sub_")) {
+    }
+    else if (0 == id.find("sub_"))
+    {
        return new Sub;
-    } else if (0 == id.find("pub_")) {
+    }
+    else if (0 == id.find("pub_"))
+    {
        return new Pub;
-    } else if (0 == id.find("req_")) {
+    }
+    else if (0 == id.find("req_"))
+    {
        return new Req;
-    } else if (0 == id.find("rep_")) {
+    }
+    else if (0 == id.find("rep_"))
+    {
        return new Rep;
-    } else if (0 == id.find("transfer_timeout_")) {
+    }
+    else if (0 == id.find("transfer_timeout_"))
+    {
        return new TransferTimeout;
-    } else if (0 == id.find("pollout_")) {
+    }
+    else if (0 == id.find("pollout_"))
+    {
        return new PollOut;
-    } else if (0 == id.find("pollin_")) {
+    }
+    else if (0 == id.find("pollin_"))
+    {
        return new PollIn;
-    } else if (0 == id.find("pairleft_")) {
+    }
+    else if (0 == id.find("pairleft_"))
+    {
        return new PairLeft;
-    } else if (0 == id.find("pairright_")) {
+    }
+    else if (0 == id.find("pairright_"))
+    {
        return new PairRight;
-    } else if (0 == id.find("waitfor_")) {
+    }
+    else if (0 == id.find("waitfor_"))
+    {
        return new TestWaitFor;
-    } else if (0 == id.find("exceptions_")) {
+    }
+    else if (0 == id.find("exceptions_"))
+    {
        return new Exceptions;
-    } else if (0 == id.find("error_state_")) {
-        return new ErrorState;
-    } else if (0 == id.find("signals_")) {
-        return new Signals;
-    } else {
+    }
+    else
+    {
        cerr << "Don't know id '" << id << "'" << endl;
        return nullptr;
    }
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