fix: parse errors

```
/test/memory_resources/_memory_resources.cxx: In member function ‘virtual void {anonymous}::MemoryResources_allocator_Test::TestBody()’:
/test/memory_resources/_memory_resources.cxx:104:12: error: parse error in template argument list
  104 |     config.SetProperty<string>("session", to_string(session));
      |            ^~~~~~~~~~~~~~~~~~~
/test/memory_resources/_memory_resources.cxx:104:31: error: no matching function for call to ‘fair::mq::ProgOptions::SetProperty<<expression error> >(const char [8], std::string)’
  104 |     config.SetProperty<string>("session", to_string(session));
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/dklein/projects/FairMQ2/test/memory_resources/_memory_resources.cxx:11:
/fairmq/ProgOptions.h:269:6: note: candidate: ‘template<class T> void fair::mq::ProgOptions::SetProperty(const std::string&, T)’
  269 | void fair::mq::ProgOptions::SetProperty(const std::string& key, T val)
      |      ^~~~
/fairmq/ProgOptions.h:269:6: note:   template argument deduction/substitution failed:
/test/memory_resources/_memory_resources.cxx:104:31: error: template argument 1 is invalid
  104 |     config.SetProperty<string>("session", to_string(session));
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/test/memory_resources/_memory_resources.cxx: In member function ‘virtual void {anonymous}::MemoryResources_getMessage_Test::TestBody()’:
/test/memory_resources/_memory_resources.cxx:132:12: error: parse error in template argument list
  132 |     config.SetProperty<string>("session", to_string(session));
      |            ^~~~~~~~~~~~~~~~~~~
/test/memory_resources/_memory_resources.cxx:132:31: error: no matching function for call to ‘fair::mq::ProgOptions::SetProperty<<expression error> >(const char [8], std::string)’
  132 |     config.SetProperty<string>("session", to_string(session));
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/fairmq/ProgOptions.h:269:6: note: candidate: ‘template<class T> void fair::mq::ProgOptions::SetProperty(const std::string&, T)’
  269 | void fair::mq::ProgOptions::SetProperty(const std::string& key, T val)
      |      ^~~~
/fairmq/ProgOptions.h:269:6: note:   template argument deduction/substitution failed:
/test/memory_resources/_memory_resources.cxx:132:31: error: template argument 1 is invalid
  132 |     config.SetProperty<string>("session", to_string(session));
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+  "image": "ghcr.io/fairrootgroup/fairmq-dev/fedora-38:latest",
+  "features": {
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    target-branch: "dev"
+    schedule:
+      interval: "monthly"

.github/workflows/check_metadata.yaml

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH, Darmstadt, Germany
+#
+# SPDX-License-Identifier: CC0-1.0
+
+name: Check AUTHORS and CONTRIBUTORS in metadata
+
+on:
+  push:
+    paths:
+    - AUTHORS
+    - CONTRIBUTORS
+    - codemeta.json
+    - .zenodo.json
+  pull_request:
+    paths:
+    - AUTHORS
+    - CONTRIBUTORS
+    - codemeta.json
+    - .zenodo.json
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Try updating metadata
+        run: python meta_update.py
+      - name: Check for Updates
+        run: git diff --exit-code

.github/workflows/codemeta_validate.yaml

@@ -0,0 +1,21 @@
+name: validate codemeta
+
+on:
+  push:
+    paths:
+    - codemeta.json
+    - .github/workflows/codemeta_validate.yaml
+  pull_request:
+    paths:
+    - codemeta.json
+    - .github/workflows/codemeta_validate.yaml
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: gitlab-registry.in2p3.fr/escape2020/wp3/eossr:v1.0
+    steps:
+      - uses: actions/checkout@v4
+      - name: validate codemeta
+        run: eossr-metadata-validator codemeta.json

.gitignore

@@ -4,3 +4,5 @@ install
 .vscode
 /compile_commands.json
 .cache
+.spack-env
+spack.lock

.zenodo.json

@@ -1,6 +1,7 @@
 {
     "creators": [
         {
+            "orcid": "0000-0002-8071-4497",
             "name": "Al-Turany, Mohammad"
         },
         {

CMakeLists.txt

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -8,8 +8,7 @@
 
 
 # Project ######################################################################
-cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
-cmake_policy(VERSION 3.15...3.26)
+cmake_minimum_required(VERSION 3.15...3.30 FATAL_ERROR)
 
 list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(GitHelper)

Jenkinsfile

@@ -43,7 +43,7 @@ def jobMatrix(String type, List specs) {
             sh "bash ${jobscript}"
           } else { // selector == "slurm"
             def imageurl = "oras://ghcr.io/fairrootgroup/fairmq-dev/${os}-${ver}-sif:latest"
-            def execopts = "--net --ipc --uts --pid -B/shared"
+            def execopts = "--ipc --uts --pid -B/shared"
             def containercmd = "singularity exec ${execopts} ${imageurl} bash -l -c \\\"${ctestcmd} ${extra}\\\""
             sh """\
               echo \"echo \\\"*** Job started at .......: \\\$(date -R)\\\"\" >> ${jobscript}
@@ -87,14 +87,18 @@ pipeline{
           def builds = jobMatrix('build', [
             [os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9'],
             [os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11'],
+            [os: 'ubuntu', ver: '24.04', arch: 'x86_64', compiler: 'gcc-13'],
             [os: 'fedora', ver: '33',    arch: 'x86_64', compiler: 'gcc-10'],
             [os: 'fedora', ver: '34',    arch: 'x86_64', compiler: 'gcc-11'],
             [os: 'fedora', ver: '35',    arch: 'x86_64', compiler: 'gcc-11'],
             [os: 'fedora', ver: '36',    arch: 'x86_64', compiler: 'gcc-12'],
             [os: 'fedora', ver: '37',    arch: 'x86_64', compiler: 'gcc-12'],
             [os: 'fedora', ver: '38',    arch: 'x86_64', compiler: 'gcc-13'],
-            [os: 'macos',  ver: '12',    arch: 'x86_64', compiler: 'apple-clang-13', extra: '-DHAS_ASIO=ON'],
-            [os: 'macos',  ver: '12',    arch: 'arm64',  compiler: 'apple-clang-13', extra: '-DHAS_ASIO=ON'],
+            [os: 'fedora', ver: '39',    arch: 'x86_64', compiler: 'gcc-13'],
+            [os: 'fedora', ver: '40',    arch: 'x86_64', compiler: 'gcc-14'],
+            [os: 'macos',  ver: '14',    arch: 'x86_64', compiler: 'apple-clang-16'],
+            [os: 'macos',  ver: '15',    arch: 'x86_64', compiler: 'apple-clang-16'],
+            [os: 'macos',  ver: '15',    arch: 'arm64',  compiler: 'apple-clang-16'],
           ])
 
           def all_debug = "-DCMAKE_BUILD_TYPE=Debug"

README.md

@@ -5,6 +5,7 @@
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1689985.svg)](https://doi.org/10.5281/zenodo.1689985)
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/6915/badge)](https://bestpractices.coreinfrastructure.org/projects/6915)
 [![fair-software.eu](https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8B%20%20%E2%97%8F%20%20%E2%97%8F-yellow)](https://github.com/FairRootGroup/FairMQ/actions/workflows/fair-software.yml)
+[![Spack package](https://repology.org/badge/version-for-repo/spack/fairmq.svg)](https://repology.org/project/fairmq/versions)
 
 C++ Message Queuing Library and Framework
 
@@ -44,10 +45,10 @@ Recommended:
 
 ```bash
 git clone https://github.com/FairRootGroup/FairMQ fairmq_source
-cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=fairmq_install
+cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Release [-DBUILD_TESTING=ON]
 cmake --build fairmq_build
-cmake --build fairmq_build --target test
-cmake --build fairmq_build --target install
+[ctest --test-dir fairmq_build --output-on-failure --schedule-random -j<ncpus>] # needs -DBUILD_TESTING=ON
+cmake --install fairmq_build --prefix $(pwd)/fairmq_install
 ```
 
 Please consult the [manpages of your CMake version](https://cmake.org/cmake/help/latest/manual/cmake.1.html) for more options.
@@ -55,6 +56,25 @@ Please consult the [manpages of your CMake version](https://cmake.org/cmake/help
 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=...` (`*_ROOT` variables can also be environment variables).
 
+## Installation via Spack
+
+Prerequisite: [Spack](https://spack.readthedocs.io/en/latest/getting_started.html)
+
+```bash
+spack info fairmq # inspect build options
+spack install fairmq # build latest packaged version with default options
+```
+
+Build FairMQ's dependencies via Spack for development:
+```bash
+git clone -b dev https://github.com/FairRootGroup/FairMQ fairmq_source
+spack --env fairmq_source install # installs deps declared in fairmq_source/spack.yaml
+spack env activate fairmq_source # sets $CMAKE_PREFIX_PATH which is used by CMake to find FairMQ's deps
+cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON
+# develop, compile, test
+spack env deactivate # at end of dev session, or simply close the shell
+```
+
 ## Usage
 
 FairMQ ships as a CMake package, so in your `CMakeLists.txt` you can discover it like this:
@@ -96,6 +116,7 @@ On command line:
   * `-DBUILD_TESTING=OFF` disables building of tests.
   * `-DBUILD_EXAMPLES=OFF` disables building of examples.
   * `-DBUILD_DOCS=ON` enables building of API docs.
+  * `-DFAIRMQ_CHANNEL_DEFAULT_AUTOBIND=OFF` disable channel `autoBind` by default
   * You can hint non-system installations for dependent packages, see the #installation-from-source section above
 
 After the `find_package(FairMQ)` call the following CMake variables are defined:

cmake/FairMQDependencies.cmake

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -41,7 +41,7 @@ if(BUILD_TESTING)
   endif()
   find_package2(BUNDLED GTest REQUIRED)
   if(GTest_BUNDLED)
-    set(GTest_VERSION "Apr 8 2022 @a1cc8c55")
+    set(GTest_VERSION "Dec 26 2024 @7d76a23")
     set(GTest_PREFIX "<bundled>")
   endif()
 endif()

cmake/FairMQSummary.cmake

@@ -96,7 +96,10 @@ endmacro()
 
 macro(fairmq_summary_compile_definitions)
   message(STATUS "  ")
-  message(STATUS "  ${Cyan}COMPILE DEFINITION           VALUE${CR}")
-  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_FILESYSTEM${CR}    ${FAIRMQ_HAS_STD_FILESYSTEM}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_FILESYSTEM=0|1${CR})")
-  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_PMR${CR}           ${FAIRMQ_HAS_STD_PMR}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_PMR=0|1${CR})")
+  message(STATUS "  ${Cyan}COMPILE DEFINITION               VALUE${CR}")
+  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_FILESYSTEM${CR}        ${FAIRMQ_HAS_STD_FILESYSTEM}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_FILESYSTEM=0|1${CR})")
+  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_PMR${CR}               ${FAIRMQ_HAS_STD_PMR}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_PMR=0|1${CR})")
+  if(DEFINED FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
+    message(STATUS "  ${BWhite}FAIRMQ_CHANNEL_DEFAULT_AUTOBIND${CR}  ${FAIRMQ_CHANNEL_DEFAULT_AUTOBIND}")
+  endif()
 endmacro()

codemeta.json

@@ -6,12 +6,23 @@
   "license": "./COPYRIGHT",
   "datePublished": "2018-04-15",
   "developmentStatus": "active",
+  "softwareVersion": "master",
+  "releaseNotes": "https://github.com/FairRootGroup/FairMQ/releases",
   "codeRepository": "https://github.com/FairRootGroup/FairMQ/",
+  "readme": "https://github.com/FairRootGroup/FairMQ/#readme",
   "issueTracker": "https://github.com/FairRootGroup/FairMQ/issues",
   "identifier": "https://doi.org/10.5281/zenodo.1689985",
+  "maintainer": [
+    {
+      "@type": "ResearchOrganisation",
+      "@id": "https://ror.org/02k8cbn47",
+      "name": "GSI Helmholtz Centre for Heavy Ion Research"
+    }
+  ],
   "author": [
     {
       "@type": "Person",
+      "@id": "https://orcid.org/0000-0002-8071-4497",
       "givenName": "Mohammad",
       "familyName": "Al-Turany"
     },

examples/CMakeLists.txt

@@ -61,7 +61,7 @@ function(add_example)
   set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
   foreach(script IN LISTS scripts)
     set(script_file "${script_prefix}-${script}.sh")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}" @ONLY)
   endforeach()
 
   if(ARG_CONFIG)
@@ -119,7 +119,7 @@ function(add_example)
   set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
   foreach(script IN LISTS scripts)
     set(script_file "${script_prefix}-${script}.sh")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}_install")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}_install" @ONLY)
     install(
       PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${script_file}_install"
       DESTINATION ${PROJECT_INSTALL_BINDIR}

examples/n-m/receiver.cxx

@@ -54,7 +54,7 @@ struct Receiver : fair::mq::Device
                 fBuffer[h.id].start = chrono::steady_clock::now();
             }
             // if the received ID has not previously been discarded, store the data part in the buffer
-            fBuffer[h.id].parts.AddPart(move(parts.At(1)));
+            fBuffer[h.id].parts.AddPart(std::move(parts.At(1)));
         } else {
             // if received ID has been previously discarded.
             LOG(debug) << "Received part from an already discarded timeframe with id " << h.id;

examples/region/CMakeLists.txt

@@ -7,5 +7,6 @@
 ################################################################################
 
 add_example(NAME region
-  DEVICE sampler sink keep-alive
+  DEVICE sampler processor sink keep-alive
+  SCRIPT region region-advanced region-advanced-external
 )

examples/region/fairmq-start-ex-region-advanced-external.sh.in

@@ -0,0 +1,95 @@
+#!/bin/bash
+
+export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
+
+transport=${1:-shmem}
+msgSize=${2:-1000000}
+
+SAMPLER="fairmq-ex-region-sampler"
+SAMPLER+=" --id sampler1"
+# SAMPLER+=" --sampling-rate 10"
+SAMPLER+=" --severity debug"
+SAMPLER+=" --msg-size $msgSize"
+SAMPLER+=" --transport $transport"
+SAMPLER+=" --shmid 1"
+SAMPLER+=" --shm-monitor false"
+SAMPLER+=" --rc-segment-size 200000000"
+SAMPLER+=" --external-region true"
+SAMPLER+=" --shm-no-cleanup true"
+SAMPLER+=" --chan-name data1"
+SAMPLER+=" --channel-config name=data1,type=push,method=bind,address=tcp://127.0.0.1:7777"
+xterm -geometry 90x60+0+0 -hold -e @EX_BIN_DIR@/$SAMPLER &
+
+PROCESSOR1="fairmq-ex-region-processor"
+PROCESSOR1+=" --id processor1"
+PROCESSOR1+=" --severity debug"
+PROCESSOR1+=" --transport $transport"
+PROCESSOR1+=" --shmid 1"
+PROCESSOR1+=" --shm-segment-id 1"
+PROCESSOR1+=" --shm-monitor false"
+PROCESSOR1+=" --shm-no-cleanup true"
+PROCESSOR1+=" --channel-config name=data1,type=pull,method=connect,address=tcp://127.0.0.1:7777"
+PROCESSOR1+="                  name=data2,type=push,method=bind,address=tcp://127.0.0.1:7778"
+PROCESSOR1+="                  name=data3,type=push,method=bind,address=tcp://127.0.0.1:7779"
+xterm -geometry 90x40+550+40 -hold -e @EX_BIN_DIR@/$PROCESSOR1 &
+
+PROCESSOR2="fairmq-ex-region-processor"
+PROCESSOR2+=" --id processor2"
+PROCESSOR2+=" --severity debug"
+PROCESSOR2+=" --transport $transport"
+PROCESSOR2+=" --shmid 1"
+PROCESSOR2+=" --shm-segment-id 2"
+PROCESSOR2+=" --shm-monitor false"
+PROCESSOR2+=" --shm-no-cleanup true"
+PROCESSOR2+=" --channel-config name=data1,type=pull,method=connect,address=tcp://127.0.0.1:7777"
+PROCESSOR2+="                  name=data2,type=push,method=bind,address=tcp://127.0.0.1:7788"
+PROCESSOR2+="                  name=data3,type=push,method=bind,address=tcp://127.0.0.1:7789"
+xterm -geometry 90x40+550+600 -hold -e @EX_BIN_DIR@/$PROCESSOR2 &
+
+SINK1_1="fairmq-ex-region-sink"
+SINK1_1+=" --id sink1_1"
+SINK1_1+=" --severity debug"
+SINK1_1+=" --chan-name data2"
+SINK1_1+=" --transport $transport"
+SINK1_1+=" --shmid 1"
+SINK1_1+=" --shm-segment-id 1"
+SINK1_1+=" --shm-monitor false"
+SINK1_1+=" --shm-no-cleanup true"
+SINK1_1+=" --channel-config name=data2,type=pull,method=connect,address=tcp://127.0.0.1:7778"
+xterm -geometry 90x20+1100+0 -hold -e @EX_BIN_DIR@/$SINK1_1 &
+
+SINK1_2="fairmq-ex-region-sink"
+SINK1_2+=" --id sink1_2"
+SINK1_2+=" --severity debug"
+SINK1_2+=" --chan-name data3"
+SINK1_2+=" --transport $transport"
+SINK1_2+=" --shmid 1"
+SINK1_2+=" --shm-segment-id 1"
+SINK1_2+=" --shm-monitor false"
+SINK1_2+=" --shm-no-cleanup true"
+SINK1_2+=" --channel-config name=data3,type=pull,method=connect,address=tcp://127.0.0.1:7779"
+xterm -geometry 90x20+1100+300 -hold -e @EX_BIN_DIR@/$SINK1_2 &
+
+SINK2_1="fairmq-ex-region-sink"
+SINK2_1+=" --id sink2_1"
+SINK2_1+=" --severity debug"
+SINK2_1+=" --chan-name data2"
+SINK2_1+=" --transport $transport"
+SINK2_1+=" --shmid 1"
+SINK2_1+=" --shm-segment-id 2"
+SINK2_1+=" --shm-monitor false"
+SINK2_1+=" --shm-no-cleanup true"
+SINK2_1+=" --channel-config name=data2,type=pull,method=connect,address=tcp://127.0.0.1:7788"
+xterm -geometry 90x20+1100+600 -hold -e @EX_BIN_DIR@/$SINK2_1 &
+
+SINK2_2="fairmq-ex-region-sink"
+SINK2_2+=" --id sink2_2"
+SINK2_2+=" --severity debug"
+SINK2_2+=" --chan-name data3"
+SINK2_2+=" --transport $transport"
+SINK2_2+=" --shmid 1"
+SINK2_2+=" --shm-segment-id 2"
+SINK2_2+=" --shm-monitor false"
+SINK2_2+=" --shm-no-cleanup true"
+SINK2_2+=" --channel-config name=data3,type=pull,method=connect,address=tcp://127.0.0.1:7789"
+xterm -geometry 90x20+1100+900 -hold -e @EX_BIN_DIR@/$SINK2_2 &

examples/region/fairmq-start-ex-region-advanced.sh.in

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
+
+transport=${1:-shmem}
+msgSize=${2:-1000000}
+
+SAMPLER="fairmq-ex-region-sampler"
+SAMPLER+=" --id sampler1"
+# SAMPLER+=" --sampling-rate 10"
+SAMPLER+=" --severity debug"
+SAMPLER+=" --msg-size $msgSize"
+SAMPLER+=" --transport $transport"
+#SAMPLER+=" --rc-segment-size 0"
+SAMPLER+=" --shm-monitor true"
+SAMPLER+=" --chan-name data1"
+SAMPLER+=" --channel-config name=data1,type=push,method=bind,address=tcp://127.0.0.1:7777"
+xterm -geometry 90x60+0+0 -hold -e @EX_BIN_DIR@/$SAMPLER &
+
+PROCESSOR1="fairmq-ex-region-processor"
+PROCESSOR1+=" --id processor1"
+PROCESSOR1+=" --severity debug"
+PROCESSOR1+=" --transport $transport"
+PROCESSOR1+=" --shm-segment-id 1"
+PROCESSOR1+=" --shm-monitor true"
+PROCESSOR1+=" --channel-config name=data1,type=pull,method=connect,address=tcp://127.0.0.1:7777"
+PROCESSOR1+="                  name=data2,type=push,method=bind,address=tcp://127.0.0.1:7778"
+PROCESSOR1+="                  name=data3,type=push,method=bind,address=tcp://127.0.0.1:7779"
+xterm -geometry 90x40+550+40 -hold -e @EX_BIN_DIR@/$PROCESSOR1 &
+
+PROCESSOR2="fairmq-ex-region-processor"
+PROCESSOR2+=" --id processor2"
+PROCESSOR2+=" --severity debug"
+PROCESSOR2+=" --transport $transport"
+PROCESSOR2+=" --shm-segment-id 2"
+PROCESSOR2+=" --shm-monitor true"
+PROCESSOR2+=" --channel-config name=data1,type=pull,method=connect,address=tcp://127.0.0.1:7777"
+PROCESSOR2+="                  name=data2,type=push,method=bind,address=tcp://127.0.0.1:7788"
+PROCESSOR2+="                  name=data3,type=push,method=bind,address=tcp://127.0.0.1:7789"
+xterm -geometry 90x40+550+600 -hold -e @EX_BIN_DIR@/$PROCESSOR2 &
+
+SINK1_1="fairmq-ex-region-sink"
+SINK1_1+=" --id sink1_1"
+SINK1_1+=" --severity debug"
+SINK1_1+=" --chan-name data2"
+SINK1_1+=" --transport $transport"
+SINK1_1+=" --shm-segment-id 1"
+SINK1_1+=" --shm-monitor true"
+SINK1_1+=" --channel-config name=data2,type=pull,method=connect,address=tcp://127.0.0.1:7778"
+xterm -geometry 90x20+1100+0 -hold -e @EX_BIN_DIR@/$SINK1_1 &
+
+SINK1_2="fairmq-ex-region-sink"
+SINK1_2+=" --id sink1_2"
+SINK1_2+=" --severity debug"
+SINK1_2+=" --chan-name data3"
+SINK1_2+=" --transport $transport"
+SINK1_2+=" --shm-segment-id 1"
+SINK1_2+=" --shm-monitor true"
+SINK1_2+=" --channel-config name=data3,type=pull,method=connect,address=tcp://127.0.0.1:7779"
+xterm -geometry 90x20+1100+300 -hold -e @EX_BIN_DIR@/$SINK1_2 &
+
+SINK2_1="fairmq-ex-region-sink"
+SINK2_1+=" --id sink2_1"
+SINK2_1+=" --severity debug"
+SINK2_1+=" --chan-name data2"
+SINK2_1+=" --transport $transport"
+SINK2_1+=" --shm-segment-id 2"
+SINK2_1+=" --shm-monitor true"
+SINK2_1+=" --channel-config name=data2,type=pull,method=connect,address=tcp://127.0.0.1:7788"
+xterm -geometry 90x20+1100+600 -hold -e @EX_BIN_DIR@/$SINK2_1 &
+
+SINK2_2="fairmq-ex-region-sink"
+SINK2_2+=" --id sink2_2"
+SINK2_2+=" --severity debug"
+SINK2_2+=" --chan-name data3"
+SINK2_2+=" --transport $transport"
+SINK2_2+=" --shm-segment-id 2"
+SINK2_2+=" --shm-monitor true"
+SINK2_2+=" --channel-config name=data3,type=pull,method=connect,address=tcp://127.0.0.1:7789"
+xterm -geometry 90x20+1100+900 -hold -e @EX_BIN_DIR@/$SINK2_2 &

examples/region/fairmq-start-ex-region.sh.in

@@ -2,16 +2,8 @@
 
 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
 
-transport="shmem"
-msgSize="1000000"
-
-if [[ $1 =~ ^[a-z]+$ ]]; then
-    transport=$1
-fi
-
-if [[ $2 =~ ^[0-9]+$ ]]; then
-    msgSize=$1
-fi
+transport=${1:-shmem}
+msgSize=${2:-1000000}
 
 SAMPLER="fairmq-ex-region-sampler"
 SAMPLER+=" --id sampler1"

examples/region/keep-alive.cxx

@@ -95,10 +95,11 @@ struct ShmManager
             uint64_t size = stoull(conf.at(1));
             fair::mq::RegionConfig cfg;
             cfg.id = id;
+            cfg.rcSegmentSize = 0;
             cfg.size = size;
             regionCfgs.push_back(cfg);
 
-            auto ret = regions.emplace(id, make_unique<fair::mq::shmem::UnmanagedRegion>(shmId, id, size));
+            auto ret = regions.emplace(id, make_unique<fair::mq::shmem::UnmanagedRegion>(shmId, cfg));
             fair::mq::shmem::UnmanagedRegion& region = *(ret.first->second);
             LOG(info) << "Created unamanged region " << id << " of size " << region.GetSize()
                       << ", starting at " << region.GetData() << ". Locking...";

examples/region/processor.cxx

@@ -0,0 +1,80 @@
+/********************************************************************************
+ * Copyright (C) 2014-2021 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 <fairmq/Device.h>
+#include <fairmq/runDevice.h>
+#include <memory>
+
+namespace bpo = boost::program_options;
+using namespace std;
+using namespace fair::mq;
+
+namespace {
+
+struct Processor : Device
+{
+    void InitTask() override
+    {
+        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+        GetChannel("data1", 0).Transport()->SubscribeToRegionEvents([](RegionInfo info) {
+            LOG(info) << "Region event: " << info.event << ": "
+                      << (info.managed ? "managed" : "unmanaged") << ", id: " << info.id
+                      << ", ptr: " << info.ptr << ", size: " << info.size
+                      << ", flags: " << info.flags;
+        });
+    }
+
+    void Run() override
+    {
+        Channel& dataIn = GetChannel("data1", 0);
+        Channel& dataOut1 = GetChannel("data2", 0);
+        Channel& dataOut2 = GetChannel("data3", 0);
+
+        while (!NewStatePending()) {
+            fair::mq::Parts inParts;
+            dataIn.Receive(inParts);
+
+            fair::mq::Parts outParts1;
+            fair::mq::Parts outParts2;
+
+            for (const auto& inPart : inParts) {
+                outParts1.AddPart(NewMessage());
+                outParts1.fParts.back()->Copy(*inPart);
+
+                outParts2.AddPart(NewMessage());
+                outParts2.fParts.back()->Copy(*inPart);
+            }
+
+            dataOut1.Send(outParts1);
+            dataOut2.Send(outParts2);
+
+            if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
+                LOG(info) << "Configured max number of iterations reached. Leaving RUNNING state.";
+                break;
+            }
+        }
+    }
+
+    void ResetTask() override
+    {
+        GetChannel("data1", 0).Transport()->UnsubscribeFromRegionEvents();
+    }
+
+  private:
+    uint64_t fMaxIterations = 0;
+    uint64_t fNumIterations = 0;
+};
+
+}   // namespace
+
+void addCustomOptions(bpo::options_description& options)
+{
+    options.add_options()("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
+}
+
+unique_ptr<Device> getDevice(ProgOptions& /*config*/) { return make_unique<Processor>(); }

examples/region/sampler.cxx

@@ -8,6 +8,7 @@
 
 #include <fairmq/Device.h>
 #include <fairmq/runDevice.h>
+#include <fairmq/tools/RateLimit.h>
 
 #include <cstdint>
 #include <mutex>
@@ -23,8 +24,11 @@ struct Sampler : fair::mq::Device
         fMsgSize = fConfig->GetProperty<int>("msg-size");
         fLinger = fConfig->GetProperty<uint32_t>("region-linger");
         fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+        fChanName = fConfig->GetProperty<std::string>("chan-name");
+        fSamplingRate = fConfig->GetProperty<float>("sampling-rate");
+        fRCSegmentSize = fConfig->GetProperty<uint64_t>("rc-segment-size");
 
-        GetChannel("data", 0).Transport()->SubscribeToRegionEvents([](fair::mq::RegionInfo info) {
+        GetChannel(fChanName, 0).Transport()->SubscribeToRegionEvents([](fair::mq::RegionInfo info) {
             LOG(info) << "Region event: " << info.event << ": "
                     << (info.managed ? "managed" : "unmanaged")
                     << ", id: " << info.id
@@ -42,8 +46,9 @@ struct Sampler : fair::mq::Device
         }
         regionCfg.lock = !fExternalRegion; // mlock region after creation
         regionCfg.zero = !fExternalRegion; // zero region content after creation
+        regionCfg.rcSegmentSize = fRCSegmentSize; // size of the corresponding reference count segment
         fRegion = fair::mq::UnmanagedRegionPtr(NewUnmanagedRegionFor(
-            "data", // region is created using the transport of this channel...
+            fChanName, // region is created using the transport of this channel...
             0,      // ... and this sub-channel
             10000000, // region size
             [this](const std::vector<fair::mq::RegionBlock>& blocks) { // callback to be called when message buffers no longer needed by transport
@@ -59,22 +64,33 @@ struct Sampler : fair::mq::Device
 
     void Run() override
     {
+
+        fair::mq::tools::RateLimiter rateLimiter(fSamplingRate);
+
         while (!NewStatePending()) {
-            fair::mq::MessagePtr msg(NewMessageFor("data", // channel
-                                                0, // sub-channel
-                                                fRegion, // region
-                                                fRegion->GetData(), // ptr within region
-                                                fMsgSize, // offset from ptr
-                                                nullptr // hint
-                                                ));
+            fair::mq::Parts parts;
+            // make 64 parts
+            for (int i = 0; i < 64; ++i) {
+                parts.AddPart(NewMessageFor(
+                    fChanName, // channel
+                    0, // sub-channel
+                    fRegion, // region
+                    fRegion->GetData(), // ptr within region
+                    fMsgSize, // offset from ptr
+                    nullptr // hint
+                    ));
+            }
 
             std::lock_guard<std::mutex> lock(fMtx);
-            ++fNumUnackedMsgs;
-            if (Send(msg, "data", 0) > 0) {
+            fNumUnackedMsgs += parts.Size();
+            if (Send(parts, fChanName, 0) > 0) {
                 if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
                     LOG(info) << "Configured maximum number of iterations reached. Stopping sending.";
                     break;
                 }
+                if (fSamplingRate > 0.001) {
+                    rateLimiter.maybe_sleep();
+                }
             }
         }
 
@@ -99,7 +115,7 @@ struct Sampler : fair::mq::Device
     void ResetTask() override
     {
         fRegion.reset();
-        GetChannel("data", 0).Transport()->UnsubscribeFromRegionEvents();
+        GetChannel(fChanName, 0).Transport()->UnsubscribeFromRegionEvents();
     }
 
   private:
@@ -108,18 +124,24 @@ struct Sampler : fair::mq::Device
     uint32_t fLinger = 100;
     uint64_t fMaxIterations = 0;
     uint64_t fNumIterations = 0;
+    uint64_t fRCSegmentSize = 10000000;
     fair::mq::UnmanagedRegionPtr fRegion = nullptr;
     std::mutex fMtx;
     uint64_t fNumUnackedMsgs = 0;
+    std::string fChanName;
+    float fSamplingRate = 0.;
 };
 
 void addCustomOptions(bpo::options_description& options)
 {
     options.add_options()
+        ("chan-name", bpo::value<std::string>()->default_value("data"), "name of the output channel")
         ("msg-size", bpo::value<int>()->default_value(1000), "Message size in bytes")
+        ("sampling-rate", bpo::value<float>()->default_value(0.), "Sampling rate (Hz).")
         ("region-linger", bpo::value<uint32_t>()->default_value(100), "Linger period for regions")
         ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)")
-        ("external-region", bpo::value<bool>()->default_value(false), "Use region created by another process");
+        ("external-region", bpo::value<bool>()->default_value(false), "Use region created by another process")
+        ("rc-segment-size", bpo::value<uint64_t>()->default_value(10000000), "Size of the reference count segment for Unamanged Region");
 }
 
 std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)

examples/region/sink.cxx

@@ -22,7 +22,8 @@ struct Sink : Device
     {
         // Get the fMaxIterations value from the command line options (via fConfig)
         fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-        GetChannel("data", 0).Transport()->SubscribeToRegionEvents([](RegionInfo info) {
+        fChanName = fConfig->GetProperty<std::string>("chan-name");
+        GetChannel(fChanName, 0).Transport()->SubscribeToRegionEvents([](RegionInfo info) {
             LOG(info) << "Region event: " << info.event << ": "
                       << (info.managed ? "managed" : "unmanaged") << ", id: " << info.id
                       << ", ptr: " << info.ptr << ", size: " << info.size
@@ -32,15 +33,11 @@ struct Sink : Device
 
     void Run() override
     {
-        Channel& dataInChannel = GetChannel("data", 0);
+        Channel& dataIn = GetChannel(fChanName, 0);
 
         while (!NewStatePending()) {
-            auto msg(dataInChannel.Transport()->CreateMessage());
-            dataInChannel.Receive(msg);
-
-            // void* ptr = msg->GetData();
-            // char* cptr = static_cast<char*>(ptr);
-            // LOG(info) << "check: " << cptr[3];
+            fair::mq::Parts parts;
+            dataIn.Receive(parts);
 
             if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
                 LOG(info) << "Configured max number of iterations reached. Leaving RUNNING state.";
@@ -51,22 +48,22 @@ struct Sink : Device
 
     void ResetTask() override
     {
-        GetChannel("data", 0).Transport()->UnsubscribeFromRegionEvents();
+        GetChannel(fChanName, 0).Transport()->UnsubscribeFromRegionEvents();
     }
 
   private:
     uint64_t fMaxIterations = 0;
     uint64_t fNumIterations = 0;
+    std::string fChanName;
 };
 
 }   // namespace
 
 void addCustomOptions(bpo::options_description& options)
 {
-    options.add_options()(
-        "max-iterations",
-        bpo::value<uint64_t>()->default_value(0),
-        "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
+    options.add_options()
+        ("chan-name", bpo::value<std::string>()->default_value("data"), "name of the input channel")
+        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }
 
 unique_ptr<Device> getDevice(ProgOptions& /*config*/) { return make_unique<Sink>(); }

extern/googletest

@@ -1 +1 @@
-Subproject commit a1cc8c55195661a58ad60c3bb062a0b9c302710d
+Subproject commit 7d76a231b0e29caf86e68d1df858308cd53b2a66

fairmq/CMakeLists.txt

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2012-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2012-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -63,14 +63,21 @@ if(BUILD_FAIRMQ)
     Tools.h
     TransportFactory.h
     Transports.h
+    TransportEnum.h
     UnmanagedRegion.h
     options/FairMQProgOptions.h
     runDevice.h
     runFairMQDevice.h
     shmem/Common.h
+    shmem/Manager.h
+    shmem/Message.h
     shmem/Monitor.h
+    shmem/Poller.h
     shmem/Segment.h
+    shmem/Socket.h
+    shmem/TransportFactory.h
     shmem/UnmanagedRegion.h
+    shmem/UnmanagedRegionImpl.h
     tools/Compiler.h
     tools/CppSTL.h
     tools/Exceptions.h
@@ -95,12 +102,6 @@ if(BUILD_FAIRMQ)
     plugins/Builtin.h
     plugins/config/Config.h
     plugins/control/Control.h
-    shmem/Message.h
-    shmem/Poller.h
-    shmem/UnmanagedRegionImpl.h
-    shmem/Socket.h
-    shmem/TransportFactory.h
-    shmem/Manager.h
     zeromq/Common.h
     zeromq/Context.h
     zeromq/Message.h
@@ -108,6 +109,7 @@ if(BUILD_FAIRMQ)
     zeromq/UnmanagedRegion.h
     zeromq/Socket.h
     zeromq/TransportFactory.h
+    zeromq/ZMsg.h
   )
 
   ##########################
@@ -117,6 +119,7 @@ if(BUILD_FAIRMQ)
     Channel.cxx
     Device.cxx
     DeviceRunner.cxx
+    EventManager.cxx
     JSONParser.cxx
     MemoryResources.cxx
     Plugin.cxx
@@ -173,6 +176,15 @@ if(BUILD_FAIRMQ)
     FAIRMQ_HAS_STD_FILESYSTEM=${FAIRMQ_HAS_STD_FILESYSTEM}
     FAIRMQ_HAS_STD_PMR=${FAIRMQ_HAS_STD_PMR}
   )
+  if(DEFINED FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
+    # translate CMake boolean (TRUE, FALSE, 0, 1, OFF, ON) into C++ boolean literal (true, false)
+    if(FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
+      set(value "true")
+    else()
+      set(value "false")
+    endif()
+    target_compile_definitions(${target} PUBLIC FAIRMQ_CHANNEL_DEFAULT_AUTOBIND=${value})
+  endif()
 
 
   #######################

fairmq/Channel.cxx

@@ -12,6 +12,7 @@
 #include <fairmq/Channel.h>
 #include <fairmq/Properties.h>
 #include <fairmq/Tools.h>
+#include <fairmq/Transports.h>
 #include <random>
 #include <regex>
 #include <set>
@@ -383,4 +384,10 @@ bool Channel::BindEndpoint(string& endpoint)
     }
 }
 
+std::string Channel::GetTransportName() const { return TransportName(fTransportType); }
+
+Transport Channel::GetTransportType() const { return fTransportType; }
+
+void Channel::UpdateTransport(const std::string& transport) { fTransportType = TransportType(transport); Invalidate(); }
+
 } // namespace fair::mq

fairmq/Channel.h

@@ -14,7 +14,7 @@
 #include <fairmq/Properties.h>
 #include <fairmq/Socket.h>
 #include <fairmq/TransportFactory.h>
-#include <fairmq/Transports.h>
+#include <fairmq/TransportEnum.h>
 #include <fairmq/UnmanagedRegion.h>
 
 #include <cstdint>   // int64_t
@@ -145,11 +145,11 @@ class Channel
 
     /// Get channel transport name ("default", "zeromq" or "shmem")
     /// @return Returns channel transport name (e.g. "default", "zeromq" or "shmem")
-    std::string GetTransportName() const { return TransportName(fTransportType); }
+    std::string GetTransportName() const;
 
     /// Get channel transport type
     /// @return Returns channel transport type
-    mq::Transport GetTransportType() const { return fTransportType; }
+    mq::Transport GetTransportType() const;
 
     /// Get socket send buffer size (in number of messages)
     /// @return Returns socket send buffer size (in number of messages)
@@ -221,7 +221,7 @@ class Channel
 
     /// Set channel transport
     /// @param transport transport string ("default", "zeromq" or "shmem")
-    void UpdateTransport(const std::string& transport) { fTransportType = TransportType(transport); Invalidate(); }
+    void UpdateTransport(const std::string& transport);
 
     /// Set socket send buffer size
     /// @param sndBufSize Socket send buffer size (in number of messages)
@@ -379,7 +379,11 @@ class Channel
     static constexpr int DefaultRateLogging = 1;
     static constexpr int DefaultPortRangeMin = 22000;
     static constexpr int DefaultPortRangeMax = 23000;
+#ifdef FAIRMQ_CHANNEL_DEFAULT_AUTOBIND
+    static constexpr bool DefaultAutoBind = FAIRMQ_CHANNEL_DEFAULT_AUTOBIND;
+#else
     static constexpr bool DefaultAutoBind = true;
+#endif
 
     friend std::ostream& operator<<(std::ostream& os, const Channel& ch)
     {
@@ -425,16 +429,16 @@ class Channel
                     msg.get()
                 ));
                 msg.release();
-                msg = move(msgWrapper);
+                msg = std::move(msgWrapper);
             } else {
                 MessagePtr newMsg(NewMessage());
-                msg = move(newMsg);
+                msg = std::move(newMsg);
             }
         }
     }
 
     void CheckSendCompatibility(Parts& parts) { CheckSendCompatibility(parts.fParts); }
-    void CheckSendCompatibility(std::vector<MessagePtr>& msgVec)
+    void CheckSendCompatibility(Parts::container & msgVec)
     {
         for (auto& msg : msgVec) {
             if (fTransportType != msg->GetType()) {
@@ -446,10 +450,10 @@ class Channel
                         msg.get()
                     ));
                     msg.release();
-                    msg = move(msgWrapper);
+                    msg = std::move(msgWrapper);
                 } else {
                     MessagePtr newMsg(NewMessage());
-                    msg = move(newMsg);
+                    msg = std::move(newMsg);
                 }
             }
         }
@@ -459,18 +463,18 @@ class Channel
     {
         if (fTransportType != msg->GetType()) {
             MessagePtr newMsg(NewMessage());
-            msg = move(newMsg);
+            msg = std::move(newMsg);
         }
     }
 
     void CheckReceiveCompatibility(Parts& parts) { CheckReceiveCompatibility(parts.fParts); }
-    void CheckReceiveCompatibility(std::vector<MessagePtr>& msgVec)
+    void CheckReceiveCompatibility(Parts::container& msgVec)
     {
         for (auto& msg : msgVec) {
             if (fTransportType != msg->GetType()) {
 
                 MessagePtr newMsg(NewMessage());
-                msg = move(newMsg);
+                msg = std::move(newMsg);
             }
         }
     }

fairmq/Device.cxx

@@ -9,6 +9,7 @@
 // FairMQ
 #include <fairmq/Device.h>
 #include <fairmq/Tools.h>
+#include <fairmq/Transports.h>
 
 // boost
 #include <boost/algorithm/string.hpp>   // join/split
@@ -176,7 +177,6 @@ void Device::InitWrapper()
 
     // Fill the uninitialized channel containers
     for (auto& channel : GetChannels()) {
-        int subChannelIndex = 0;
         for (auto& subChannel : channel.second) {
             // set channel transport
             LOG(debug) << "Initializing transport for channel " << subChannel.fName << ": " << TransportNames.at(subChannel.fTransportType);
@@ -208,8 +208,6 @@ void Device::InitWrapper()
                 LOG(error) << "Cannot update configuration. Socket method (bind/connect) for channel '" << subChannel.fName << "' not specified.";
                 throw runtime_error(tools::ToString("Cannot update configuration. Socket method (bind/connect) for channel ", subChannel.fName, " not specified."));
             }
-
-            subChannelIndex++;
         }
     }
 
@@ -288,7 +286,7 @@ void Device::AttachChannels(vector<Channel*>& chans)
                 // remove the channel from the uninitialized container
                 itr = chans.erase(itr);
             } else {
-                LOG(error) << "failed to attach channel " << (*itr)->fName << " (" << (*itr)->fMethod << ")";
+                LOG(error) << "failed to attach channel " << (*itr)->fName << " (" << (*itr)->fMethod << " on " << (*itr)->fAddress << ")";
                 ++itr;
             }
         } else {

fairmq/Device.h

@@ -19,7 +19,7 @@
 #include <fairmq/StateQueue.h>
 #include <fairmq/Tools.h>
 #include <fairmq/TransportFactory.h>
-#include <fairmq/Transports.h>
+#include <fairmq/TransportEnum.h>
 #include <fairmq/UnmanagedRegion.h>
 
 // logger

fairmq/EventManager.cxx

@@ -0,0 +1,20 @@
+/********************************************************************************
+ *   Copyright (C) 2025 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 "EventManager.h"
+
+#include <string>
+#include <typeindex>
+
+template std::shared_ptr<
+    fair::mq::EventManager::Signal<fair::mq::PropertyChangeAsString, std::string>>
+    fair::mq::EventManager::GetSignal<fair::mq::PropertyChangeAsString, std::string>(
+        const std::pair<std::type_index, std::type_index>& key) const;
+
+template void fair::mq::EventManager::Subscribe<fair::mq::PropertyChangeAsString, std::string>(
+    const std::string& subscriber,
+    std::function<void(typename fair::mq::PropertyChangeAsString::KeyType, std::string)>);

fairmq/EventManager.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -57,27 +57,8 @@ class EventManager
     template<typename E, typename ...Args>
     using Signal = boost::signals2::signal<void(typename E::KeyType, Args...)>;
 
-    template<typename E, typename ...Args>
-    auto Subscribe(const std::string& subscriber, std::function<void(typename E::KeyType, Args...)> callback) -> void
-    {
-        const std::type_index event_type_index{typeid(E)};
-        const std::type_index callback_type_index{typeid(std::function<void(typename E::KeyType, Args...)>)};
-        const auto signalsKey = std::make_pair(event_type_index, callback_type_index);
-        const auto connectionsKey = std::make_pair(subscriber, signalsKey);
-
-        const auto connection = GetSignal<E, Args...>(signalsKey)->connect(callback);
-
-        {
-            std::lock_guard<std::mutex> lock{fMutex};
-
-            if (fConnections.find(connectionsKey) != fConnections.end())
-            {
-                fConnections.at(connectionsKey).disconnect();
-                fConnections.erase(connectionsKey);
-            }
-            fConnections.insert({connectionsKey, connection});
-        }
-    }
+    template<typename E, typename... Args>
+    auto Subscribe(const std::string& subscriber, std::function<void(typename E::KeyType, Args...)> callback) -> void;
 
     template<typename E, typename ...Args>
     auto Unsubscribe(const std::string& subscriber) -> void
@@ -119,21 +100,58 @@ class EventManager
     mutable std::mutex fMutex;
 
     template<typename E, typename ...Args>
-    auto GetSignal(const SignalsKey& key) const -> std::shared_ptr<Signal<E, Args...>>
+    auto GetSignal(const SignalsKey& key) const -> std::shared_ptr<Signal<E, Args...>>;
+}; /* class EventManager */
+
+struct PropertyChangeAsString : Event<std::string> {};
+
+template<typename E, typename... Args>
+auto EventManager::GetSignal(const SignalsKey& key) const -> std::shared_ptr<Signal<E, Args...>>
+{
+    std::lock_guard<std::mutex> lock{fMutex};
+
+    if (fSignals.find(key) == fSignals.end()) {
+        // wrapper is needed because boost::signals2::signal is neither copyable nor movable
+        // and I don't know how else to insert it into the map
+        auto signal = std::make_shared<Signal<E, Args...>>();
+        fSignals.insert(std::make_pair(key, signal));
+    }
+
+    return boost::any_cast<std::shared_ptr<Signal<E, Args...>>>(fSignals.at(key));
+}
+
+template<typename E, typename... Args>
+auto EventManager::Subscribe(const std::string& subscriber,
+                             std::function<void(typename E::KeyType, Args...)> callback) -> void
+{
+    const std::type_index event_type_index{typeid(E)};
+    const std::type_index callback_type_index{
+        typeid(std::function<void(typename E::KeyType, Args...)>)};
+    const auto signalsKey = std::make_pair(event_type_index, callback_type_index);
+    const auto connectionsKey = std::make_pair(subscriber, signalsKey);
+
+    const auto connection = GetSignal<E, Args...>(signalsKey)->connect(callback);
+
     {
         std::lock_guard<std::mutex> lock{fMutex};
 
-        if (fSignals.find(key) == fSignals.end())
-        {
-            // wrapper is needed because boost::signals2::signal is neither copyable nor movable
-            // and I don't know how else to insert it into the map
-            auto signal = std::make_shared<Signal<E, Args...>>();
-            fSignals.insert(std::make_pair(key, signal));
+        if (fConnections.find(connectionsKey) != fConnections.end()) {
+            fConnections.at(connectionsKey).disconnect();
+            fConnections.erase(connectionsKey);
         }
-
-        return boost::any_cast<std::shared_ptr<Signal<E, Args...>>>(fSignals.at(key));
+        fConnections.insert({connectionsKey, connection});
     }
-}; /* class EventManager */
+}
+
+extern template std::shared_ptr<
+    fair::mq::EventManager::Signal<fair::mq::PropertyChangeAsString, std::string>>
+    fair::mq::EventManager::GetSignal<fair::mq::PropertyChangeAsString, std::string>(
+        const std::pair<std::type_index, std::type_index>& key) const;
+
+extern template void
+    fair::mq::EventManager::Subscribe<fair::mq::PropertyChangeAsString, std::string>(
+        const std::string& subscriber,
+        std::function<void(typename fair::mq::PropertyChangeAsString::KeyType, std::string)>);
 
 } // namespace fair::mq
 

fairmq/MemoryResources.h

@@ -17,7 +17,7 @@
 
 #include <boost/container/container_fwd.hpp>
 #include <boost/container/flat_map.hpp>
-#include <boost/container/pmr/memory_resource.hpp>
+#include <memory_resource>
 #include <cstring>
 #include <fairmq/Message.h>
 #include <stdexcept>
@@ -27,7 +27,7 @@ namespace fair::mq {
 
 class TransportFactory;
 using byte = unsigned char;
-namespace pmr = boost::container::pmr;
+namespace pmr = std::pmr;
 
 /// All FairMQ related memory resources need to inherit from this interface
 /// class for the

fairmq/Message.h

@@ -10,7 +10,7 @@
 #define FAIR_MQ_MESSAGE_H
 
 #include <cstddef>   // for size_t
-#include <fairmq/Transports.h>
+#include <fairmq/TransportEnum.h>
 #include <memory>   // unique_ptr
 #include <stdexcept>
 
@@ -46,7 +46,7 @@ struct Message
     virtual void* GetData() const = 0;
     virtual size_t GetSize() const = 0;
 
-    virtual bool SetUsedSize(size_t size) = 0;
+    virtual bool SetUsedSize(size_t size, Alignment alignment = Alignment{0}) = 0;
 
     virtual Transport GetType() const = 0;
     TransportFactory* GetTransport() { return fTransport; }
@@ -76,6 +76,11 @@ struct MessageBadAlloc : std::runtime_error
     using std::runtime_error::runtime_error;
 };
 
+struct RefCountBadAlloc : std::runtime_error
+{
+    using std::runtime_error::runtime_error;
+};
+
 }   // namespace fair::mq
 
 using fairmq_free_fn [[deprecated("Use fair::mq::FreeFn")]] = fair::mq::FreeFn;

fairmq/ProgOptions.cxx

@@ -448,3 +448,6 @@ void ProgOptions::PrintOptionsRaw() const
 }
 
 } // namespace fair::mq
+
+template void fair::mq::ProgOptions::SetProperty<std::string>(const std::string& key, std::string val);
+template void fair::mq::ProgOptions::SetProperty<int>(const std::string& key, int val);

fairmq/ProgOptions.h

@@ -129,17 +129,7 @@ class ProgOptions
     /// @param key
     /// @param val
     template<typename T>
-    void SetProperty(const std::string& key, T val)
-    {
-        std::unique_lock<std::mutex> lock(fMtx);
-
-        SetVarMapValue<typename std::decay<T>::type>(key, val);
-
-        lock.unlock();
-
-        fEvents.Emit<fair::mq::PropertyChange, typename std::decay<T>::type>(key, val);
-        fEvents.Emit<fair::mq::PropertyChangeAsString, std::string>(key, GetPropertyAsString(key));
-    }
+    void SetProperty(const std::string& key, T val);
 
     /// @brief Updates an existing config property (or fails if it doesn't exist)
     /// @param key
@@ -275,5 +265,20 @@ class ProgOptions
 };
 
 } // namespace fair::mq
+template <typename T>
+void fair::mq::ProgOptions::SetProperty(const std::string& key, T val)
+{
+    std::unique_lock<std::mutex> lock(fMtx);
+
+    SetVarMapValue<typename std::decay<T>::type>(key, val);
+
+    lock.unlock();
+
+    fEvents.Emit<fair::mq::PropertyChange, typename std::decay<T>::type>(key, val);
+    fEvents.Emit<fair::mq::PropertyChangeAsString, std::string>(key, GetPropertyAsString(key));
+}
+
+extern template void fair::mq::ProgOptions::SetProperty<int>(const std::string& key, int val);
+extern template void fair::mq::ProgOptions::SetProperty<std::string>(const std::string& key, std::string val);
 
 #endif /* FAIR_MQ_PROGOPTIONS_H */

fairmq/Properties.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -29,7 +29,6 @@ using Property = boost::any;
 using Properties = std::map<std::string, Property>;
 
 struct PropertyChange : Event<std::string> {};
-struct PropertyChangeAsString : Event<std::string> {};
 
 class PropertyHelper
 {

fairmq/Socket.h

@@ -52,8 +52,8 @@ struct Socket
 
     virtual int64_t Send(MessagePtr& msg, int timeout = -1) = 0;
     virtual int64_t Receive(MessagePtr& msg, int timeout = -1) = 0;
-    virtual int64_t Send(std::vector<std::unique_ptr<Message>>& msgVec, int timeout = -1) = 0;
-    virtual int64_t Receive(std::vector<std::unique_ptr<Message>>& msgVec, int timeout = -1) = 0;
+    virtual int64_t Send(Parts::container& msgVec, int timeout = -1) = 0;
+    virtual int64_t Receive(Parts::container & msgVec, int timeout = -1) = 0;
     virtual int64_t Send(Parts& parts, int timeout = -1) { return Send(parts.fParts, timeout); }
     virtual int64_t Receive(Parts& parts, int timeout = -1) { return Receive(parts.fParts, timeout); }
 

fairmq/StateMachine.cxx

@@ -177,6 +177,7 @@ struct Machine_ : public state_machine_def<Machine_>
     atomic<bool> fLastTransitionResult;
 
     mutex fStateMtx;
+    mutex fSubscriptionsMtx;
     atomic<bool> fNewStatePending;
     condition_variable fNewStatePendingCV;
 
@@ -310,12 +311,17 @@ try {
 
 void StateMachine::SubscribeToStateChange(const string& key, function<void(const State)> callback)
 {
-    static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignalsMap.insert({key, static_pointer_cast<FairMQFSM>(fFsm)->fStateChangeSignal.connect(callback)});
+    // Check if the key has a integer value as prefix, if yes, decode it.
+    int i = strtol(key.c_str(), nullptr, 10);
+    auto fsm = static_pointer_cast<FairMQFSM>(fFsm);
+    lock_guard<mutex> lock(fsm->fSubscriptionsMtx);
+    fsm->fStateChangeSignalsMap.insert({key, fsm->fStateChangeSignal.connect(i, callback)});
 }
 
 void StateMachine::UnsubscribeFromStateChange(const string& key)
 {
     auto fsm = static_pointer_cast<FairMQFSM>(fFsm);
+    lock_guard<mutex> lock(fsm->fSubscriptionsMtx);
     if (fsm->fStateChangeSignalsMap.count(key)) {
         fsm->fStateChangeSignalsMap.at(key).disconnect();
         fsm->fStateChangeSignalsMap.erase(key);
@@ -355,12 +361,15 @@ void StateMachine::StopHandlingStates()
 
 void StateMachine::SubscribeToNewTransition(const string& key, function<void(const Transition)> callback)
 {
-    static_pointer_cast<FairMQFSM>(fFsm)->fNewTransitionSignalsMap.insert({key, static_pointer_cast<FairMQFSM>(fFsm)->fNewTransitionSignal.connect(callback)});
+    auto fsm = static_pointer_cast<FairMQFSM>(fFsm);
+    lock_guard<mutex> lock(fsm->fSubscriptionsMtx);
+    fsm->fNewTransitionSignalsMap.insert({key, fsm->fNewTransitionSignal.connect(callback)});
 }
 
 void StateMachine::UnsubscribeFromNewTransition(const string& key)
 {
     auto fsm = static_pointer_cast<FairMQFSM>(fFsm);
+    lock_guard<mutex> lock(fsm->fSubscriptionsMtx);
     if (fsm->fNewTransitionSignalsMap.count(key)) {
         fsm->fNewTransitionSignalsMap.at(key).disconnect();
         fsm->fNewTransitionSignalsMap.erase(key);

fairmq/TransportEnum.h

@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (C) 2014-2025 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_TRANSPORTENUMS_H
+#define FAIR_MQ_TRANSPORTENUMS_H
+
+namespace fair::mq {
+
+enum class Transport {
+    DEFAULT,
+    ZMQ,
+    SHM
+};
+
+}
+
+#endif // FAIR_MQ_TRANSPORTENUMS_H

fairmq/TransportFactory.h

@@ -14,7 +14,7 @@
 #include <fairmq/Message.h>
 #include <fairmq/Poller.h>
 #include <fairmq/Socket.h>
-#include <fairmq/Transports.h>
+#include <fairmq/TransportEnum.h>
 #include <fairmq/UnmanagedRegion.h>
 #include <memory>   // shared_ptr
 #include <stdexcept>

fairmq/Transports.h

@@ -10,6 +10,7 @@
 #define FAIR_MQ_TRANSPORTS_H
 
 #include <fairmq/tools/Strings.h>
+#include <fairmq/TransportEnum.h>
 #include <memory>
 #include <ostream>
 #include <stdexcept>
@@ -18,13 +19,6 @@
 
 namespace fair::mq {
 
-enum class Transport
-{
-    DEFAULT,
-    ZMQ,
-    SHM
-};
-
 struct TransportError : std::runtime_error
 {
     using std::runtime_error::runtime_error;

fairmq/UnmanagedRegion.h

@@ -9,7 +9,7 @@
 #ifndef FAIR_MQ_UNMANAGEDREGION_H
 #define FAIR_MQ_UNMANAGEDREGION_H
 
-#include <fairmq/Transports.h>
+#include <fairmq/TransportEnum.h>
 
 #include <cstddef>   // size_t
 #include <cstdint>   // uint32_t
@@ -134,6 +134,7 @@ struct RegionConfig
     int creationFlags = 0; /// flags passed to the underlying transport on region creation
     int64_t userFlags = 0; /// custom flags that have no effect on the transport, but can be retrieved from the region by the user
     uint64_t size = 0; /// region size
+    uint64_t rcSegmentSize = 100000000; /// size of the segment that stores reference counts when "soft"-copying the messages
     std::string path = ""; /// file path, if the region is backed by a file
     std::optional<uint16_t> id = std::nullopt; /// region id
     uint32_t linger = 100; /// delay in ms before region destruction to collect outstanding events

fairmq/Version.h.in

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2018-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2018-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -19,7 +19,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-2023 GSI"
+#define FAIRMQ_COPYRIGHT "2012-2025 GSI"
 #define FAIRMQ_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 
 #endif // FAIR_MQ_VERSION_H

fairmq/devices/startMQBenchmark.sh.in

@@ -72,6 +72,7 @@ SAMPLER+=" --msg-size $msgSize"
 SAMPLER+=" --multipart $multipart"
 SAMPLER+=" --num-parts $numParts"
 SAMPLER+=" --shm-throw-bad-alloc false"
+# SAMPLER+=" --shm-metadata-msg-size 1024"
 # SAMPLER+=" --msg-rate 1000"
 SAMPLER+=" --max-iterations $maxIterations"
 SAMPLER+=" --channel-config name=data,type=pair,method=bind,address=tcp://127.0.0.1:5555"

fairmq/plugins/config/Config.cxx

@@ -11,6 +11,7 @@
 #include <fairmq/JSONParser.h>
 #include <fairmq/SuboptParser.h>
 
+#include <cstddef>  // for std::size_t
 #include <vector>
 
 using namespace std;
@@ -72,6 +73,7 @@ Plugin::ProgOptions ConfigPluginProgramOptions()
         ("shm-zero-segment",              po::value<bool          >()->default_value(false),             "Shared memory: zero the shared memory segment memory after initialization (opened or created).")
         ("shm-zero-segment-on-creation",  po::value<bool          >()->default_value(false),             "Shared memory: zero the shared memory segment memory only once when created.")
         ("shm-throw-bad-alloc",           po::value<bool          >()->default_value(true),              "Shared memory: throw fair::mq::MessageBadAlloc if cannot allocate a message (retry if false).")
+        ("shm-metadata-msg-size",         po::value<std::size_t   >()->default_value(0),                 "Shared memory: size of the zmq metadata message (values smaller than minimum are clamped to the minimum).")
         ("bad-alloc-max-attempts",        po::value<int           >(),                                   "Maximum number of allocation attempts before throwing fair::mq::MessageBadAlloc. -1 is infinite. There is always at least one attempt, so 0 has safe effect as 1.")
         ("bad-alloc-attempt-interval",    po::value<int           >()->default_value(50),                "Interval between attempts if cannot allocate a message (in ms).")
         ("shm-monitor",                   po::value<bool          >()->default_value(false),             "Shared memory: run monitor daemon.")

fairmq/plugins/control/Control.cxx

@@ -65,13 +65,17 @@ Control::Control(const string& name, Plugin::Version version, const string& main
     });
 
     try {
-        TakeDeviceControl();
-
         auto control = GetProperty<string>("control");
 
+        if (control != "none") {
+            TakeDeviceControl();
+        }
+
         if (control == "static") {
             LOG(debug) << "Running builtin controller: static";
             fControllerThread = thread(&Control::StaticMode, this);
+        } else if (control == "none") {
+            LOG(debug) << "Builtin controller: disabled";
         } else if (control == "gui") {
             LOG(debug) << "Running builtin controller: gui";
             fControllerThread = thread(&Control::GUIMode, this);
@@ -142,7 +146,7 @@ auto ControlPluginProgramOptions() -> Plugin::ProgOptions
     namespace po = boost::program_options;
     auto pluginOptions = po::options_description{"Control (builtin) Plugin"};
     pluginOptions.add_options()
-        ("control",       po::value<string>()->default_value("dynamic"), "Control mode, 'static' or 'dynamic' (aliases for dynamic are external and interactive)")
+        ("control",       po::value<string>()->default_value("dynamic"), "Control mode, 'static' or 'dynamic' (aliases for dynamic are external and interactive), 'none', 'gui'")
         ("catch-signals", po::value<int   >()->default_value(1),             "Enable signal handling (1/0).");
     return pluginOptions;
 }
@@ -271,11 +275,11 @@ auto Control::InteractiveMode() -> void
 try {
     RunStartupSequence();
 
-    if(!fDeviceShutdownRequested) {
+    if (!fDeviceShutdownRequested) {
         RunREPL();
     }
 
-    if(!fDeviceShutdownRequested) {
+    if (!fDeviceShutdownRequested) {
         RunShutdownSequence();
     }
 } catch (PluginServices::DeviceControlError& e) {
@@ -404,7 +408,7 @@ try {
     // or for device shutdown request (Ctrl-C)
     fStateQueue.WaitForNextOrCustom([this]{ return fDeviceShutdownRequested.load(); });
 
-    if(!fDeviceShutdownRequested) {
+    if (!fDeviceShutdownRequested) {
         RunShutdownSequence();
     }
 } catch (PluginServices::DeviceControlError& e) {
@@ -421,7 +425,7 @@ try {
     // Wait for device shutdown request (Ctrl-C)
     fStateQueue.WaitForCustom([this]{ return fDeviceShutdownRequested.load(); });
 
-    if(!fDeviceShutdownRequested) {
+    if (!fDeviceShutdownRequested) {
         RunShutdownSequence();
     }
 } catch (PluginServices::DeviceControlError& e) {

fairmq/shmem/Common.h

@@ -13,6 +13,8 @@
 #include <functional> // std::equal_to
 
 #include <boost/functional/hash.hpp>
+// #include <boost/interprocess/allocators/adaptive_pool.hpp>
+#include <boost/interprocess/allocators/node_allocator.hpp>
 #include <boost/interprocess/allocators/allocator.hpp>
 #include <boost/interprocess/containers/map.hpp>
 #include <boost/interprocess/containers/string.hpp>
@@ -21,10 +23,12 @@
 #include <boost/interprocess/managed_shared_memory.hpp>
 #include <boost/interprocess/mem_algo/simple_seq_fit.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/variant.hpp>
+#include <variant>
 
 #include <sys/types.h>
 
+#include <fairmq/tools/Strings.h>
+
 namespace fair::mq::shmem
 {
 
@@ -41,6 +45,36 @@ using RBTreeBestFitSegment = boost::interprocess::basic_managed_shared_memory<ch
     boost::interprocess::null_index>;
     // boost::interprocess::iset_index>;
 
+inline std::string MakeShmName(const std::string& shmId, const std::string& type) {
+    return std::string("fmq_" + shmId + "_" + type);
+}
+
+inline std::string MakeShmName(const std::string& shmId, const std::string& type, int index) {
+    return std::string(MakeShmName(shmId, type) + "_" + std::to_string(index));
+}
+
+struct RefCount
+{
+    explicit RefCount(uint16_t c)
+        : count(c)
+    {}
+
+    uint16_t Get() { return count.load(); }
+    uint16_t Increment() { return count.fetch_add(1); }
+    uint16_t Decrement() { return count.fetch_sub(1); }
+
+    std::atomic<uint16_t> count;
+};
+
+// Number of nodes allocated at once when the allocator runs out of nodes.
+static constexpr size_t numNodesPerBlock = 4096;
+// Maximum number of totally free blocks that the adaptive node pool will hold.
+// The rest of the totally free blocks will be deallocated with the segment manager.
+// static constexpr size_t maxFreeBlocks = 2;
+
+using RefCountPool = boost::interprocess::node_allocator<RefCount, boost::interprocess::managed_shared_memory::segment_manager, numNodesPerBlock>;
+// using RefCountPool = boost::interprocess::adaptive_pool<RefCount, boost::interprocess::managed_shared_memory::segment_manager, numNodesPerBlock, maxFreeBlocks>;
+
 using SegmentManager = boost::interprocess::managed_shared_memory::segment_manager;
 using VoidAlloc      = boost::interprocess::allocator<void, SegmentManager>;
 using CharAlloc      = boost::interprocess::allocator<char, SegmentManager>;
@@ -48,6 +82,90 @@ using Str            = boost::interprocess::basic_string<char, std::char_traits<
 using StrAlloc       = boost::interprocess::allocator<Str, SegmentManager>;
 using StrVector      = boost::interprocess::vector<Str, StrAlloc>;
 
+// ShmHeader stores user buffer alignment and the reference count in the following structure:
+// [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
+// The alignment of Hdr depends on the alignment of std::atomic and is stored in the first entry
+struct ShmHeader
+{
+    struct Hdr
+    {
+        uint16_t userOffset;
+        std::atomic<uint16_t> refCount;
+    };
+
+    static Hdr* HdrPtr(char* ptr)
+    {
+        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
+        //                                     ^
+        return reinterpret_cast<Hdr*>(ptr + sizeof(uint16_t) + *(reinterpret_cast<uint16_t*>(ptr)));
+    }
+
+    static uint16_t HdrPartSize() // [HdrOffset(uint16_t)][Hdr alignment][Hdr]
+    {
+        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
+        // <--------------------------------------->
+        return sizeof(uint16_t) + alignof(Hdr) + sizeof(Hdr);
+    }
+
+    static std::atomic<uint16_t>& RefCountPtr(char* ptr)
+    {
+        // get the ref count ptr from the Hdr
+        return HdrPtr(ptr)->refCount;
+    }
+
+    static uint16_t UserOffset(char* ptr)
+    {
+        return HdrPartSize() + HdrPtr(ptr)->userOffset;
+    }
+
+    static char* UserPtr(char* ptr)
+    {
+        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
+        //                                                                 ^
+        return ptr + HdrPartSize() + HdrPtr(ptr)->userOffset;
+    }
+
+    static uint16_t RefCount(char* ptr) { return RefCountPtr(ptr).load(); }
+    static uint16_t IncrementRefCount(char* ptr) { return RefCountPtr(ptr).fetch_add(1); }
+    static uint16_t DecrementRefCount(char* ptr) { return RefCountPtr(ptr).fetch_sub(1); }
+
+    static size_t FullSize(size_t size, size_t alignment)
+    {
+        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
+        // <--------------------------------------------------------------------------->
+        return HdrPartSize() + alignment + size;
+    }
+
+    static void Construct(char* ptr, size_t alignment)
+    {
+        // place the Hdr in the aligned location, fill it and store its offset to HdrOffset
+
+        // the address alignment should be at least 2
+        assert(reinterpret_cast<uintptr_t>(ptr) % 2 == 0);
+
+        // offset to the beginning of the Hdr. store it in the beginning
+        uint16_t hdrOffset = alignof(Hdr) - ((reinterpret_cast<uintptr_t>(ptr) + sizeof(uint16_t)) % alignof(Hdr));
+        memcpy(ptr, &hdrOffset, sizeof(hdrOffset));
+
+        // offset to the beginning of the user buffer, store in Hdr together with the ref count
+        uint16_t userOffset = alignment - ((reinterpret_cast<uintptr_t>(ptr) + HdrPartSize()) % alignment);
+        new(ptr + sizeof(uint16_t) + hdrOffset) Hdr{ userOffset, std::atomic<uint16_t>(1) };
+    }
+
+    static void Destruct(char* ptr) { RefCountPtr(ptr).~atomic(); }
+};
+
+struct MetaHeader
+{
+    size_t fSize; // size of the shm buffer
+    size_t fHint; // user-defined value, given by the user on message creation and returned to the user on "buffer no longer needed"-callbacks
+    boost::interprocess::managed_shared_memory::handle_t fHandle; // handle to shm buffer, convertible to shm buffer ptr
+    mutable boost::interprocess::managed_shared_memory::handle_t fShared; // handle to the buffer storing the ref count for shared buffers
+    uint16_t fRegionId; // id of the unmanaged region
+    mutable uint16_t fSegmentId; // id of the managed segment
+    bool fManaged; // true = managed segment, false = unmanaged region
+};
+
 enum class AllocationAlgorithm : int
 {
     rbtree_best_fit,
@@ -56,19 +174,12 @@ enum class AllocationAlgorithm : int
 
 struct RegionInfo
 {
-    RegionInfo(const VoidAlloc& alloc)
-        : fPath("", alloc)
-        , fCreationFlags(0)
-        , fUserFlags(0)
-        , fSize(0)
-        , fDestroyed(false)
-    {}
-
-    RegionInfo(const char* path, int flags, uint64_t userFlags, uint64_t size, const VoidAlloc& alloc)
+    RegionInfo(const char* path, int flags, uint64_t userFlags, uint64_t size, uint64_t rcSegmentSize, const VoidAlloc& alloc)
         : fPath(path, alloc)
         , fCreationFlags(flags)
         , fUserFlags(userFlags)
         , fSize(size)
+        , fRCSegmentSize(rcSegmentSize)
         , fDestroyed(false)
     {}
 
@@ -76,6 +187,7 @@ struct RegionInfo
     int fCreationFlags;
     uint64_t fUserFlags;
     uint64_t fSize;
+    uint64_t fRCSegmentSize;
     bool fDestroyed;
 };
 
@@ -143,17 +255,6 @@ struct RegionCounter
     std::atomic<uint16_t> fCount;
 };
 
-struct MetaHeader
-{
-    size_t fSize;
-    size_t fHint;
-    boost::interprocess::managed_shared_memory::handle_t fHandle;
-    mutable boost::interprocess::managed_shared_memory::handle_t fShared;
-    uint16_t fRegionId;
-    mutable uint16_t fSegmentId;
-    bool fManaged;
-};
-
 #ifdef FAIRMQ_DEBUG_MODE
 struct MsgCounter
 {
@@ -219,73 +320,7 @@ std::string makeShmIdStr(const std::string& sessionId);
 std::string makeShmIdStr(uint64_t val);
 uint64_t makeShmIdUint64(const std::string& sessionId);
 
-
-struct SegmentSize : public boost::static_visitor<size_t>
-{
-    template<typename S>
-    size_t operator()(S& s) const { return s.get_size(); }
-};
-
-struct SegmentAddress : public boost::static_visitor<void*>
-{
-    template<typename S>
-    void* operator()(S& s) const { return s.get_address(); }
-};
-
-struct SegmentMemoryZeroer : public boost::static_visitor<>
-{
-    template<typename S>
-    void operator()(S& s) const { s.zero_free_memory(); }
-};
-
-struct SegmentFreeMemory : public boost::static_visitor<size_t>
-{
-    template<typename S>
-    size_t operator()(S& s) const { return s.get_free_memory(); }
-};
-
-struct SegmentHandleFromAddress : public boost::static_visitor<boost::interprocess::managed_shared_memory::handle_t>
-{
-    SegmentHandleFromAddress(const void* _ptr) : ptr(_ptr) {}
-
-    template<typename S>
-    boost::interprocess::managed_shared_memory::handle_t operator()(S& s) const { return s.get_handle_from_address(ptr); }
-
-    const void* ptr;
-};
-
-struct SegmentAddressFromHandle : public boost::static_visitor<char*>
-{
-    SegmentAddressFromHandle(const boost::interprocess::managed_shared_memory::handle_t _handle) : handle(_handle) {}
-
-    template<typename S>
-    char* operator()(S& s) const { return reinterpret_cast<char*>(s.get_address_from_handle(handle)); }
-
-    const boost::interprocess::managed_shared_memory::handle_t handle;
-};
-
-struct SegmentAllocate : public boost::static_visitor<char*>
-{
-    SegmentAllocate(const size_t _size) : size(_size) {}
-
-    template<typename S>
-    char* operator()(S& s) const { return reinterpret_cast<char*>(s.allocate(size)); }
-
-    const size_t size;
-};
-
-struct SegmentAllocateAligned : public boost::static_visitor<void*>
-{
-    SegmentAllocateAligned(const size_t _size, const size_t _alignment) : size(_size), alignment(_alignment) {}
-
-    template<typename S>
-    void* operator()(S& s) const { return s.allocate_aligned(size, alignment); }
-
-    const size_t size;
-    const size_t alignment;
-};
-
-struct SegmentBufferShrink : public boost::static_visitor<char*>
+struct SegmentBufferShrink
 {
     SegmentBufferShrink(const size_t _new_size, char* _local_ptr)
         : new_size(_new_size)
@@ -303,16 +338,6 @@ struct SegmentBufferShrink : public boost::static_visitor<char*>
     mutable char* local_ptr;
 };
 
-struct SegmentDeallocate : public boost::static_visitor<>
-{
-    SegmentDeallocate(char* _ptr) : ptr(_ptr) {}
-
-    template<typename S>
-    void operator()(S& s) const { return s.deallocate(ptr); }
-
-    char* ptr;
-};
-
 } // namespace fair::mq::shmem
 
 #endif /* FAIR_MQ_SHMEM_COMMON_H_ */

fairmq/shmem/Manager.h

@@ -24,12 +24,11 @@
 #include <boost/interprocess/sync/interprocess_condition.hpp>
 #include <boost/interprocess/sync/interprocess_mutex.hpp>
 #include <boost/interprocess/sync/named_mutex.hpp>
-#include <boost/variant.hpp>
 
 #include <algorithm> // max
 #include <chrono>
 #include <condition_variable>
-#include <cstddef> // max_align_t
+#include <cstddef> // max_align_t, std::size_t
 #include <cstdlib> // getenv
 #include <cstring> // memcpy
 #include <memory> // make_unique
@@ -42,6 +41,7 @@
 #include <tuple>
 #include <unordered_map>
 #include <utility> // pair
+#include <variant>
 #include <vector>
 
 #include <unistd.h> // getuid
@@ -51,79 +51,6 @@
 namespace fair::mq::shmem
 {
 
-// ShmHeader stores user buffer alignment and the reference count in the following structure:
-// [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
-// The alignment of Hdr depends on the alignment of std::atomic and is stored in the first entry
-struct ShmHeader
-{
-    struct Hdr
-    {
-        uint16_t userOffset;
-        std::atomic<uint16_t> refCount;
-    };
-
-    static Hdr* HdrPtr(char* ptr)
-    {
-        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
-        //                                     ^
-        return reinterpret_cast<Hdr*>(ptr + sizeof(uint16_t) + *(reinterpret_cast<uint16_t*>(ptr)));
-    }
-
-    static uint16_t HdrPartSize() // [HdrOffset(uint16_t)][Hdr alignment][Hdr]
-    {
-        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
-        // <--------------------------------------->
-        return sizeof(uint16_t) + alignof(Hdr) + sizeof(Hdr);
-    }
-
-    static std::atomic<uint16_t>& RefCountPtr(char* ptr)
-    {
-        // get the ref count ptr from the Hdr
-        return HdrPtr(ptr)->refCount;
-    }
-
-    static uint16_t UserOffset(char* ptr)
-    {
-        return HdrPartSize() + HdrPtr(ptr)->userOffset;
-    }
-
-    static char* UserPtr(char* ptr)
-    {
-        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
-        //                                                                 ^
-        return ptr + HdrPartSize() + HdrPtr(ptr)->userOffset;
-    }
-
-    static uint16_t RefCount(char* ptr) { return RefCountPtr(ptr).load(); }
-    static uint16_t IncrementRefCount(char* ptr) { return RefCountPtr(ptr).fetch_add(1); }
-    static uint16_t DecrementRefCount(char* ptr) { return RefCountPtr(ptr).fetch_sub(1); }
-
-    static size_t FullSize(size_t size, size_t alignment)
-    {
-        // [HdrOffset(uint16_t)][Hdr alignment][Hdr][user buffer alignment][user buffer]
-        // <--------------------------------------------------------------------------->
-        return HdrPartSize() + alignment + size;
-    }
-
-    static void Construct(char* ptr, size_t alignment)
-    {
-        // place the Hdr in the aligned location, fill it and store its offset to HdrOffset
-
-        // the address alignment should be at least 2
-        assert(reinterpret_cast<uintptr_t>(ptr) % 2 == 0);
-
-        // offset to the beginning of the Hdr. store it in the beginning
-        uint16_t hdrOffset = alignof(Hdr) - ((reinterpret_cast<uintptr_t>(ptr) + sizeof(uint16_t)) % alignof(Hdr));
-        memcpy(ptr, &hdrOffset, sizeof(hdrOffset));
-
-        // offset to the beginning of the user buffer, store in Hdr together with the ref count
-        uint16_t userOffset = alignment - ((reinterpret_cast<uintptr_t>(ptr) + HdrPartSize()) % alignment);
-        new(ptr + sizeof(uint16_t) + hdrOffset) Hdr{ userOffset, std::atomic<uint16_t>(1) };
-    }
-
-    static void Destruct(char* ptr) { RefCountPtr(ptr).~atomic(); }
-};
-
 class Manager
 {
   public:
@@ -131,7 +58,7 @@ class Manager
         : fShmId64(config ? config->GetProperty<uint64_t>("shmid", makeShmIdUint64(sessionName)) : makeShmIdUint64(sessionName))
         , fShmId(makeShmIdStr(fShmId64))
         , fSegmentId(config ? config->GetProperty<uint16_t>("shm-segment-id", 0) : 0)
-        , fManagementSegment(boost::interprocess::open_or_create, std::string("fmq_" + fShmId + "_mng").c_str(), kManagementSegmentSize)
+        , fManagementSegment(boost::interprocess::open_or_create, MakeShmName(fShmId, "mng").c_str(), kManagementSegmentSize)
         , fShmVoidAlloc(fManagementSegment.get_segment_manager())
         , fShmMtx(fManagementSegment.find_or_construct<boost::interprocess::interprocess_mutex>(boost::interprocess::unique_instance)())
         , fNumObservedEvents(0)
@@ -151,6 +78,7 @@ class Manager
         , fBadAllocMaxAttempts(1)
         , fBadAllocAttemptIntervalInMs(config ? config->GetProperty<int>("bad-alloc-attempt-interval", 50) : 50)
         , fNoCleanup(config ? config->GetProperty<bool>("shm-no-cleanup", false) : false)
+        , fMetadataMsgSize(config ? config->GetProperty<std::size_t>("shm-metadata-msg-size", 0) : 0)
     {
         using namespace boost::interprocess;
 
@@ -230,7 +158,7 @@ class Manager
             bool createdSegment = false;
 
             try {
-                std::string segmentName("fmq_" + fShmId + "_m_" + std::to_string(fSegmentId));
+                std::string segmentName = MakeShmName(fShmId, "m", fSegmentId);
                 auto it = fShmSegments->find(fSegmentId);
                 if (it == fShmSegments->end()) {
                     // no segment with given id exists, creating
@@ -265,8 +193,8 @@ class Manager
                     }
                 }
                 LOG(debug) << (createdSegment ? "Created" : "Opened") << " managed shared memory segment " << "fmq_" << fShmId << "_m_" << fSegmentId
-                    << ". Size: " << boost::apply_visitor(SegmentSize(), fSegments.at(fSegmentId)) << " bytes."
-                    << " Available: " << boost::apply_visitor(SegmentFreeMemory(), fSegments.at(fSegmentId)) << " bytes."
+                    << ". Size: " << std::visit([](auto& s) { return s.get_size(); }, fSegments.at(fSegmentId)) << " bytes."
+                    << " Available: " << std::visit([](auto& s) { return s.get_free_memory(); }, fSegments.at(fSegmentId)) << " bytes."
                     << " Allocation algorithm: " << allocationAlgorithm;
             } catch (interprocess_exception& bie) {
                 LOG(error) << "Failed to create/open shared memory segment '" << "fmq_" << fShmId << "_m_" << fSegmentId << "': " << bie.what();
@@ -304,14 +232,16 @@ class Manager
     void ZeroSegment(uint16_t id)
     {
         LOG(debug) << "Zeroing the managed segment free memory...";
-        boost::apply_visitor(SegmentMemoryZeroer(), fSegments.at(id));
+        std::visit([](auto& s) { return s.zero_free_memory(); }, fSegments.at(id));
         LOG(debug) << "Successfully zeroed the managed segment free memory.";
     }
 
     void MlockSegment(uint16_t id)
     {
         LOG(debug) << "Locking the managed segment memory pages...";
-        if (mlock(boost::apply_visitor(SegmentAddress(), fSegments.at(id)), boost::apply_visitor(SegmentSize(), fSegments.at(id))) == -1) {
+        if (mlock(
+                std::visit([](auto& s) { return s.get_address(); }, fSegments.at(id)),
+                std::visit([](auto& s) { return s.get_size(); }, fSegments.at(id))) == -1) {
             LOG(error) << "Could not lock the managed segment memory. Code: " << errno << ", reason: " << strerror(errno);
             throw TransportError(tools::ToString("Could not lock the managed segment memory: ", strerror(errno)));
         }
@@ -326,7 +256,7 @@ class Manager
     {
         using namespace boost::interprocess;
         try {
-            named_mutex monitorStatus(open_only, std::string("fmq_" + id + "_ms").c_str());
+            named_mutex monitorStatus(open_only, MakeShmName(id, "ms").c_str());
             LOG(debug) << "Found fairmq-shmmonitor for shared memory id " << id;
         } catch (interprocess_exception&) {
             LOG(debug) << "no fairmq-shmmonitor found for shared memory id " << id << ", starting...";
@@ -335,7 +265,7 @@ class Manager
                 int numTries = 0;
                 do {
                     try {
-                        named_mutex monitorStatus(open_only, std::string("fmq_" + id + "_ms").c_str());
+                        named_mutex monitorStatus(open_only, MakeShmName(id, "ms").c_str());
                         LOG(debug) << "Started fairmq-shmmonitor for shared memory id " << id;
                         break;
                     } catch (interprocess_exception&) {
@@ -409,6 +339,12 @@ class Manager
                     LOG(debug) << "Unmanaged region (view) already present, promoting to controller";
                     region->BecomeController(cfg);
                 } else {
+                    // we need to update local config, if the region information already exists
+                    auto info = fShmRegions->find(id);
+                    if (info != fShmRegions->end()) {
+                        cfg.rcSegmentSize = info->second.fRCSegmentSize;
+                    }
+
                     auto res = fRegions.emplace(id, std::make_unique<UnmanagedRegion>(fShmId, size, true, cfg));
                     region = res.first->second.get();
                 }
@@ -465,31 +401,32 @@ class Manager
         auto it = fRegions.find(id);
         if (it != fRegions.end()) {
             return it->second.get();
-        } else {
-            try {
-                RegionConfig cfg;
-                // get region info
-                {
-                    boost::interprocess::scoped_lock<boost::interprocess::interprocess_mutex> shmLock(*fShmMtx);
-                    RegionInfo regionInfo = fShmRegions->at(id);
-                    cfg.id = id;
-                    cfg.creationFlags = regionInfo.fCreationFlags;
-                    cfg.path = regionInfo.fPath.c_str();
-                }
-                // LOG(debug) << "Located remote region with id '" << id << "', path: '" << cfg.path << "', flags: '" << cfg.creationFlags << "'";
+        }
 
-                auto r = fRegions.emplace(id, std::make_unique<UnmanagedRegion>(fShmId, 0, false, std::move(cfg)));
-                r.first->second->InitializeQueues();
-                r.first->second->StartAckSender();
-                return r.first->second.get();
-            } catch (std::out_of_range& oor) {
-                LOG(error) << "Could not get remote region with id '" << id << "'. Does the region creator run with the same session id?";
-                LOG(error) << oor.what();
-                return nullptr;
-            } catch (boost::interprocess::interprocess_exception& e) {
-                LOG(error) << "Could not get remote region for id '" << id << "': " << e.what();
-                return nullptr;
+        try {
+            RegionConfig cfg;
+            // get region info
+            {
+                boost::interprocess::scoped_lock<boost::interprocess::interprocess_mutex> shmLock(*fShmMtx);
+                RegionInfo regionInfo = fShmRegions->at(id);
+                cfg.id = id;
+                cfg.creationFlags = regionInfo.fCreationFlags;
+                cfg.rcSegmentSize = regionInfo.fRCSegmentSize;
+                cfg.path = regionInfo.fPath.c_str();
             }
+            // LOG(debug) << "Located remote region with id '" << id << "', path: '" << cfg.path << "', flags: '" << cfg.creationFlags << "'";
+
+            auto r = fRegions.emplace(id, std::make_unique<UnmanagedRegion>(fShmId, 0, false, std::move(cfg)));
+            r.first->second->InitializeQueues();
+            r.first->second->StartAckSender();
+            return r.first->second.get();
+        } catch (std::out_of_range& oor) {
+            LOG(error) << "Could not get remote region with id '" << id << "'. Does the region creator run with the same session id?";
+            LOG(error) << oor.what();
+            return nullptr;
+        } catch (boost::interprocess::interprocess_exception& e) {
+            LOG(error) << "Could not get remote region for id '" << id << "': " << e.what();
+            return nullptr;
         }
     }
 
@@ -528,8 +465,8 @@ class Manager
                     info.managed = true;
                     info.id = segmentId;
                     info.event = RegionEvent::created;
-                    info.ptr = boost::apply_visitor(SegmentAddress(), fSegments.at(segmentId));
-                    info.size = boost::apply_visitor(SegmentSize(), fSegments.at(segmentId));
+                    info.ptr = std::visit([](auto& s) { return s.get_address(); }, fSegments.at(segmentId));
+                    info.size = std::visit([](auto& s) { return s.get_size(); }, fSegments.at(segmentId));
                     result.push_back(info);
                 } catch (const std::out_of_range& oor) {
                     LOG(error) << "could not find segment with id " << segmentId;
@@ -548,6 +485,7 @@ class Manager
                     cfg.id = info.id;
                     cfg.creationFlags = regionInfo.fCreationFlags;
                     cfg.path = regionInfo.fPath.c_str();
+                    cfg.rcSegmentSize = regionInfo.fRCSegmentSize;
                     regionCfgs.emplace(info.id, cfg);
                     // fill the ptr+size info after shmLock is released, to avoid constructing local region under it
                 } else {
@@ -709,9 +647,9 @@ class Manager
                 using namespace boost::interprocess;
 
                 if (segmentInfo.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
-                    fSegments.emplace(id, RBTreeBestFitSegment(open_only, std::string("fmq_" + fShmId + "_m_" + std::to_string(id)).c_str()));
+                    fSegments.emplace(id, RBTreeBestFitSegment(open_only, MakeShmName(fShmId, "m", id).c_str()));
                 } else {
-                    fSegments.emplace(id, SimpleSeqFitSegment(open_only, std::string("fmq_" + fShmId + "_m_" + std::to_string(id)).c_str()));
+                    fSegments.emplace(id, SimpleSeqFitSegment(open_only, MakeShmName(fShmId, "m", id).c_str()));
                 }
             } catch (std::out_of_range& oor) {
                 LOG(error) << "Could not get segment with id '" << id << "': " << oor.what();
@@ -723,11 +661,11 @@ class Manager
 
     boost::interprocess::managed_shared_memory::handle_t GetHandleFromAddress(const void* ptr, uint16_t segmentId) const
     {
-        return boost::apply_visitor(SegmentHandleFromAddress(ptr), fSegments.at(segmentId));
+        return std::visit([ptr](auto& s) { return s.get_handle_from_address(ptr); }, fSegments.at(segmentId));
     }
     char* GetAddressFromHandle(const boost::interprocess::managed_shared_memory::handle_t handle, uint16_t segmentId) const
     {
-        return boost::apply_visitor(SegmentAddressFromHandle(handle), fSegments.at(segmentId));
+        return std::visit([handle](auto& s) { return reinterpret_cast<char*>(s.get_address_from_handle(handle)); }, fSegments.at(segmentId));
     }
 
     char* Allocate(size_t size, size_t alignment = 0)
@@ -740,24 +678,32 @@ class Manager
 
         while (!ptr) {
             try {
-                size_t segmentSize = boost::apply_visitor(SegmentSize(), fSegments.at(fSegmentId));
+                size_t segmentSize = std::visit([](auto& s) { return s.get_size(); }, fSegments.at(fSegmentId));
                 if (fullSize > segmentSize) {
                     throw MessageBadAlloc(tools::ToString("Requested message size (", fullSize, ") exceeds segment size (", segmentSize, ")"));
                 }
 
-                ptr = boost::apply_visitor(SegmentAllocate{fullSize}, fSegments.at(fSegmentId));
+                ptr = std::visit([fullSize](auto& s) { return reinterpret_cast<char*>(s.allocate(fullSize)); }, fSegments.at(fSegmentId));
                 ShmHeader::Construct(ptr, alignment);
             } catch (boost::interprocess::bad_alloc& ba) {
                 // LOG(warn) << "Shared memory full...";
                 if (fBadAllocMaxAttempts >= 0 && ++numAttempts >= fBadAllocMaxAttempts) {
-                    throw MessageBadAlloc(tools::ToString("shmem: could not create a message of size ", size, ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default", ", free memory: ", boost::apply_visitor(SegmentFreeMemory(), fSegments.at(fSegmentId))));
+                    throw MessageBadAlloc(tools::ToString("shmem: could not create a message of size ", size,
+                        ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default",
+                        ", free memory: ", std::visit([](auto& s) { return s.get_free_memory(); }, fSegments.at(fSegmentId))));
                 }
                 if (numAttempts == 1 && fBadAllocMaxAttempts > 1) {
-                    LOG(warn) << tools::ToString("shmem: could not create a message of size ", size, ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default", ", free memory: ", boost::apply_visitor(SegmentFreeMemory(), fSegments.at(fSegmentId)), ". Will try ", (fBadAllocMaxAttempts > 1 ? (std::to_string(fBadAllocMaxAttempts - 1)) + " more times" : " until success"), ", in ", fBadAllocAttemptIntervalInMs, "ms intervals");
+                    LOG(warn) << tools::ToString("shmem: could not create a message of size ", size,
+                        ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default",
+                        ", free memory: ", std::visit([](auto& s) { return s.get_free_memory(); }, fSegments.at(fSegmentId)),
+                        ". Will try ", (fBadAllocMaxAttempts > 1 ? (std::to_string(fBadAllocMaxAttempts - 1)) + " more times" : " until success"),
+                        ", in ", fBadAllocAttemptIntervalInMs, "ms intervals");
                 }
                 std::this_thread::sleep_for(std::chrono::milliseconds(fBadAllocAttemptIntervalInMs));
                 if (Interrupted()) {
-                    throw MessageBadAlloc(tools::ToString("shmem: could not create a message of size ", size, ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default", ", free memory: ", boost::apply_visitor(SegmentFreeMemory(), fSegments.at(fSegmentId))));
+                    throw MessageBadAlloc(tools::ToString("shmem: could not create a message of size ", size,
+                        ", alignment: ", (alignment != 0) ? std::to_string(alignment) : "default",
+                        ", free memory: ", std::visit([](auto& s) { return s.get_free_memory(); }, fSegments.at(fSegmentId))));
                 } else {
                     continue;
                 }
@@ -791,12 +737,12 @@ class Manager
         }
 #endif
         ShmHeader::Destruct(ptr);
-        boost::apply_visitor(SegmentDeallocate(ptr), fSegments.at(segmentId));
+        std::visit([ptr](auto& s) { s.deallocate(ptr); }, fSegments.at(segmentId));
     }
 
     char* ShrinkInPlace(size_t newSize, char* localPtr, uint16_t segmentId)
     {
-        return boost::apply_visitor(SegmentBufferShrink(newSize, localPtr), fSegments.at(segmentId));
+        return std::visit(SegmentBufferShrink(newSize, localPtr), fSegments.at(segmentId));
     }
 
     uint16_t GetSegmentId() const { return fSegmentId; }
@@ -828,6 +774,8 @@ class Manager
         }
     }
 
+    auto GetMetadataMsgSize() const noexcept { return fMetadataMsgSize; }
+
     ~Manager()
     {
         fRegionsGen += 1; // signal TL cache invalidation
@@ -842,7 +790,7 @@ class Manager
     uint64_t fShmId64;
     std::string fShmId;
     uint16_t fSegmentId;
-    std::unordered_map<uint16_t, boost::variant<RBTreeBestFitSegment, SimpleSeqFitSegment>> fSegments; // TODO: refactor to use Segment class
+    std::unordered_map<uint16_t, std::variant<RBTreeBestFitSegment, SimpleSeqFitSegment>> fSegments; // TODO: refactor to use Segment class
     boost::interprocess::managed_shared_memory fManagementSegment; // TODO: refactor to use ManagementSegment class
     VoidAlloc fShmVoidAlloc;
     boost::interprocess::interprocess_mutex* fShmMtx;
@@ -884,6 +832,8 @@ class Manager
     int fBadAllocMaxAttempts;
     int fBadAllocAttemptIntervalInMs;
     bool fNoCleanup;
+
+    std::size_t fMetadataMsgSize;
 };
 
 } // namespace fair::mq::shmem

fairmq/shmem/Message.h

@@ -14,6 +14,7 @@
 #include "UnmanagedRegionImpl.h"
 #include <fairmq/Message.h>
 #include <fairmq/UnmanagedRegion.h>
+#include <fairmq/Transports.h>
 
 #include <fairlogger/Logger.h>
 
@@ -36,60 +37,34 @@ class Message final : public fair::mq::Message
 
   public:
     Message(Manager& manager, fair::mq::TransportFactory* factory = nullptr)
-        : fair::mq::Message(factory)
-        , fManager(manager)
-        , fQueued(false)
-        , fMeta{0, 0, -1, -1, 0, fManager.GetSegmentId(), true}
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
-    {
-        fManager.IncrementMsgCounter();
-    }
+        : Message(manager, Alignment{0}, factory)
+    {}
 
-    Message(Manager& manager, Alignment alignment, fair::mq::TransportFactory* factory = nullptr)
+    Message(Manager& manager, Alignment /* alignment */, fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
-        , fQueued(false)
-        , fMeta{0, 0, -1, -1, 0, fManager.GetSegmentId(), true}
-        , fAlignment(alignment.alignment)
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
+        , fSegmentId(fManager.GetSegmentId())
     {
         fManager.IncrementMsgCounter();
     }
 
     Message(Manager& manager, const size_t size, fair::mq::TransportFactory* factory = nullptr)
-        : fair::mq::Message(factory)
-        , fManager(manager)
-        , fQueued(false)
-        , fMeta{0, 0, -1, -1, 0, fManager.GetSegmentId(), true}
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
-    {
-        InitializeChunk(size);
-        fManager.IncrementMsgCounter();
-    }
+        : Message(manager, size, Alignment{0}, factory)
+    {}
 
     Message(Manager& manager, const size_t size, Alignment alignment, fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
-        , fQueued(false)
-        , fMeta{0, 0, -1, -1, 0, fManager.GetSegmentId(), true}
-        , fAlignment(alignment.alignment)
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
+        , fSegmentId(fManager.GetSegmentId())
     {
-        InitializeChunk(size, fAlignment);
+        InitializeChunk(size, alignment.alignment);
         fManager.IncrementMsgCounter();
     }
 
     Message(Manager& manager, void* data, const size_t size, fair::mq::FreeFn* ffn, void* hint = nullptr, fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
-        , fQueued(false)
-        , fMeta{0, 0, -1, -1, 0, fManager.GetSegmentId(), true}
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
+        , fSegmentId(fManager.GetSegmentId())
     {
         if (InitializeChunk(size)) {
             std::memcpy(fLocalPtr, data, size);
@@ -105,10 +80,12 @@ class Message final : public fair::mq::Message
     Message(Manager& manager, UnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0, fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
-        , fQueued(false)
-        , fMeta{size, reinterpret_cast<size_t>(hint), -1, -1, static_cast<UnmanagedRegionImpl*>(region.get())->fRegionId, fManager.GetSegmentId(), false}
-        , fRegionPtr(nullptr)
         , fLocalPtr(static_cast<char*>(data))
+        , fSize(size)
+        , fHint(reinterpret_cast<size_t>(hint))
+        , fRegionId(static_cast<UnmanagedRegionImpl*>(region.get())->fRegionId)
+        , fSegmentId(fManager.GetSegmentId())
+        , fManaged(false)
     {
         if (region->GetType() != GetType()) {
             LOG(error) << "region type (" << region->GetType() << ") does not match message type (" << GetType() << ")";
@@ -117,7 +94,7 @@ class Message final : public fair::mq::Message
 
         if (reinterpret_cast<const char*>(data) >= reinterpret_cast<const char*>(region->GetData()) &&
             reinterpret_cast<const char*>(data) <= reinterpret_cast<const char*>(region->GetData()) + region->GetSize()) {
-            fMeta.fHandle = (boost::interprocess::managed_shared_memory::handle_t)(reinterpret_cast<const char*>(data) - reinterpret_cast<const char*>(region->GetData()));
+            fHandle = (boost::interprocess::managed_shared_memory::handle_t)(reinterpret_cast<const char*>(data) - reinterpret_cast<const char*>(region->GetData()));
         } else {
             LOG(error) << "trying to create region message with data from outside the region";
             throw TransportError("trying to create region message with data from outside the region");
@@ -128,10 +105,13 @@ class Message final : public fair::mq::Message
     Message(Manager& manager, MetaHeader& hdr, fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
-        , fQueued(false)
-        , fMeta{hdr}
-        , fRegionPtr(nullptr)
-        , fLocalPtr(nullptr)
+        , fSize(hdr.fSize)
+        , fHint(hdr.fHint)
+        , fHandle(hdr.fHandle)
+        , fShared(hdr.fShared)
+        , fRegionId(hdr.fRegionId)
+        , fSegmentId(hdr.fSegmentId)
+        , fManaged(hdr.fManaged)
     {
         fManager.IncrementMsgCounter();
     }
@@ -147,11 +127,10 @@ class Message final : public fair::mq::Message
         fQueued = false;
     }
 
-    void Rebuild(Alignment alignment) override
+    void Rebuild(Alignment /* alignment */) override
     {
         CloseMessage();
         fQueued = false;
-        fAlignment = alignment.alignment;
     }
 
     void Rebuild(size_t size) override
@@ -165,8 +144,7 @@ class Message final : public fair::mq::Message
     {
         CloseMessage();
         fQueued = false;
-        fAlignment = alignment.alignment;
-        InitializeChunk(size, fAlignment);
+        InitializeChunk(size, alignment.alignment);
     }
 
     void Rebuild(void* data, size_t size, fair::mq::FreeFn* ffn, void* hint = nullptr) override
@@ -187,17 +165,17 @@ class Message final : public fair::mq::Message
     void* GetData() const override
     {
         if (!fLocalPtr) {
-            if (fMeta.fManaged) {
-                if (fMeta.fSize > 0) {
-                    fManager.GetSegment(fMeta.fSegmentId);
-                    fLocalPtr = ShmHeader::UserPtr(fManager.GetAddressFromHandle(fMeta.fHandle, fMeta.fSegmentId));
+            if (fManaged) {
+                if (fSize > 0) {
+                    fManager.GetSegment(fSegmentId);
+                    fLocalPtr = ShmHeader::UserPtr(fManager.GetAddressFromHandle(fHandle, fSegmentId));
                 } else {
                     fLocalPtr = nullptr;
                 }
             } else {
-                fRegionPtr = fManager.GetRegionFromCache(fMeta.fRegionId);
+                fRegionPtr = fManager.GetRegionFromCache(fRegionId);
                 if (fRegionPtr) {
-                    fLocalPtr = reinterpret_cast<char*>(fRegionPtr->GetData()) + fMeta.fHandle;
+                    fLocalPtr = reinterpret_cast<char*>(fRegionPtr->GetData()) + fHandle;
                 } else {
                     // LOG(warn) << "could not get pointer from a region message";
                     fLocalPtr = nullptr;
@@ -208,37 +186,41 @@ class Message final : public fair::mq::Message
         return static_cast<void*>(fLocalPtr);
     }
 
-    size_t GetSize() const override { return fMeta.fSize; }
+    size_t GetSize() const override { return fSize; }
 
-    bool SetUsedSize(size_t newSize) override
+    bool SetUsedSize(size_t newSize, Alignment alignment = Alignment{0}) override
     {
-        if (newSize == fMeta.fSize) {
+        if (newSize == fSize) {
             return true;
         } else if (newSize == 0) {
             Deallocate();
             return true;
-        } else if (newSize <= fMeta.fSize) {
+        } else if (newSize <= fSize) {
             try {
+                char* oldPtr = fManager.GetAddressFromHandle(fHandle, fSegmentId);
                 try {
-                    char* oldPtr = fManager.GetAddressFromHandle(fMeta.fHandle, fMeta.fSegmentId);
                     uint16_t userOffset = ShmHeader::UserOffset(oldPtr);
-                    char* ptr = fManager.ShrinkInPlace(userOffset + newSize, oldPtr, fMeta.fSegmentId);
+                    char* ptr = fManager.ShrinkInPlace(userOffset + newSize, oldPtr, fSegmentId);
                     fLocalPtr = ShmHeader::UserPtr(ptr);
-                    fMeta.fSize = newSize;
+                    fSize = newSize;
                     return true;
                 } catch (boost::interprocess::bad_alloc& e) {
                     // if shrinking fails (can happen due to boost alignment requirements):
                     // unused size >= 1000000 bytes: reallocate fully
                     // unused size < 1000000 bytes: simply reset the size and keep the rest of the buffer until message destruction
-                    if (fMeta.fSize - newSize >= 1000000) {
-                        char* ptr = fManager.Allocate(newSize, fAlignment);
+                    if (fSize - newSize >= 1000000) {
+                        if (alignment.alignment == 0) {
+                            // if no alignment is provided, take the minimum alignment of the old pointer, but no more than 4096
+                            alignment.alignment = 1 << std::min(__builtin_ctz(reinterpret_cast<size_t>(oldPtr)), 12);
+                        }
+                        char* ptr = fManager.Allocate(newSize, alignment.alignment);
                         char* userPtr = ShmHeader::UserPtr(ptr);
                         std::memcpy(userPtr, fLocalPtr, newSize);
-                        fManager.Deallocate(fMeta.fHandle, fMeta.fSegmentId);
+                        fManager.Deallocate(fHandle, fSegmentId);
                         fLocalPtr = userPtr;
-                        fMeta.fHandle = fManager.GetHandleFromAddress(ptr, fMeta.fSegmentId);
+                        fHandle = fManager.GetHandleFromAddress(ptr, fSegmentId);
                     }
-                    fMeta.fSize = newSize;
+                    fSize = newSize;
                     return true;
                 }
             } catch (boost::interprocess::interprocess_exception& e) {
@@ -255,123 +237,178 @@ class Message final : public fair::mq::Message
 
     uint16_t GetRefCount() const
     {
-        if (fMeta.fHandle < 0) {
+        if (fHandle < 0) {
             return 1;
         }
 
-        if (fMeta.fManaged) { // managed segment
-            fManager.GetSegment(fMeta.fSegmentId);
-            return ShmHeader::RefCount(fManager.GetAddressFromHandle(fMeta.fHandle, fMeta.fSegmentId));
-        } else { // unmanaged region
-            if (fMeta.fShared < 0) { // UR msg is not yet shared
-                return 1;
-            } else {
-                fManager.GetSegment(fMeta.fSegmentId);
-                return ShmHeader::RefCount(fManager.GetAddressFromHandle(fMeta.fShared, fMeta.fSegmentId));
-            }
+        if (fManaged) { // managed segment
+            fManager.GetSegment(fSegmentId);
+            return ShmHeader::RefCount(fManager.GetAddressFromHandle(fHandle, fSegmentId));
+        }
+        if (fShared < 0) { // UR msg is not yet shared
+            return 1;
+        }
+        fRegionPtr = fManager.GetRegionFromCache(fRegionId);
+        if (!fRegionPtr) {
+            throw TransportError(tools::ToString("Cannot get unmanaged region with id ", fRegionId));
+        }
+        if (fRegionPtr->fRcSegmentSize > 0) {
+            return fRegionPtr->GetRefCountAddressFromHandle(fShared)->Get();
+        } else {
+            fManager.GetSegment(fSegmentId);
+            return ShmHeader::RefCount(fManager.GetAddressFromHandle(fShared, fSegmentId));
         }
     }
 
     void Copy(const fair::mq::Message& other) override
     {
         const Message& otherMsg = static_cast<const Message&>(other);
-        if (otherMsg.fMeta.fHandle < 0) {
-            // if the other message is not initialized, close this one too and return
+        // if the other message is not initialized, close this one too and return
+        if (otherMsg.fHandle < 0) {
             CloseMessage();
             return;
         }
 
-        if (fMeta.fHandle >= 0) {
-            // if this msg is already initialized, close it first
+        // if this msg is already initialized, close it first
+        if (fHandle >= 0) {
             CloseMessage();
         }
 
-        if (otherMsg.fMeta.fManaged) { // managed segment
-            fMeta = otherMsg.fMeta;
-            fManager.GetSegment(fMeta.fSegmentId);
-            ShmHeader::IncrementRefCount(fManager.GetAddressFromHandle(fMeta.fHandle, fMeta.fSegmentId));
-        } else { // unmanaged region
-            if (otherMsg.fMeta.fShared < 0) { // if UR msg is not yet shared
-                // TODO: minimize the size to 0 and don't create extra space for user buffer alignment
-                char* ptr = fManager.Allocate(2, 0);
-                // point the fShared in the unmanaged region message to the refCount holder
-                otherMsg.fMeta.fShared = fManager.GetHandleFromAddress(ptr, fMeta.fSegmentId);
-                // the message needs to be able to locate in which segment the refCount is stored
-                otherMsg.fMeta.fSegmentId = fMeta.fSegmentId;
-                // point this message to the same content as the unmanaged region message
-                fMeta = otherMsg.fMeta;
-                // increment the refCount
-                ShmHeader::IncrementRefCount(ptr);
-            } else { // if the UR msg is already shared
-                fMeta = otherMsg.fMeta;
-                fManager.GetSegment(fMeta.fSegmentId);
-                ShmHeader::IncrementRefCount(fManager.GetAddressFromHandle(fMeta.fShared, fMeta.fSegmentId));
+        // increment ref count
+        if (otherMsg.fManaged) { // msg in managed segment
+            fManager.GetSegment(otherMsg.fSegmentId);
+            ShmHeader::IncrementRefCount(fManager.GetAddressFromHandle(otherMsg.fHandle, otherMsg.fSegmentId));
+        } else { // msg in unmanaged region
+            fRegionPtr = fManager.GetRegionFromCache(otherMsg.fRegionId);
+            if (!fRegionPtr) {
+                throw TransportError(tools::ToString("Cannot get unmanaged region with id ", otherMsg.fRegionId));
+            }
+            if (fRegionPtr->fRcSegmentSize > 0) {
+                if (otherMsg.fShared < 0) {
+                    // UR msg not yet shared, create the reference counting object with count 2
+                    try {
+                        otherMsg.fShared = fRegionPtr->HandleFromAddress(&(fRegionPtr->MakeRefCount(2)));
+                    } catch (boost::interprocess::bad_alloc& ba) {
+                        throw RefCountBadAlloc(tools::ToString("Insufficient space in the reference count segment ", otherMsg.fRegionId, ", original exception: bad_alloc: ", ba.what()));
+                    }
+                } else {
+                    fRegionPtr->GetRefCountAddressFromHandle(otherMsg.fShared)->Increment();
+                }
+            } else { // if RefCount segment size is 0, store the ref count in the managed segment
+                if (otherMsg.fShared < 0) { // if UR msg is not yet shared
+                    char* ptr = fManager.Allocate(2, 0);
+                    // point the fShared in the unmanaged region message to the refCount holder
+                    otherMsg.fShared = fManager.GetHandleFromAddress(ptr, fSegmentId);
+                    // the message needs to be able to locate in which segment the refCount is stored
+                    otherMsg.fSegmentId = fSegmentId;
+                    ShmHeader::IncrementRefCount(ptr);
+                } else { // if the UR msg is already shared
+                    fManager.GetSegment(otherMsg.fSegmentId);
+                    ShmHeader::IncrementRefCount(fManager.GetAddressFromHandle(otherMsg.fShared, otherMsg.fSegmentId));
+                }
             }
         }
+
+        // copy meta data
+        fSize = otherMsg.fSize;
+        fHint = otherMsg.fHint;
+        fHandle = otherMsg.fHandle;
+        fShared = otherMsg.fShared;
+        fRegionId = otherMsg.fRegionId;
+        fSegmentId = otherMsg.fSegmentId;
+        fManaged = otherMsg.fManaged;
     }
 
     ~Message() override { CloseMessage(); }
 
   private:
     Manager& fManager;
-    bool fQueued;
-    MetaHeader fMeta;
-    size_t fAlignment;
-    mutable UnmanagedRegion* fRegionPtr;
-    mutable char* fLocalPtr;
+    mutable UnmanagedRegion* fRegionPtr = nullptr;
+    mutable char* fLocalPtr = nullptr;
+    size_t fSize = 0; // size of the shm buffer
+    size_t fHint = 0; // user-defined value, given by the user on message creation and returned to the user on "buffer no longer needed"-callbacks
+    boost::interprocess::managed_shared_memory::handle_t fHandle = -1; // handle to shm buffer, convertible to shm buffer ptr
+    mutable boost::interprocess::managed_shared_memory::handle_t fShared = -1; // handle to the buffer storing the ref count for shared buffers
+    uint16_t fRegionId = 0; // id of the unmanaged region
+    mutable uint16_t fSegmentId; // id of the managed segment
+    bool fManaged = true; // true = managed segment, false = unmanaged region
+    bool fQueued = false;
+
+    void SetMeta(const MetaHeader& meta)
+    {
+        fSize = meta.fSize;
+        fHint = meta.fHint;
+        fHandle = meta.fHandle;
+        fShared = meta.fShared;
+        fRegionId = meta.fRegionId;
+        fSegmentId = meta.fSegmentId;
+        fManaged = meta.fManaged;
+    }
 
     char* InitializeChunk(const size_t size, size_t alignment = 0)
     {
         if (size == 0) {
-            fMeta.fSize = 0;
+            fSize = 0;
             return fLocalPtr;
         }
         char* ptr = fManager.Allocate(size, alignment);
-        fMeta.fHandle = fManager.GetHandleFromAddress(ptr, fMeta.fSegmentId);
-        fMeta.fSize = size;
+        fHandle = fManager.GetHandleFromAddress(ptr, fSegmentId);
+        fSize = size;
         fLocalPtr = ShmHeader::UserPtr(ptr);
         return fLocalPtr;
     }
 
     void Deallocate()
     {
-        if (fMeta.fHandle >= 0 && !fQueued) {
-            if (fMeta.fManaged) { // managed segment
-                fManager.GetSegment(fMeta.fSegmentId);
-                uint16_t refCount = ShmHeader::DecrementRefCount(fManager.GetAddressFromHandle(fMeta.fHandle, fMeta.fSegmentId));
+        if (fHandle >= 0 && !fQueued) {
+            if (fManaged) { // managed segment
+                fManager.GetSegment(fSegmentId);
+                uint16_t refCount = ShmHeader::DecrementRefCount(fManager.GetAddressFromHandle(fHandle, fSegmentId));
                 if (refCount == 1) {
-                    fManager.Deallocate(fMeta.fHandle, fMeta.fSegmentId);
+                    fManager.Deallocate(fHandle, fSegmentId);
                 }
             } else { // unmanaged region
-                if (fMeta.fShared >= 0) {
-                    // make sure segment is initialized in this transport
-                    fManager.GetSegment(fMeta.fSegmentId);
-                    // release unmanaged region block if ref count is one
-                    uint16_t refCount = ShmHeader::DecrementRefCount(fManager.GetAddressFromHandle(fMeta.fShared, fMeta.fSegmentId));
-                    if (refCount == 1) {
-                        fManager.Deallocate(fMeta.fShared, fMeta.fSegmentId);
-                        ReleaseUnmanagedRegionBlock();
+                if (fShared >= 0) {
+                    fRegionPtr = fManager.GetRegionFromCache(fRegionId);
+                    if (!fRegionPtr) {
+                        throw TransportError(tools::ToString("Cannot get unmanaged region with id ", fRegionId));
+                    }
+                    if (fRegionPtr->fRcSegmentSize > 0) {
+                        uint16_t refCount = fRegionPtr->GetRefCountAddressFromHandle(fShared)->Decrement();
+                        if (refCount == 1) {
+                            fRegionPtr->RemoveRefCount(*(fRegionPtr->GetRefCountAddressFromHandle(fShared)));
+                            ReleaseUnmanagedRegionBlock();
+                        }
+                    } else { // if RefCount segment size is 0, get the ref count from the managed segment
+                        // make sure segment is initialized in this transport
+                        fManager.GetSegment(fSegmentId);
+                        // release unmanaged region block if ref count is one
+                        uint16_t refCount = ShmHeader::DecrementRefCount(fManager.GetAddressFromHandle(fShared, fSegmentId));
+                        if (refCount == 1) {
+                            fManager.Deallocate(fShared, fSegmentId);
+                            ReleaseUnmanagedRegionBlock();
+                        }
                     }
                 } else {
                     ReleaseUnmanagedRegionBlock();
                 }
             }
         }
-        fMeta.fHandle = -1;
+        fHandle = -1;
         fLocalPtr = nullptr;
-        fMeta.fSize = 0;
+        fSize = 0;
     }
 
     void ReleaseUnmanagedRegionBlock()
     {
         if (!fRegionPtr) {
-            fRegionPtr = fManager.GetRegionFromCache(fMeta.fRegionId);
+            fRegionPtr = fManager.GetRegionFromCache(fRegionId);
         }
 
         if (fRegionPtr) {
-            fRegionPtr->ReleaseBlock({fMeta.fHandle, fMeta.fSize, fMeta.fHint});
+            fRegionPtr->ReleaseBlock({fHandle, fSize, fHint});
         } else {
-            LOG(warn) << "region ack queue for id " << fMeta.fRegionId << " no longer exist. Not sending ack";
+            LOG(warn) << "region ack queue for id " << fRegionId << " no longer exist. Not sending ack";
         }
     }
 
@@ -379,7 +416,6 @@ class Message final : public fair::mq::Message
     {
         try {
             Deallocate();
-            fAlignment = 0;
             fManager.DecrementMsgCounter();
         } catch (SharedMemoryError& sme) {
             LOG(error) << "error closing message: " << sme.what();

fairmq/shmem/Monitor.cxx

@@ -30,6 +30,7 @@
 #include <ctime>
 #include <iomanip>
 #include <sstream>
+#include <variant>
 
 #include <poll.h>
 
@@ -74,7 +75,7 @@ Monitor::Monitor(string shmId, bool selfDestruct, bool interactive, bool viewOnl
 {
     if (!fViewOnly) {
         try {
-            bipc::named_mutex monitorStatus(bipc::create_only, string("fmq_" + fShmId + "_ms").c_str());
+            bipc::named_mutex monitorStatus(bipc::create_only, MakeShmName(fShmId, "ms").c_str());
         } catch (bie&) {
             if (fInteractive) {
                 LOG(error) << "fairmq-shmmonitor for shm id " << fShmId << " is already running. Try `fairmq-shmmonitor --cleanup --shmid " << fShmId << "`, or run in view-only mode (-v)";
@@ -132,7 +133,7 @@ void Monitor::Watch()
         using namespace boost::interprocess;
 
         try {
-            managed_shared_memory managementSegment(open_read_only, std::string("fmq_" + fShmId + "_mng").c_str());
+            managed_shared_memory managementSegment(open_read_only, MakeShmName(fShmId, "mng").c_str());
 
             fSeenOnce = true;
 
@@ -180,11 +181,11 @@ bool Monitor::PrintShm(const ShmId& shmId)
     using namespace boost::interprocess;
 
     try {
-        managed_shared_memory managementSegment(open_read_only, std::string("fmq_" + shmId.shmId + "_mng").c_str());
+        managed_shared_memory managementSegment(open_read_only, MakeShmName(shmId.shmId, "mng").c_str());
         VoidAlloc allocInstance(managementSegment.get_segment_manager());
 
         Uint16SegmentInfoHashMap* shmSegments = managementSegment.find<Uint16SegmentInfoHashMap>(unique_instance).first;
-        std::unordered_map<uint16_t, boost::variant<RBTreeBestFitSegment, SimpleSeqFitSegment>> segments;
+        std::unordered_map<uint16_t, std::variant<RBTreeBestFitSegment, SimpleSeqFitSegment>> segments;
 
         Uint16RegionInfoHashMap* shmRegions = managementSegment.find<Uint16RegionInfoHashMap>(unique_instance).first;
 
@@ -199,9 +200,9 @@ bool Monitor::PrintShm(const ShmId& shmId)
 
         for (const auto& s : *shmSegments) {
             if (s.second.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
-                segments.emplace(s.first, RBTreeBestFitSegment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + to_string(s.first)).c_str()));
+                segments.emplace(s.first, RBTreeBestFitSegment(open_read_only, MakeShmName(shmId.shmId, "m", s.first).c_str()));
             } else {
-                segments.emplace(s.first, SimpleSeqFitSegment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + to_string(s.first)).c_str()));
+                segments.emplace(s.first, SimpleSeqFitSegment(open_read_only, MakeShmName(shmId.shmId, "m", s.first).c_str()));
             }
         }
 
@@ -234,8 +235,8 @@ bool Monitor::PrintShm(const ShmId& shmId)
            << ", managed segments:\n";
 
         for (const auto& s : segments) {
-            size_t free = boost::apply_visitor(SegmentFreeMemory(), s.second);
-            size_t total = boost::apply_visitor(SegmentSize(), s.second);
+            size_t free = std::visit([](auto& seg){ return seg.get_free_memory(); }, s.second);
+            size_t total = std::visit([](auto& seg){ return seg.get_size(); }, s.second);
             size_t used = total - free;
 
             std::string msgCount;
@@ -267,12 +268,21 @@ bool Monitor::PrintShm(const ShmId& shmId)
 
         if (shmRegions && !shmRegions->empty()) {
             ss << "\n   unmanaged regions:";
-            for (const auto& r : *shmRegions) {
-                ss << "\n      [" << r.first << "]: " << (r.second.fDestroyed ? "destroyed" : "alive");
-                ss << ", size: " << r.second.fSize;
+            for (const auto& [id, info] : *shmRegions) {
+                ss << "\n      [" << id << "]: " << (info.fDestroyed ? "destroyed" : "alive");
+                ss << ", size: " << info.fSize;
+
+                try {
+                    managed_shared_memory rcCountSegment(open_read_only, MakeShmName(shmId.shmId, "rrc", id).c_str());
+                    auto size = rcCountSegment.get_size();
+                    auto free = rcCountSegment.get_free_memory();
+                    ss << ", rcCountSegment size: " << size << ", free: " << free << ", used: " << size - free;
+                } catch (bie&) {
+                    ss << ", rcCountSegment: not found";
+                }
 
                 // try {
-                //     boost::interprocess::message_queue q(open_only, std::string("fmq_" + std::string(shmId) + "_rgq_" + to_string(r.first)).c_str());
+                //     boost::interprocess::message_queue q(open_only, std::string("fmq_" + std::string(shmId) + "_rgq_" + to_string(id)).c_str());
                 //     ss << ", ack queue: " << q.get_num_msg() << " messages";
                 // } catch (bie&) {
                 //     ss << ", ack queue: not found";
@@ -325,7 +335,7 @@ void Monitor::CheckHeartbeats()
     while (!fTerminating) {
         std::this_thread::sleep_for(std::chrono::milliseconds(200));
         try {
-            managed_shared_memory managementSegment(open_read_only, std::string("fmq_" + fShmId + "_mng").c_str());
+            managed_shared_memory managementSegment(open_read_only, MakeShmName(fShmId, "mng").c_str());
             Heartbeat* hb = managementSegment.find<Heartbeat>(unique_instance).first;
 
             if (hb) {
@@ -407,7 +417,7 @@ void Monitor::Interactive()
 void Monitor::PrintDebugInfo(const ShmId& shmId __attribute__((unused)))
 {
 #ifdef FAIRMQ_DEBUG_MODE
-    string managementSegmentName("fmq_" + shmId.shmId + "_mng");
+    string managementSegmentName = MakeShmName(shmId.shmId, "mng");
     try {
         bipc::managed_shared_memory managementSegment(bipc::open_only, managementSegmentName.c_str());
         bipc::interprocess_mutex* mtx(managementSegment.find_or_construct<bipc::interprocess_mutex>(bipc::unique_instance)());
@@ -459,7 +469,7 @@ unordered_map<uint16_t, std::vector<BufferDebugInfo>> Monitor::GetDebugInfo(cons
     unordered_map<uint16_t, std::vector<BufferDebugInfo>> result;
 
 #ifdef FAIRMQ_DEBUG_MODE
-    string managementSegmentName("fmq_" + shmId.shmId + "_mng");
+    string managementSegmentName = MakeShmName(shmId.shmId, "mng");
     try {
         bipc::managed_shared_memory managementSegment(bipc::open_only, managementSegmentName.c_str());
         bipc::interprocess_mutex* mtx(managementSegment.find_or_construct<bipc::interprocess_mutex>(bipc::unique_instance)());
@@ -499,7 +509,7 @@ unsigned long Monitor::GetFreeMemory(const ShmId& shmId, uint16_t segmentId)
 {
     using namespace boost::interprocess;
     try {
-        bipc::managed_shared_memory managementSegment(bipc::open_only, std::string("fmq_" + shmId.shmId + "_mng").c_str());
+        bipc::managed_shared_memory managementSegment(bipc::open_only, MakeShmName(shmId.shmId, "mng").c_str());
         boost::interprocess::interprocess_mutex* mtx(managementSegment.find_or_construct<bipc::interprocess_mutex>(bipc::unique_instance)());
         boost::interprocess::scoped_lock<bipc::interprocess_mutex> lock(*mtx);
 
@@ -513,10 +523,10 @@ unsigned long Monitor::GetFreeMemory(const ShmId& shmId, uint16_t segmentId)
         auto it = shmSegments->find(segmentId);
         if (it != shmSegments->end()) {
             if (it->second.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
-                RBTreeBestFitSegment segment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + std::to_string(segmentId)).c_str());
+                RBTreeBestFitSegment segment(open_read_only, MakeShmName(shmId.shmId, "m", segmentId).c_str());
                 return segment.get_free_memory();
             } else {
-                SimpleSeqFitSegment segment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + std::to_string(segmentId)).c_str());
+                SimpleSeqFitSegment segment(open_read_only, MakeShmName(shmId.shmId, "m", segmentId).c_str());
                 return segment.get_free_memory();
             }
         } else {
@@ -538,7 +548,7 @@ bool Monitor::SegmentIsPresent(const ShmId& shmId, uint16_t segmentId)
 {
     using namespace boost::interprocess;
     try {
-        bipc::managed_shared_memory managementSegment(bipc::open_read_only, std::string("fmq_" + shmId.shmId + "_mng").c_str());
+        bipc::managed_shared_memory managementSegment(bipc::open_read_only, MakeShmName(shmId.shmId, "mng").c_str());
         Uint16SegmentInfoHashMap* shmSegments = managementSegment.find<Uint16SegmentInfoHashMap>(unique_instance).first;
 
         if (!shmSegments) {
@@ -550,9 +560,9 @@ bool Monitor::SegmentIsPresent(const ShmId& shmId, uint16_t segmentId)
         if (it != shmSegments->end()) {
             try {
                 if (it->second.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
-                    RBTreeBestFitSegment segment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + std::to_string(segmentId)).c_str());
+                    RBTreeBestFitSegment segment(open_read_only, MakeShmName(shmId.shmId, "m", segmentId).c_str());
                 } else {
-                    SimpleSeqFitSegment segment(open_read_only, std::string("fmq_" + shmId.shmId + "_m_" + std::to_string(segmentId)).c_str());
+                    SimpleSeqFitSegment segment(open_read_only, MakeShmName(shmId.shmId, "m", segmentId).c_str());
                 }
             } catch (bie&) {
                 LOG(error) << "Could not find segment with id '" << segmentId << "' for shmId '" << shmId.shmId << "'";
@@ -579,7 +589,7 @@ bool Monitor::RegionIsPresent(const ShmId& shmId, uint16_t regionId)
 {
     using namespace boost::interprocess;
     try {
-        bipc::managed_shared_memory managementSegment(bipc::open_read_only, std::string("fmq_" + shmId.shmId + "_mng").c_str());
+        bipc::managed_shared_memory managementSegment(bipc::open_read_only, MakeShmName(shmId.shmId, "mng").c_str());
         Uint16RegionInfoHashMap* shmRegions = managementSegment.find<Uint16RegionInfoHashMap>(bipc::unique_instance).first;
 
         if (!shmRegions) {
@@ -587,7 +597,7 @@ bool Monitor::RegionIsPresent(const ShmId& shmId, uint16_t regionId)
             return false;
         }
 
-        std::string regionFileName("fmq_" + shmId.shmId + "_rg_" + to_string(regionId));
+        std::string regionFileName(MakeShmName(shmId.shmId, "rg", regionId));
 
         auto it = shmRegions->find(regionId);
         if (it != shmRegions->end()) {
@@ -655,7 +665,7 @@ std::vector<std::pair<std::string, bool>> Monitor::Cleanup(const ShmId& shmIdT,
         LOG(info) << "Cleaning up for shared memory id '" << shmId << "'...";
     }
 
-    string managementSegmentName("fmq_" + shmId + "_mng");
+    string managementSegmentName = MakeShmName(shmId, "mng");
     try {
         bipc::managed_shared_memory managementSegment(bipc::open_read_only, managementSegmentName.c_str());
 
@@ -673,11 +683,12 @@ std::vector<std::pair<std::string, bool>> Monitor::Cleanup(const ShmId& shmIdT,
                     LOG(info) << "Found UnmanagedRegion with id: " << id << ", path: '" << path << "', flags: " << flags << ", fDestroyed: " << info.fDestroyed << ".";
                 }
                 if (!path.empty()) {
-                    result.emplace_back(Remove<bipc::file_mapping>(path + "fmq_" + shmId + "_rg_" + to_string(id), verbose));
+                    result.emplace_back(Remove<bipc::file_mapping>(path + MakeShmName(shmId, "rg", id), verbose));
                 } else {
-                    result.emplace_back(Remove<bipc::shared_memory_object>("fmq_" + shmId + "_rg_" + to_string(id), verbose));
+                    result.emplace_back(Remove<bipc::shared_memory_object>(MakeShmName(shmId, "rg", id), verbose));
                 }
-                result.emplace_back(Remove<bipc::message_queue>("fmq_" + shmId + "_rgq_" + to_string(id), verbose));
+                result.emplace_back(Remove<bipc::message_queue>(MakeShmName(shmId, "rgq", id), verbose));
+                result.emplace_back(Remove<bipc::shared_memory_object>(MakeShmName(shmId, "rrc", id), verbose));
             }
         }
 
@@ -687,7 +698,7 @@ std::vector<std::pair<std::string, bool>> Monitor::Cleanup(const ShmId& shmIdT,
                 LOG(info) << "Found " << shmSegments->size() << " managed segments...";
             }
             for (const auto& segment : *shmSegments) {
-                result.emplace_back(Remove<bipc::shared_memory_object>("fmq_" + shmId + "_m_" + to_string(segment.first), verbose));
+                result.emplace_back(Remove<bipc::shared_memory_object>(MakeShmName(shmId, "m", segment.first), verbose));
             }
         } else {
             if (verbose) {
@@ -717,7 +728,7 @@ std::vector<std::pair<std::string, bool>> Monitor::Cleanup(const SessionId& sess
 std::vector<std::pair<std::string, bool>> Monitor::CleanupFull(const ShmId& shmId, bool verbose /* = true */)
 {
     auto result = Cleanup(shmId, verbose);
-    result.emplace_back(Remove<bipc::named_mutex>("fmq_" + shmId.shmId + "_ms", verbose));
+    result.emplace_back(Remove<bipc::named_mutex>(MakeShmName(shmId.shmId, "ms"), verbose));
     return result;
 }
 
@@ -737,7 +748,7 @@ void Monitor::ResetContent(const ShmId& shmIdT, bool verbose /* = true */)
         cout << "Resetting segments content for shared memory id '" << shmId << "'..." << endl;
     }
 
-    string managementSegmentName("fmq_" + shmId + "_mng");
+    string managementSegmentName = MakeShmName(shmId, "mng");
     try {
         using namespace boost::interprocess;
         managed_shared_memory managementSegment(open_only, managementSegmentName.c_str());
@@ -745,18 +756,18 @@ void Monitor::ResetContent(const ShmId& shmIdT, bool verbose /* = true */)
         Uint16SegmentInfoHashMap* segmentInfos = managementSegment.find<Uint16SegmentInfoHashMap>(unique_instance).first;
         if (segmentInfos) {
             cout << "Found info for " << segmentInfos->size() << " managed segments" << endl;
-            for (const auto& s : *segmentInfos) {
+            for (const auto& [id, info] : *segmentInfos) {
                 if (verbose) {
-                    cout << "Resetting content of segment '" << "fmq_" << shmId << "_m_" << s.first << "'..." << endl;
+                    cout << "Resetting content of segment '" << MakeShmName(shmId, "m", id) << "'..." << endl;
                 }
                 try {
-                    if (s.second.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
-                        RBTreeBestFitSegment segment(open_only, std::string("fmq_" + shmId + "_m_" + to_string(s.first)).c_str());
+                    if (info.fAllocationAlgorithm == AllocationAlgorithm::rbtree_best_fit) {
+                        RBTreeBestFitSegment segment(open_only, MakeShmName(shmId, "m", id).c_str());
                         void* ptr = segment.get_segment_manager();
                         size_t size = segment.get_segment_manager()->get_size();
                         new(ptr) segment_manager<char, rbtree_best_fit<mutex_family, offset_ptr<void>>, null_index>(size);
                     } else {
-                        SimpleSeqFitSegment segment(open_only, std::string("fmq_" + shmId + "_m_" + to_string(s.first)).c_str());
+                        SimpleSeqFitSegment segment(open_only, MakeShmName(shmId, "m", id).c_str());
                         void* ptr = segment.get_segment_manager();
                         size_t size = segment.get_segment_manager()->get_size();
                         new(ptr) segment_manager<char, simple_seq_fit<mutex_family, offset_ptr<void>>, null_index>(size);
@@ -766,7 +777,7 @@ void Monitor::ResetContent(const ShmId& shmIdT, bool verbose /* = true */)
                     }
                 } catch (bie& e) {
                     if (verbose) {
-                        cout << "Error resetting content of segment '" << std::string("fmq_" + shmId + "_m_" + to_string(s.first)) << "': " << e.what() << endl;
+                        cout << "Error resetting content of segment '" << MakeShmName(shmId, "m", id) << "': " << e.what() << endl;
                     }
                 }
             }
@@ -778,7 +789,8 @@ void Monitor::ResetContent(const ShmId& shmIdT, bool verbose /* = true */)
         if (shmRegions) {
             for (const auto& region : *shmRegions) {
                 uint16_t id = region.first;
-                Remove<bipc::message_queue>("fmq_" + shmId + "_rgq_" + to_string(id), verbose);
+                Remove<bipc::message_queue>(MakeShmName(shmId, "rgq", id), verbose);
+                Remove<bipc::shared_memory_object>(MakeShmName(shmId, "rrc", id), verbose);
             }
         }
     } catch (bie& e) {
@@ -807,7 +819,7 @@ void Monitor::ResetContent(const ShmId& shmIdT, const std::vector<SegmentConfig>
     using namespace boost::interprocess;
 
     std::string shmId = shmIdT.shmId;
-    std::string managementSegmentName("fmq_" + shmId + "_mng");
+    std::string managementSegmentName = MakeShmName(shmId, "mng");
     // delete management segment
     cout << "deleting management segment" << endl;
     Remove<bipc::shared_memory_object>(managementSegmentName, verbose);
@@ -855,7 +867,7 @@ Monitor::~Monitor()
         Cleanup(ShmId{fShmId});
     }
     if (!fViewOnly) {
-        RemoveMutex("fmq_" + fShmId + "_ms");
+        RemoveMutex(MakeShmName(fShmId, "ms"));
     }
 }
 

fairmq/shmem/README.md

@@ -16,6 +16,7 @@ FairMQ Shared Memory currently uses the following names to register shared memor
 | `fmq_<shmId>_mng`           | management segment (management data)           | one of the devices | devices                        |
 | `fmq_<shmId>_rg_<index>`    | unmanaged region(s)                            | one of the devices | devices with unmanaged regions |
 | `fmq_<shmId>_rgq_<index>`   | unmanaged region queue(s)                      | one of the devices | devices with unmanaged regions |
+| `fmq_<shmId>_rrc_<index>`   | unmanaged region reference count pool(s)       | one of the devices | devices with unmanaged regions |
 | `fmq_<shmId>_ms`            | shmmonitor status                              | shmmonitor         | devices, shmmonitor            |
 
 The shmId is generated out of session id and user id.

fairmq/shmem/Segment.h

@@ -10,11 +10,11 @@
 
 #include <fairmq/shmem/Common.h>
 #include <fairmq/shmem/Monitor.h>
-
-#include <boost/variant.hpp>
+#include <fairmq/Transports.h>
 
 #include <cstdint>
 #include <string>
+#include <variant>
 
 namespace fair::mq::shmem
 {
@@ -29,27 +29,23 @@ struct Segment
     friend class Monitor;
 
     Segment(const std::string& shmId, uint16_t id, size_t size, SimpleSeqFit)
-        : fSegment(SimpleSeqFitSegment(boost::interprocess::open_or_create,
-                                       std::string("fmq_" + shmId + "_m_" + std::to_string(id)).c_str(),
-                                       size))
+        : fSegment(SimpleSeqFitSegment(boost::interprocess::open_or_create, MakeShmName(shmId, "m", id).c_str(), size))
     {
         Register(shmId, id, AllocationAlgorithm::simple_seq_fit);
     }
 
     Segment(const std::string& shmId, uint16_t id, size_t size, RBTreeBestFit)
-        : fSegment(RBTreeBestFitSegment(boost::interprocess::open_or_create,
-                                        std::string("fmq_" + shmId + "_m_" + std::to_string(id)).c_str(),
-                                        size))
+        : fSegment(RBTreeBestFitSegment(boost::interprocess::open_or_create, MakeShmName(shmId, "m", id).c_str(), size))
     {
         Register(shmId, id, AllocationAlgorithm::rbtree_best_fit);
     }
 
-    size_t GetSize() const { return boost::apply_visitor(SegmentSize(), fSegment); }
-    void* GetData() { return boost::apply_visitor(SegmentAddress(), fSegment); }
+    size_t GetSize() const { return std::visit([](auto& s){ return s.get_size(); }, fSegment); }
+    void* GetData() { return std::visit([](auto& s){ return s.get_address(); }, fSegment); }
 
-    size_t GetFreeMemory() const { return boost::apply_visitor(SegmentFreeMemory(), fSegment); }
+    size_t GetFreeMemory() const { return std::visit([](auto& s){ return s.get_free_memory(); }, fSegment); }
 
-    void Zero() { boost::apply_visitor(SegmentMemoryZeroer(), fSegment); }
+    void Zero() { std::visit([](auto& s){ return s.zero_free_memory(); }, fSegment); }
     void Lock()
     {
         if (mlock(GetData(), GetSize()) == -1) {
@@ -59,16 +55,16 @@ struct Segment
 
     static void Remove(const std::string& shmId, uint16_t id)
     {
-        Monitor::RemoveObject("fmq_" + shmId + "_m_" + std::to_string(id));
+        Monitor::RemoveObject(MakeShmName(shmId, "m", id));
     }
 
   private:
-    boost::variant<RBTreeBestFitSegment, SimpleSeqFitSegment> fSegment;
+    std::variant<RBTreeBestFitSegment, SimpleSeqFitSegment> fSegment;
 
     static void Register(const std::string& shmId, uint16_t id, AllocationAlgorithm allocAlgo)
     {
         using namespace boost::interprocess;
-        managed_shared_memory mngSegment(open_or_create, std::string("fmq_" + shmId + "_mng").c_str(), kManagementSegmentSize);
+        managed_shared_memory mngSegment(open_or_create, MakeShmName(shmId, "mng").c_str(), kManagementSegmentSize);
         VoidAlloc alloc(mngSegment.get_segment_manager());
 
         Uint16SegmentInfoHashMap* shmSegments = mngSegment.find_or_construct<Uint16SegmentInfoHashMap>(unique_instance)(alloc);

fairmq/shmem/Socket.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -11,18 +11,23 @@
 #include "Common.h"
 #include "Manager.h"
 #include "Message.h"
-#include <fairmq/Error.h>
+#include <fairmq/Error.h>              // for assertm
 #include <fairmq/Message.h>
 #include <fairmq/Socket.h>
 #include <fairmq/tools/Strings.h>
-#include <fairmq/zeromq/Common.h>
+#include <fairmq/zeromq/Common.h>      // for zmq::HandleErrors, zmq::ShouldRetry
+#include <fairmq/zeromq/ZMsg.h>        // for zmq::ZMsg
 
 #include <fairlogger/Logger.h>
 
 #include <zmq.h>
 
+#include <algorithm>         // for std::max
 #include <atomic>
-#include <memory> // make_unique
+#include <cstddef>           // for std::size_t
+#include <cstring>           // for std::memcpy
+#include <exception>         // for std::terminate
+#include <memory>            // for std::make_unique
 
 namespace fair::mq {
     class TransportFactory;
@@ -31,24 +36,6 @@ namespace fair::mq {
 namespace fair::mq::shmem
 {
 
-struct ZMsg
-{
-    ZMsg() { int rc __attribute__((unused)) = zmq_msg_init(&fMsg); assert(rc == 0); }
-    explicit ZMsg(size_t size) { int rc __attribute__((unused)) = zmq_msg_init_size(&fMsg, size); assert(rc == 0); }
-    ~ZMsg() { int rc __attribute__((unused)) = zmq_msg_close(&fMsg); assert(rc == 0); }
-
-    ZMsg(const ZMsg&) = delete;
-    ZMsg(ZMsg&&) = delete;
-    ZMsg& operator=(const ZMsg&) = delete;
-    ZMsg& operator=(ZMsg&&) = delete;
-
-    void* Data() { return zmq_msg_data(&fMsg); }
-    size_t Size() { return zmq_msg_size(&fMsg); }
-    zmq_msg_t* Msg() { return &fMsg; }
-
-    zmq_msg_t fMsg;
-};
-
 class Socket final : public fair::mq::Socket
 {
   public:
@@ -64,6 +51,7 @@ class Socket final : public fair::mq::Socket
         , fMessagesRx(0)
         , fTimeout(100)
         , fConnectedPeersCount(0)
+        , fMetadataMsgSize(manager.GetMetadataMsgSize())
     {
         assert(context);
 
@@ -141,8 +129,14 @@ class Socket final : public fair::mq::Socket
         }
         int elapsed = 0;
 
+        MetaHeader meta{ shmMsg->fSize, shmMsg->fHint, shmMsg->fHandle, shmMsg->fShared, shmMsg->fRegionId, shmMsg->fSegmentId, shmMsg->fManaged };
+
+        // meta msg format: | MetaHeader | padded to fMetadataMsgSize |
+        zmq::ZMsg zmqMsg(std::max(fMetadataMsgSize, sizeof(MetaHeader)));
+        std::memcpy(zmqMsg.Data(), &meta, sizeof(MetaHeader));
+
         while (true) {
-            int nbytes = zmq_send(fSocket, &(shmMsg->fMeta), sizeof(MetaHeader), flags);
+            int nbytes = zmq_msg_send(zmqMsg.Msg(), fSocket, flags);
             if (nbytes > 0) {
                 shmMsg->fQueued = true;
                 ++fMessagesTx;
@@ -175,16 +169,19 @@ class Socket final : public fair::mq::Socket
 
         while (true) {
             Message* shmMsg = static_cast<Message*>(msg.get());
-            int nbytes = zmq_recv(fSocket, &(shmMsg->fMeta), sizeof(MetaHeader), flags);
+            MetaHeader meta;
+            int nbytes = zmq_recv(fSocket, &meta, sizeof(MetaHeader), flags);
             if (nbytes > 0) {
                 // check for number of received messages. must be 1
-                if (nbytes != sizeof(MetaHeader)) {
+                if (static_cast<std::size_t>(nbytes) < sizeof(MetaHeader)) {
                     throw SocketError(
                         tools::ToString("Received message is not a valid FairMQ shared memory message. ",
                             "Possibly due to a misconfigured transport on the sender side. ",
-                            "Expected size of ", sizeof(MetaHeader), " bytes, received ", nbytes));
+                            "Expected minimum size of ", sizeof(MetaHeader), " bytes, received ", nbytes));
                 }
 
+                shmMsg->SetMeta(meta);
+
                 size_t size = shmMsg->GetSize();
                 fBytesRx += size;
                 ++fMessagesRx;
@@ -203,7 +200,7 @@ class Socket final : public fair::mq::Socket
         }
     }
 
-    int64_t Send(std::vector<MessagePtr>& msgVec, int timeout = -1) override
+    int64_t Send(Parts::container& msgVec, int timeout = -1) override
     {
         int flags = 0;
         if (timeout == 0) {
@@ -211,13 +208,14 @@ class Socket final : public fair::mq::Socket
         }
         int elapsed = 0;
 
-        // put it into zmq message
-        const unsigned int vecSize = msgVec.size();
-        ZMsg zmqMsg(vecSize * sizeof(MetaHeader));
-
-        // prepare the message with shm metas
-        MetaHeader* metas = static_cast<MetaHeader*>(zmqMsg.Data());
+        // meta msg format: | n | MetaHeader 1 | ... | MetaHeader n | padded to fMetadataMsgSize |
+        auto const n = msgVec.size();
+        zmq::ZMsg zmqMsg(std::max(fMetadataMsgSize, sizeof(std::size_t) + n * sizeof(MetaHeader)));
 
+        auto meta_n = static_cast<std::size_t*>(zmqMsg.Data());
+        *meta_n = n;
+        ++meta_n;
+        auto metas = static_cast<MetaHeader*>(static_cast<void*>(meta_n));
         for (auto& msg : msgVec) {
             auto msgPtr = msg.get();
             if (!msgPtr) {
@@ -225,19 +223,20 @@ class Socket final : public fair::mq::Socket
             }
             assertm(dynamic_cast<shmem::Message*>(msgPtr), "given mq::Message is a shmem::Message");   // NOLINT
             auto shmMsg = static_cast<shmem::Message*>(msgPtr);   // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
-            std::memcpy(metas++, &(shmMsg->fMeta), sizeof(MetaHeader));
+            MetaHeader meta{ shmMsg->fSize, shmMsg->fHint, shmMsg->fHandle, shmMsg->fShared, shmMsg->fRegionId, shmMsg->fSegmentId, shmMsg->fManaged };
+            std::memcpy(metas++, &meta, sizeof(MetaHeader));
         }
 
         while (true) {
             int64_t totalSize = 0;
             int nbytes = zmq_msg_send(zmqMsg.Msg(), fSocket, flags);
             if (nbytes > 0) {
-                assert(static_cast<unsigned int>(nbytes) == (vecSize * sizeof(MetaHeader))); // all or nothing
+                assert(static_cast<unsigned int>(nbytes) >= sizeof(std::size_t) + (n * sizeof(MetaHeader)));
 
                 for (auto& msg : msgVec) {
                     Message* shmMsg = static_cast<Message*>(msg.get());
                     shmMsg->fQueued = true;
-                    totalSize += shmMsg->fMeta.fSize;
+                    totalSize += shmMsg->fSize;
                 }
 
                 // store statistics on how many messages have been sent
@@ -261,7 +260,7 @@ class Socket final : public fair::mq::Socket
         return static_cast<int>(TransferCode::error);
     }
 
-    int64_t Receive(std::vector<MessagePtr>& msgVec, int timeout = -1) override
+    int64_t Receive(Parts::container& msgVec, int timeout = -1) override
     {
         int flags = 0;
         if (timeout == 0) {
@@ -269,29 +268,26 @@ class Socket final : public fair::mq::Socket
         }
         int elapsed = 0;
 
-        ZMsg zmqMsg;
+        zmq::ZMsg zmqMsg;
 
         while (true) {
-            int64_t totalSize = 0;
+            std::size_t totalSize = 0;
             int nbytes = zmq_msg_recv(zmqMsg.Msg(), fSocket, flags);
             if (nbytes > 0) {
-                MetaHeader* hdrVec = static_cast<MetaHeader*>(zmqMsg.Data());
-                const auto hdrVecSize = zmqMsg.Size();
+                [[maybe_unused]] auto const size = zmqMsg.Size();
+                assert(size > sizeof(std::size_t));
+                auto meta_n = static_cast<std::size_t*>(zmqMsg.Data());
+                auto const n = *meta_n;
+                assert(size >= sizeof(std::size_t) + n * sizeof(MetaHeader));
+                ++meta_n;
+                auto metas = static_cast<MetaHeader*>(static_cast<void*>(meta_n));
+                msgVec.reserve(msgVec.size() + n);
+                auto const transport = GetTransport();
 
-                assert(hdrVecSize > 0);
-                if (hdrVecSize % sizeof(MetaHeader) != 0) {
-                    throw SocketError(
-                        tools::ToString("Received message is not a valid FairMQ shared memory message. ",
-                            "Possibly due to a misconfigured transport on the sender side. ",
-                            "Expected size of ", sizeof(MetaHeader), " bytes, received ", nbytes));
-                }
-
-                const auto numMessages = hdrVecSize / sizeof(MetaHeader);
-                msgVec.reserve(numMessages);
-
-                for (size_t m = 0; m < numMessages; m++) {
-                    // create new message (part)
-                    msgVec.emplace_back(std::make_unique<Message>(fManager, hdrVec[m], GetTransport()));
+                for (std::size_t i = 0; i < n; ++i) {
+                    msgVec.push_back(std::make_unique<Message>(fManager, *metas, transport));
+                    ++metas;
+                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-static-cast-downcast)
                     Message* shmMsg = static_cast<Message*>(msgVec.back().get());
                     totalSize += shmMsg->GetSize();
                 }
@@ -469,6 +465,7 @@ class Socket final : public fair::mq::Socket
 
     int fTimeout;
     mutable unsigned long fConnectedPeersCount;
+    std::size_t fMetadataMsgSize;
 };
 
 } // namespace fair::mq::shmem

fairmq/shmem/UnmanagedRegion.h

@@ -13,6 +13,7 @@
 #include <fairmq/shmem/Monitor.h>
 #include <fairmq/tools/Strings.h>
 #include <fairmq/UnmanagedRegion.h>
+#include <fairmq/Transports.h>
 
 #include <fairlogger/Logger.h>
 
@@ -59,11 +60,13 @@ struct UnmanagedRegion
         , fRemoveOnDestruction(cfg.removeOnDestruction)
         , fLinger(cfg.linger)
         , fStopAcks(false)
-        , fName("fmq_" + shmId + "_rg_" + std::to_string(cfg.id.value()))
-        , fQueueName("fmq_" + shmId + "_rgq_" + std::to_string(cfg.id.value()))
+        , fName(MakeShmName(shmId, "rg", cfg.id.value()))
+        , fQueueName(MakeShmName(shmId, "rgq", cfg.id.value()))
+        , fRefCountSegmentName(MakeShmName(shmId, "rrc", cfg.id.value()))
         , fShmemObject()
         , fFile(nullptr)
         , fFileMapping()
+        , fRcSegmentSize(cfg.rcSegmentSize)
         , fQueue(nullptr)
         , fCallback(nullptr)
         , fBulkCallback(nullptr)
@@ -145,11 +148,13 @@ struct UnmanagedRegion
             LOG(debug) << "Successfully zeroed free memory of region " << id << ".";
         }
 
+        InitializeRefCountSegment(fRcSegmentSize);
+
         if (fControlling && created) {
             Register(shmId, cfg);
         }
 
-        LOG(debug) << (created ? "Created" : "Opened") << " unmanaged shared memory region: " << fName << " (" << (fControlling ? "controller" : "viewer") << ")";
+        LOG(debug) << (created ? "Created" : "Opened") << " unmanaged shared memory region: " << fName << " (" << (fControlling ? "controller" : "viewer") << "), refCount segment size: " << fRcSegmentSize;
     }
 
     UnmanagedRegion() = delete;
@@ -186,6 +191,19 @@ struct UnmanagedRegion
 
     bool RemoveOnDestruction() { return fRemoveOnDestruction; }
 
+    RefCount& MakeRefCount(uint16_t initialCount = 1)
+    {
+        RefCount* refCount = fRefCountPool->allocate_one().get();
+        new (refCount) RefCount(initialCount);
+        return *refCount;
+    }
+
+    void RemoveRefCount(RefCount& refCount)
+    {
+        refCount.~RefCount();
+        fRefCountPool->deallocate_one(&refCount);
+    }
+
     ~UnmanagedRegion()
     {
         LOG(debug) << "~UnmanagedRegion(): " << fName << " (" << (fControlling ? "controller" : "viewer") << ")";
@@ -208,6 +226,11 @@ struct UnmanagedRegion
                 if (Monitor::RemoveFileMapping(fName.c_str())) {
                     LOG(trace) << "File mapping '" << fName << "' destroyed.";
                 }
+                if (fRefCountSegment) {
+                    if (Monitor::RemoveObject(fRefCountSegmentName)) {
+                        LOG(trace) << "Ref Count Segment '" << fRefCountSegmentName << "' destroyed.";
+                    }
+                }
             } else {
                 LOG(debug) << "Skipping removal of " << fName << " unmanaged region, because RegionConfig::removeOnDestruction is false";
             }
@@ -235,6 +258,7 @@ struct UnmanagedRegion
     std::atomic<bool> fStopAcks;
     std::string fName;
     std::string fQueueName;
+    std::string fRefCountSegmentName;
     boost::interprocess::shared_memory_object fShmemObject;
     FILE* fFile;
     boost::interprocess::file_mapping fFileMapping;
@@ -244,7 +268,10 @@ struct UnmanagedRegion
     std::condition_variable fBlockSendCV;
     std::vector<RegionBlock> fBlocksToFree;
     const std::size_t fAckBunchSize = 256;
+    uint64_t fRcSegmentSize;
     std::unique_ptr<boost::interprocess::message_queue> fQueue;
+    std::unique_ptr<boost::interprocess::managed_shared_memory> fRefCountSegment;
+    std::unique_ptr<RefCountPool> fRefCountPool;
 
     std::thread fAcksReceiver;
     std::thread fAcksSender;
@@ -262,7 +289,7 @@ struct UnmanagedRegion
     {
         using namespace boost::interprocess;
         LOG(debug) << "Registering unmanaged shared memory region with id " << cfg.id.value();
-        managed_shared_memory mngSegment(open_or_create, std::string("fmq_" + shmId + "_mng").c_str(), kManagementSegmentSize);
+        managed_shared_memory mngSegment(open_or_create, MakeShmName(shmId, "mng").c_str(), kManagementSegmentSize);
         VoidAlloc alloc(mngSegment.get_segment_manager());
 
         Uint16RegionInfoHashMap* shmRegions = mngSegment.find_or_construct<Uint16RegionInfoHashMap>(unique_instance)(alloc);
@@ -275,7 +302,7 @@ struct UnmanagedRegion
             throw TransportError(tools::ToString("Unmanaged Region with id ", cfg.id.value(), " has already been registered. Only unique IDs per session are allowed."));
         }
 
-        shmRegions->emplace(cfg.id.value(), RegionInfo(cfg.path.c_str(), cfg.creationFlags, cfg.userFlags, cfg.size, alloc));
+        shmRegions->emplace(cfg.id.value(), RegionInfo(cfg.path.c_str(), cfg.creationFlags, cfg.userFlags, cfg.size, cfg.rcSegmentSize, alloc));
         (eventCounter->fCount)++;
     }
 
@@ -294,6 +321,29 @@ struct UnmanagedRegion
         }
     }
 
+    void InitializeRefCountSegment(uint64_t size)
+    {
+        using namespace boost::interprocess;
+        if (!fRefCountSegment && size > 0) {
+            fRefCountSegment = std::make_unique<managed_shared_memory>(open_or_create, fRefCountSegmentName.c_str(), size);
+            LOG(trace) << "shmem: initialized ref count segment: " << fRefCountSegmentName;
+            fRefCountPool = std::make_unique<RefCountPool>(fRefCountSegment->get_segment_manager());
+        }
+    }
+
+    RefCount* GetRefCountAddressFromHandle(const boost::interprocess::managed_shared_memory::handle_t handle)
+    {
+        if (fRefCountPool) {
+            return reinterpret_cast<RefCount*>(fRefCountSegment->get_address_from_handle(handle));
+        }
+        return nullptr;
+    };
+
+    boost::interprocess::managed_shared_memory::handle_t HandleFromAddress(const void* ptr)
+    {
+        return fRefCountSegment->get_handle_from_address(ptr);
+    }
+
     void StartAckSender()
     {
         if (!fAcksSender.joinable()) {

fairmq/tools/Network.cxx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2017-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -8,12 +8,12 @@
 
 #include <fairlogger/Logger.h>
 #include <fairmq/tools/Network.h>
+#include <fairmq/tools/Strings.h>
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE   // To get defns of NI_MAXSERV and NI_MAXHOST
 #endif
 
-#include <algorithm>
 #include <array>
 #include <boost/algorithm/string.hpp>   // trim
 #include <boost/asio.hpp>
@@ -158,33 +158,22 @@ string getDefaultRouteNetworkInterface()
 }
 
 string getIpFromHostname(const string& hostname)
-{
+try {
     boost::asio::io_context ioc;
+    boost::asio::ip::tcp::resolver resolver(ioc);
 
-    using namespace boost::asio::ip;
-
-    try {
-        tcp::resolver resolver(ioc);
-        tcp::resolver::query query(hostname, "");
-        tcp::resolver::iterator end;
-
-        auto it = find_if(static_cast<basic_resolver_iterator<tcp>>(resolver.resolve(query)),
-                          end,
-                          [](const tcp::endpoint& ep) { return ep.address().is_v4(); });
-
-        if (it != end) {
-            stringstream ss;
-            ss << static_cast<tcp::endpoint>(*it).address();
-            return ss.str();
-        }
+    auto const result = resolver.resolve(boost::asio::ip::tcp::v4(), hostname, "");
 
+    if (result.empty()) {
         LOG(warn) << "could not find ipv4 address for hostname '" << hostname << "'";
-
-        return "";
-    } catch (exception& e) {
-        LOG(error) << "could not resolve hostname '" << hostname << "', reason: " << e.what();
         return "";
     }
+    return ToString(result.begin()->endpoint().address());
+}
+catch (std::exception const& ex)
+{
+    LOG(error) << "could not resolve hostname '" << hostname << "', reason: " << ex.what();
+    return "";
 }
 
 }   // namespace fair::mq::tools

fairmq/tools/Process.cxx

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2017-2025 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -29,7 +29,7 @@ class LinePrinter
   public:
     LinePrinter(stringstream& out, string prefix)
         : fOut(out)
-        , fPrefix(move(prefix))
+        , fPrefix(std::move(prefix))
     {}
 
     // prints line with prefix on both cout (thread-safe) and output stream
@@ -64,22 +64,22 @@ execute_result execute(const string& cmd, const string& prefix, const string& in
 
     p.Print(cmd);
 
-    ba::io_service ios;
+    ba::io_context ioc;
 
     // containers for std_in
     ba::const_buffer inputBuffer(ba::buffer(input));
-    bp::async_pipe inputPipe(ios);
+    bp::async_pipe inputPipe(ioc);
     // containers for std_out
     ba::streambuf outputBuffer;
-    bp::async_pipe outputPipe(ios);
+    bp::async_pipe outputPipe(ioc);
     // containers for std_err
     ba::streambuf errorBuffer;
-    bp::async_pipe errorPipe(ios);
+    bp::async_pipe errorPipe(ioc);
 
     const string delimiter = "\n";
-    ba::steady_timer inputTimer(ios);
+    ba::steady_timer inputTimer(ioc);
     inputTimer.expires_after(std::chrono::milliseconds(1000)); // NOLINT
-    ba::steady_timer signalTimer(ios);
+    ba::steady_timer signalTimer(ioc);
     signalTimer.expires_after(std::chrono::milliseconds(2000)); // NOLINT
 
     // child process
@@ -154,7 +154,7 @@ execute_result execute(const string& cmd, const string& prefix, const string& in
     };
     ba::async_read_until(errorPipe, errorBuffer, delimiter, onStdErr);
 
-    ios.run();
+    ioc.run();
     c.wait();
 
     result.exit_code = c.exit_code();

fairmq/zeromq/Message.h

@@ -210,7 +210,7 @@ class Message final : public fair::mq::Message
     // destroyed. Used size is applied only once in ApplyUsedSize, which is called by the socket
     // before sending. This function just updates the desired size until the actual "resizing"
     // happens.
-    bool SetUsedSize(size_t size) override
+    bool SetUsedSize(size_t size, Alignment /* alignment */ = Alignment{0}) override
     {
         if (size == GetSize()) {
             // nothing to do

fairmq/zeromq/Socket.h

@@ -154,7 +154,7 @@ class Socket final : public fair::mq::Socket
         }
     }
 
-    int64_t Send(std::vector<std::unique_ptr<fair::mq::Message>>& msgVec, int timeout = -1) override
+    int64_t Send(Parts::container& msgVec, int timeout = -1) override
     {
         int flags = 0;
         if (timeout == 0) {
@@ -206,7 +206,7 @@ class Socket final : public fair::mq::Socket
         }
     }
 
-    int64_t Receive(std::vector<std::unique_ptr<fair::mq::Message>>& msgVec, int timeout = -1) override
+    int64_t Receive(Parts::container& msgVec, int timeout = -1) override
     {
         int flags = 0;
         if (timeout == 0) {
@@ -225,7 +225,7 @@ class Socket final : public fair::mq::Socket
                 int nbytes = zmq_msg_recv(static_cast<Message*>(part.get())->GetMessage(), fSocket, flags);
                 if (nbytes >= 0) {
                     static_cast<Message*>(part.get())->Realign();
-                    msgVec.push_back(move(part));
+                    msgVec.push_back(std::move(part));
                     totalSize += nbytes;
                 } else if (zmq_errno() == EAGAIN || zmq_errno() == EINTR) {
                     if (fCtx.Interrupted()) {

fairmq/zeromq/ZMsg.h

@@ -0,0 +1,92 @@
+/********************************************************************************
+ *    Copyright (C) 2023 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_ZMQ_ZMSG_H
+#define FAIR_MQ_ZMQ_ZMSG_H
+
+#include <cstddef>          // for std::size_t
+#include <fairmq/Error.h>   // for assertm
+#include <new>              // for std::bad_alloc
+#include <zmq.h>            // for zmq_*
+
+namespace fair::mq::zmq {
+
+// Wraps a `zmq_msg_t` C object as a C++ type:
+// * `zmq_msg_init` -> C++ default ctor
+// * `zmq_msg_init_size` -> C++ ctor
+// * `zmq_msg_init_data` -> C++ ctor
+// * `zmq_msg_init_size` + `memcpy` -> C++ copy ctor
+// * `zmq_msg_close` + `zmq_msg_init_size` + `memcpy` -> C++ copy assignment
+// * `zmq_msg_init` + `zmq_msg_move`` -> C++ move ctor
+// * `zmq_msg_move` -> C++ move assignment
+// * `zmq_msg_close` -> C++ dtor
+// * access the underlying `zmq_msg_t` via `Msg() [const] -> zmq_msg_t*`
+//   the const overload does a `const_cast<zmq_msg_t*>`, because the
+//   C interfaces do not model constness
+// * `zmq_msg_data` -> `Data() -> void*`
+// * `zmq_msg_size` -> `Size() -> std::size_t`
+struct ZMsg
+{
+    ZMsg() noexcept
+    {
+        [[maybe_unused]] auto const rc = zmq_msg_init(Msg());
+        assertm(rc == 0, "msg init successful");   // NOLINT
+    }
+    explicit ZMsg(std::size_t size)
+    {
+        auto const rc = zmq_msg_init_size(Msg(), size);
+        if (rc == -1) {
+            throw std::bad_alloc{};
+        }
+    }
+    explicit ZMsg(void* data,
+                  std::size_t size,
+                  zmq_free_fn* freefn = nullptr,
+                  void* hint = nullptr)
+    {
+        auto const rc = zmq_msg_init_data(Msg(), data, size, freefn, hint);
+        if (rc == -1) {
+            throw std::bad_alloc{};
+        }
+    }
+    ~ZMsg() noexcept
+    {
+        [[maybe_unused]] auto const rc = zmq_msg_close(Msg());
+        assertm(rc == 0, "msg close successful");   // NOLINT
+    }
+    ZMsg(const ZMsg& other) = delete;
+    ZMsg(ZMsg&& other) noexcept
+    {
+        [[maybe_unused]] auto rc = zmq_msg_init(Msg());
+        assertm(rc == 0, "msg init successful");   // NOLINT
+        rc = zmq_msg_move(Msg(), other.Msg());
+        assertm(rc == 0, "msg move successful");   // NOLINT
+    }
+    ZMsg& operator=(const ZMsg& rhs) = delete;
+    ZMsg& operator=(ZMsg&& rhs) noexcept
+    {
+        [[maybe_unused]] auto const rc = zmq_msg_move(Msg(), rhs.Msg());
+        assertm(rc == 0, "msg move successful");   // NOLINT
+        return *this;
+    }
+
+    zmq_msg_t* Msg() noexcept { return &fMsg; }
+    zmq_msg_t* Msg() const noexcept
+    {
+        return const_cast<zmq_msg_t*>(&fMsg);   // NOLINT(cppcoreguidelines-pro-type-const-cast)
+    }
+    void* Data() const noexcept { return zmq_msg_data(Msg()); }
+    std::size_t Size() const noexcept { return zmq_msg_size(Msg()); }
+
+  private:
+    zmq_msg_t fMsg{};
+};
+
+}   // namespace fair::mq::zmq
+
+#endif /* FAIR_MQ_ZMQ_ZMSG_H */

spack.yaml

@@ -0,0 +1,10 @@
+spack:
+  specs:
+  - boost+container+program_options+filesystem+date_time+regex
+  - faircmakemodules
+  - fairlogger+pretty
+  - fmt
+  - libzmq
+  view: true
+  concretizer:
+    unify: true

test/CMakeLists.txt

@@ -253,7 +253,7 @@ add_testsuite(Tools
     LINKS FairMQ
     INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
              ${CMAKE_CURRENT_BINARY_DIR}
-    TIMEOUT 20
+    TIMEOUT 5
     ${environment}
 )
 

test/device/_config.cxx

@@ -27,7 +27,7 @@ class TestDevice : public Device
 {
   public:
     TestDevice(const string& transport)
-    : fDeviceThread(&Device::RunStateMachine, this)
+        : fDeviceThread(&Device::RunStateMachine, this)
     {
         SetTransport(transport);
         test::Control(*this, test::Cycle::ToRun);

test/helper/devices/TestPull.h

@@ -28,10 +28,26 @@ class Pull : public Device
 
     auto Run() -> void override
     {
-        auto msg = NewMessage();
+        int counter = 0;
 
-        if (Receive(msg, "data") >= 0)
-        {
+        auto msg1 = NewMessageFor("data", 0);
+
+        if (Receive(msg1, "data") >= 0) {
+            ++counter;
+        }
+
+        auto msg2 = NewMessageFor("data", 0);
+
+        auto ret = Receive(msg2, "data");
+        if (ret >= 0) {
+            auto content = std::string{static_cast<char*>(msg2->GetData()), msg2->GetSize()};
+            LOG(info) << "Transferred " << static_cast<std::size_t>(ret) << " bytes, msg size: " << msg2->GetSize() << ", content: " << content;
+            if (msg2->GetSize() == static_cast<std::size_t>(ret) && content == "testdata1234") {
+                ++counter;
+            }
+        }
+
+        if (counter == 2) {
             LOG(info) << "PUSH-PULL test successfull";
         }
     };

test/helper/devices/TestPush.h

@@ -25,8 +25,12 @@ class Push : public Device
 
     auto Run() -> void override
     {
-        auto msg = NewMessage();
-        Send(msg, "data");
+        // empty message
+        auto msg1 = NewMessageFor("data", 0);
+        Send(msg1, "data");
+        // message with short text data
+        auto msg2(NewSimpleMessageFor("data", 0, "testdata1234"));
+        Send(msg2, "data");
     };
 };
 

test/helper/devices/TestRep.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2015-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2015-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -24,22 +24,40 @@ class Rep : public Device
         std::this_thread::sleep_for(std::chrono::milliseconds(200));
     }
 
+    bool check(signed long ret, const fair::mq::MessagePtr& msg)
+    {
+        auto content = std::string{static_cast<char*>(msg->GetData()), msg->GetSize()};
+        LOG(info) << "Transferred " << static_cast<std::size_t>(ret) << " bytes, msg size: " << msg->GetSize() << ", content: " << content;
+        return msg->GetSize() == static_cast<std::size_t>(ret) && content == "request";
+    }
+
     auto Run() -> void override
     {
-        auto request1 = NewMessage();
-        if (Receive(request1, "data") >= 0) {
+        int counter = 0;
+        auto req1 = NewMessage();
+        auto ret1 = Receive(req1, "data");
+        if (ret1 >= 0) {
             LOG(info) << "Received request 1";
-            auto reply = NewMessage();
+            if (check(ret1, req1)) {
+                ++counter;
+            }
+            auto reply = NewSimpleMessageFor("data", 0, "reply");
             Send(reply, "data");
         }
-        auto request2 = NewMessage();
-        if (Receive(request2, "data") >= 0) {
+        auto req2 = NewMessage();
+        auto ret2 = Receive(req2, "data");
+        if (ret2 >= 0) {
             LOG(info) << "Received request 2";
-            auto reply = NewMessage();
+            if (check(ret2, req2)) {
+                ++counter;
+            }
+            auto reply = NewSimpleMessageFor("data", 0, "reply");
             Send(reply, "data");
         }
 
-        LOG(info) << "REQ-REP test successfull";
+        if (counter == 2) {
+            LOG(info) << "REQ-REP test successfull";
+        }
     };
 };
 

test/helper/devices/TestReq.h

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2015-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2015-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -26,12 +26,17 @@ class Req : public Device
 
     auto Run() -> void override
     {
-        auto request = NewMessage();
+        auto request = NewSimpleMessageFor("data", 0, "request");
         Send(request, "data");
 
         auto reply = NewMessage();
         if (Receive(reply, "data") >= 0) {
             LOG(info) << "received reply";
+            auto content = std::string{static_cast<char*>(reply->GetData()), reply->GetSize()};
+            LOG(info) << "Transferred reply of size: " << reply->GetSize() << ", content: " << content;
+            if (content != "reply") {
+                ChangeStateOrThrow(Transition::ErrorFound);
+            }
         }
     };
 };

test/memory_resources/_memory_resources.cxx

@@ -16,6 +16,7 @@
 #include <gtest/gtest.h>
 
 #include <cstring>
+#include <string>
 #include <vector>
 
 namespace
@@ -101,7 +102,7 @@ TEST(MemoryResources, allocator)
 
     size_t session{tools::UuidHash()};
     ProgOptions config;
-    config.SetProperty<string>("session", to_string(session));
+    config.SetProperty<std::string>("session", to_string(session));
 
     FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
 
@@ -129,7 +130,7 @@ TEST(MemoryResources, getMessage)
 
     size_t session{tools::UuidHash()};
     ProgOptions config;
-    config.SetProperty<string>("session", to_string(session));
+    config.SetProperty<std::string>("session", to_string(session));
     config.SetProperty<bool>("shm-monitor", true);
 
     FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);

test/message/_message.cxx

@@ -37,17 +37,20 @@ auto AsStringView(Message const& msg) -> string_view
     return {static_cast<char const*>(msg.GetData()), msg.GetSize()};
 }
 
-auto RunPushPullWithMsgResize(string const & transport, string const & _address) -> void
+auto RunPushPullWithMsgResize(string const & transport, string const & _address, bool expandedShmMetadata = false) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory(TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config));
 
     Channel push{"Push", "push", factory};
     Channel pull{"Pull", "pull", factory};
-    auto const address(tools::ToString(_address, "_", transport));
+    auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
     push.Bind(address);
     pull.Connect(address);
 
@@ -100,12 +103,15 @@ auto RunPushPullWithMsgResize(string const & transport, string const & _address)
     }
 }
 
-auto RunMsgRebuild(const string& transport) -> void
+auto RunMsgRebuild(const string& transport, bool expandedShmMetadata = false) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory(TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config));
 
     size_t const msgSize{100};
@@ -134,17 +140,20 @@ auto CheckMsgAlignment(Message const& msg, fair::mq::Alignment alignment) -> boo
     return (reinterpret_cast<uintptr_t>(msg.GetData()) % static_cast<size_t>(alignment)) == 0; // NOLINT
 }
 
-auto RunPushPullWithAlignment(string const& transport, string const& _address) -> void
+auto RunPushPullWithAlignment(string const& transport, string const& _address, bool expandedShmMetadata = false) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory(TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config));
 
     Channel push{"Push", "push", factory};
     Channel pull{"Pull", "pull", factory};
-    auto const address(tools::ToString(_address, "_", transport));
+    auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
     push.Bind(address);
     pull.Connect(address);
 
@@ -189,17 +198,20 @@ auto RunPushPullWithAlignment(string const& transport, string const& _address) -
     ASSERT_TRUE(CheckMsgAlignment(*msgCopy, align32));
 }
 
-auto EmptyMessage(string const& transport, string const& _address) -> void
+auto EmptyMessage(string const& transport, string const& _address, bool expandedShmMetadata = false) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory(TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config));
 
     Channel push{"Push", "push", factory};
     Channel pull{"Pull", "pull", factory};
-    auto const address(tools::ToString(_address, "_", transport));
+    auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
     push.Bind(address);
     pull.Connect(address);
 
@@ -241,12 +253,15 @@ auto EmptyMessage(string const& transport, string const& _address) -> void
 
 // The "zero copy" property of the Copy() method is an implementation detail and is not guaranteed.
 // Currently it holds true for the shmem (across devices) and for zeromq (within same device) transports.
-auto ZeroCopy() -> void
+auto ZeroCopy(bool expandedShmMetadata = false) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory(TransportFactory::CreateTransportFactory("shmem", tools::Uuid(), &config));
 
     unique_ptr<string> str(make_unique<string>("asdf"));
@@ -272,8 +287,10 @@ auto ZeroCopy() -> void
 
 // The "zero copy" property of the Copy() method is an implementation detail and is not guaranteed.
 // Currently it holds true for the shmem (across devices) and for zeromq (within same device) transports.
-auto ZeroCopyFromUnmanaged(string const& address) -> void
+auto ZeroCopyFromUnmanaged(string const& address, bool expandedShmMetadata, uint64_t rcSegmentSize) -> void
 {
+    fair::Logger::SetConsoleSeverity(fair::Severity::debug);
+
     ProgOptions config1;
     ProgOptions config2;
     string session(tools::Uuid());
@@ -285,23 +302,31 @@ auto ZeroCopyFromUnmanaged(string const& address) -> void
     config2.SetProperty<bool>("shm-monitor", true);
     // ref counts should be accessible accross different segments
     config2.SetProperty<uint16_t>("shm-segment-id", 2);
+    if (expandedShmMetadata) {
+        config1.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
+    if (expandedShmMetadata) {
+        config2.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
     auto factory1(TransportFactory::CreateTransportFactory("shmem", tools::Uuid(), &config1));
     auto factory2(TransportFactory::CreateTransportFactory("shmem", tools::Uuid(), &config2));
 
     const size_t msgSize{100};
     const size_t regionSize{1000000};
+    RegionConfig cfg;
+    cfg.rcSegmentSize = rcSegmentSize;
     tools::Semaphore blocker;
 
     auto region = factory1->CreateUnmanagedRegion(regionSize, [&blocker](void*, size_t, void*) {
         blocker.Signal();
-    });
+    }, cfg);
 
     {
         Channel push("Push", "push", factory1);
         Channel pull("Pull", "pull", factory2);
 
-        push.Bind(address);
-        pull.Connect(address);
+        push.Bind(address + "_" + session);
+        pull.Connect(address + "_" + session);
 
         const size_t offset = 100;
         auto msg1(push.NewMessage(region, static_cast<char*>(region->GetData()), msgSize, nullptr));
@@ -378,6 +403,11 @@ TEST(Resize, shmem) // NOLINT
     RunPushPullWithMsgResize("shmem", "ipc://test_message_resize");
 }
 
+TEST(Resize, shmem_expanded_metadata) // NOLINT
+{
+    RunPushPullWithMsgResize("shmem", "ipc://test_message_resize", true);
+}
+
 TEST(Rebuild, zeromq) // NOLINT
 {
     RunMsgRebuild("zeromq");
@@ -388,11 +418,21 @@ TEST(Rebuild, shmem) // NOLINT
     RunMsgRebuild("shmem");
 }
 
+TEST(Rebuild, shmem_expanded_metadata) // NOLINT
+{
+    RunMsgRebuild("shmem", true);
+}
+
 TEST(Alignment, shmem) // NOLINT
 {
     RunPushPullWithAlignment("shmem", "ipc://test_message_alignment");
 }
 
+TEST(Alignment, shmem_expanded_metadata) // NOLINT
+{
+    RunPushPullWithAlignment("shmem", "ipc://test_message_alignment", true);
+}
+
 TEST(Alignment, zeromq) // NOLINT
 {
     RunPushPullWithAlignment("zeromq", "ipc://test_message_alignment");
@@ -408,14 +448,39 @@ TEST(EmptyMessage, shmem) // NOLINT
     EmptyMessage("shmem", "ipc://test_empty_message");
 }
 
+TEST(EmptyMessage, shmem_expanded_metadata) // NOLINT
+{
+    EmptyMessage("shmem", "ipc://test_empty_message", true);
+}
+
 TEST(ZeroCopy, shmem) // NOLINT
 {
     ZeroCopy();
 }
 
+TEST(ZeroCopy, shmem_expanded_metadata) // NOLINT
+{
+    ZeroCopy(true);
+}
+
 TEST(ZeroCopyFromUnmanaged, shmem) // NOLINT
 {
-    ZeroCopyFromUnmanaged("ipc://test_zerocopy_unmanaged");
+    ZeroCopyFromUnmanaged("ipc://test_zerocopy_unmanaged", false, 10000000);
+}
+
+TEST(ZeroCopyFromUnmanaged, shmem_expanded_metadata) // NOLINT
+{
+    ZeroCopyFromUnmanaged("ipc://test_zerocopy_unmanaged_expanded", true, 10000000);
+}
+
+TEST(ZeroCopyFromUnmanaged, shmem_no_rc_segment) // NOLINT
+{
+    ZeroCopyFromUnmanaged("ipc://test_zerocopy_unmanaged_no_rc_segment", false, 0);
+}
+
+TEST(ZeroCopyFromUnmanaged, shmem_expanded_metadata_no_rc_segment) // NOLINT
+{
+    ZeroCopyFromUnmanaged("ipc://test_zerocopy_unmanaged_expanded_no_rc_segment", true, 0);
 }
 
 } // namespace

test/plugin_services/_control.cxx

@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -7,8 +7,12 @@
  ********************************************************************************/
 
 #include "Fixture.h"
+#include <array>
 #include <condition_variable>
+#include <fairmq/Tools.h>
+#include <memory>
 #include <mutex>
+#include <string>
 
 namespace
 {
@@ -142,4 +146,27 @@ TEST_F(PluginServices, ControlStateTransitionConversions)
     EXPECT_NO_THROW(mServices.ToStr(DeviceStateTransition::ErrorFound));
 }
 
+TEST_F(PluginServices, SubscriptionThreadSafety)
+{
+    // obviously not a perfect test, but I could segfault fmq reliably with it (without the fix)
+
+    constexpr auto attempts = 1000;
+    constexpr auto subscribers = 5;
+
+    std::array<std::unique_ptr<std::thread>, subscribers> threads;
+    auto id = 0;
+    for (auto& thread : threads) {
+        thread = std::make_unique<std::thread>([&](){
+            auto const subscriber = fair::mq::tools::ToString("subscriber_", id);
+            for (auto i = 0; i < attempts; ++i) {
+                mServices.SubscribeToDeviceStateChange(subscriber, [](DeviceState){});
+                mServices.UnsubscribeFromDeviceStateChange(subscriber);
+            }
+        });
+        ++id;
+    }
+
+    for (auto& thread : threads) { thread->join(); }
+}
+
 } /* namespace */

test/protocols/_pair.cxx

@@ -22,7 +22,7 @@ using namespace std;
 using namespace fair::mq::test;
 using namespace fair::mq::tools;
 
-auto RunPair(string transport) -> void
+auto RunPair(const string& transport, const string& extraDeviceCmdArgs) -> void
 {
     size_t session{fair::mq::tools::UuidHash()};
     string ipcFile("/tmp/fmq_" + to_string(session) + "_data_" + transport);
@@ -38,6 +38,7 @@ auto RunPair(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=pair,method=bind,address=" << address;
         pairleft = execute(cmd.str(), "[PAIR L]");
     });
@@ -52,6 +53,7 @@ auto RunPair(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=pair,method=connect,address=" << address;
         pairright = execute(cmd.str(), "[PAIR R]");
     });
@@ -65,14 +67,19 @@ auto RunPair(string transport) -> void
     exit(pairleft.exit_code + pairright.exit_code);
 }
 
-TEST(Pair, SingleMsg_MP_tcp_zeromq)
+TEST(Pair, SingleMsg_MultiThreaded_tcp_zeromq)
 {
-    EXPECT_EXIT(RunPair("zeromq"), ::testing::ExitedWithCode(0), "PAIR test successfull");
+    EXPECT_EXIT(RunPair("zeromq", ""), ::testing::ExitedWithCode(0), "PAIR test successfull");
 }
 
-TEST(Pair, SingleMsg_MP_tcp_shmem)
+TEST(Pair, SingleMsg_MultiThreaded_tcp_shmem)
 {
-    EXPECT_EXIT(RunPair("shmem"), ::testing::ExitedWithCode(0), "PAIR test successfull");
+    EXPECT_EXIT(RunPair("shmem", ""), ::testing::ExitedWithCode(0), "PAIR test successfull");
+}
+
+TEST(Pair, SingleMsg_MultiThreaded_tcp_shmem_expanded_metadata)
+{
+    EXPECT_EXIT(RunPair("shmem", " --shm-metadata-msg-size 2048"), ::testing::ExitedWithCode(0), "PAIR test successfull");
 }
 
 } // namespace

test/protocols/_push_pull.cxx

@@ -22,7 +22,7 @@ using namespace std;
 using namespace fair::mq::test;
 using namespace fair::mq::tools;
 
-auto RunPushPull(string transport) -> void
+auto RunPushPull(string transport, const string& extraDeviceCmdArgs) -> void
 {
     size_t session(fair::mq::tools::UuidHash());
     string ipcFile("/tmp/fmq_" + to_string(session) + "_data_" + transport);
@@ -38,6 +38,7 @@ auto RunPushPull(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=push,method=bind,address=" << address;
         push = execute(cmd.str(), "[PUSH]");
     });
@@ -52,6 +53,7 @@ auto RunPushPull(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=pull,method=connect,address=" << address;
         pull = execute(cmd.str(), "[PULL]");
     });
@@ -65,14 +67,19 @@ auto RunPushPull(string transport) -> void
     exit(push.exit_code + pull.exit_code);
 }
 
-TEST(PushPull, SingleMsg_MP_ipc_zeromq)
+TEST(PushPull, SingleMsg_MultiThreaded_ipc_zeromq)
 {
-    EXPECT_EXIT(RunPushPull("zeromq"), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
+    EXPECT_EXIT(RunPushPull("zeromq", ""), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
 }
 
-TEST(PushPull, SingleMsg_MP_ipc_shmem)
+TEST(PushPull, SingleMsg_MultiThreaded_ipc_shmem)
 {
-    EXPECT_EXIT(RunPushPull("shmem"), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
+    EXPECT_EXIT(RunPushPull("shmem", ""), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
+}
+
+TEST(PushPull, SingleMsg_MultiThreaded_ipc_shmem_expanded_metadata)
+{
+    EXPECT_EXIT(RunPushPull("shmem", " --shm-metadata-msg-size 2048"), ::testing::ExitedWithCode(0), "PUSH-PULL test successfull");
 }
 
 } // namespace

test/protocols/_push_pull_multipart.cxx

@@ -25,12 +25,18 @@ namespace
 using namespace std;
 using namespace fair::mq;
 
-auto RunSingleThreadedMultipart(string transport, string address1, string address2) -> void {
+auto RunSingleThreadedMultipart(string transport, string address1, string address2, bool expandedShmMetadata) -> void {
 
     fair::mq::ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<size_t>("shm-segment-size", 100000000);
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
+
+    address1 += "_" + config.GetProperty<string>("session");
+    address2 += "_" + config.GetProperty<string>("session");
 
     auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
 
@@ -104,13 +110,18 @@ auto RunSingleThreadedMultipart(string transport, string address1, string addres
     }
 }
 
-auto RunMultiThreadedMultipart(string transport, string address1) -> void
+auto RunMultiThreadedMultipart(string transport, string address1, bool expandedShmMetadata) -> void
 {
     ProgOptions config;
     config.SetProperty<string>("session", tools::Uuid());
     config.SetProperty<int>("io-threads", 1);
     config.SetProperty<size_t>("shm-segment-size", 20000000); // NOLINT
     config.SetProperty<bool>("shm-monitor", true);
+    if (expandedShmMetadata) {
+        config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
+    }
+
+    address1 += "_" + config.GetProperty<string>("session");
 
     auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
 
@@ -147,44 +158,64 @@ auto RunMultiThreadedMultipart(string transport, string address1) -> void
     puller.join();
 }
 
-TEST(PushPull, Multipart_ST_inproc_zeromq) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_inproc_zeromq) // NOLINT
 {
-    RunSingleThreadedMultipart("zeromq", "inproc://test1", "inproc://test2");
+    RunSingleThreadedMultipart("zeromq", "inproc://test1", "inproc://test2", false);
 }
 
-TEST(PushPull, Multipart_ST_inproc_shmem) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_inproc_shmem) // NOLINT
 {
-    RunSingleThreadedMultipart("shmem", "inproc://test1", "inproc://test2");
+    RunSingleThreadedMultipart("shmem", "inproc://test1", "inproc://test2", false);
 }
 
-TEST(PushPull, Multipart_ST_ipc_zeromq) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_inproc_shmem_expanded_metadata) // NOLINT
 {
-    RunSingleThreadedMultipart("zeromq", "ipc://test_Multipart_ST_ipc_zeromq_1", "ipc://test_Multipart_ST_ipc_zeromq_2");
+    RunSingleThreadedMultipart("shmem", "inproc://test1", "inproc://test2", true);
 }
 
-TEST(PushPull, Multipart_ST_ipc_shmem) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_ipc_zeromq) // NOLINT
 {
-    RunSingleThreadedMultipart("shmem", "ipc://test_Multipart_ST_ipc_shmem_1", "ipc://test_Multipart_ST_ipc_shmem_2");
+    RunSingleThreadedMultipart("zeromq", "ipc://test_Multipart_SingleThreaded_ipc_zeromq_1", "ipc://test_Multipart_SingleThreaded_ipc_zeromq_2", false);
 }
 
-TEST(PushPull, Multipart_MT_inproc_zeromq) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_ipc_shmem) // NOLINT
 {
-    RunMultiThreadedMultipart("zeromq", "inproc://test_1");
+    RunSingleThreadedMultipart("shmem", "ipc://test_Multipart_SingleThreaded_ipc_shmem_1", "ipc://test_Multipart_SingleThreaded_ipc_shmem_2", false);
 }
 
-TEST(PushPull, Multipart_MT_inproc_shmem) // NOLINT
+TEST(PushPull, Multipart_SingleThreaded_ipc_shmem_expanded_metadata) // NOLINT
 {
-    RunMultiThreadedMultipart("shmem", "inproc://test_1");
+    RunSingleThreadedMultipart("shmem", "ipc://test_Multipart_SingleThreaded_ipc_shmem_1", "ipc://test_Multipart_SingleThreaded_ipc_shmem_2", true);
 }
 
-TEST(PushPull, Multipart_MT_ipc_zeromq) // NOLINT
+TEST(PushPull, Multipart_MultiThreaded_inproc_zeromq) // NOLINT
 {
-    RunMultiThreadedMultipart("zeromq", "ipc://test_Multipart_MT_ipc_zeromq_1");
+    RunMultiThreadedMultipart("zeromq", "inproc://test_1", false);
 }
 
-TEST(PushPull, Multipart_MT_ipc_shmem) // NOLINT
+TEST(PushPull, Multipart_MultiThreaded_inproc_shmem) // NOLINT
 {
-    RunMultiThreadedMultipart("shmem", "ipc://test_Multipart_MT_ipc_shmem_1");
+    RunMultiThreadedMultipart("shmem", "inproc://test_1", false);
+}
+
+TEST(PushPull, Multipart_MultiThreaded_inproc_shmem_expanded_metadata) // NOLINT
+{
+    RunMultiThreadedMultipart("shmem", "inproc://test_1", true);
+}
+
+TEST(PushPull, Multipart_MultiThreaded_ipc_zeromq) // NOLINT
+{
+    RunMultiThreadedMultipart("zeromq", "ipc://test_Multipart_MultiThreaded_ipc_zeromq_1", false);
+}
+
+TEST(PushPull, Multipart_MultiThreaded_ipc_shmem) // NOLINT
+{
+    RunMultiThreadedMultipart("shmem", "ipc://test_Multipart_MultiThreaded_ipc_shmem_1", false);
+}
+
+TEST(PushPull, Multipart_MultiThreaded_ipc_shmem_expanded_metadata) // NOLINT
+{
+    RunMultiThreadedMultipart("shmem", "ipc://test_Multipart_MultiThreaded_ipc_shmem__expanded_metadata_1", true);
 }
 
 } // namespace

test/protocols/_req_rep.cxx

@@ -22,7 +22,7 @@ using namespace std;
 using namespace fair::mq::test;
 using namespace fair::mq::tools;
 
-auto RunReqRep(string transport) -> void
+auto RunReqRep(string transport, const string& extraDeviceCmdArgs) -> void
 {
     size_t session{fair::mq::tools::UuidHash()};
     string ipcFile("/tmp/fmq_" + to_string(session) + "_data_" + transport);
@@ -38,6 +38,7 @@ auto RunReqRep(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=rep,method=bind,address=" << address;
         rep = execute(cmd.str(), "[REP]");
     });
@@ -52,6 +53,7 @@ auto RunReqRep(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=req,method=connect,address=" << address;
         req1 = execute(cmd.str(), "[REQ1]");
     });
@@ -66,6 +68,7 @@ auto RunReqRep(string transport) -> void
             << " --shm-segment-size 100000000"
             << " --session " << session
             << " --color false"
+            << extraDeviceCmdArgs
             << " --channel-config name=data,type=req,method=connect,address=" << address;
         req2 = execute(cmd.str(), "[REQ2]");
     });
@@ -82,12 +85,17 @@ auto RunReqRep(string transport) -> void
 
 TEST(ReqRep, zeromq)
 {
-    EXPECT_EXIT(RunReqRep("zeromq"), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
+    EXPECT_EXIT(RunReqRep("zeromq", ""), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
 }
 
 TEST(ReqRep, shmem)
 {
-    EXPECT_EXIT(RunReqRep("shmem"), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
+    EXPECT_EXIT(RunReqRep("shmem", ""), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
+}
+
+TEST(ReqRep, shmem_expanded_metadata)
+{
+    EXPECT_EXIT(RunReqRep("shmem", " --shm-metadata-msg-size 2048"), ::testing::ExitedWithCode(0), "REQ-REP test successfull");
 }
 
 } // namespace

test/tools/_network.cxx

@@ -1,28 +1,37 @@
 /********************************************************************************
- *    Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2018-2025 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 <gtest/gtest.h>
 #include <fairmq/tools/Network.h>
-
+#include <gtest/gtest.h>
 #include <string>
 
 namespace
 {
 
-using namespace std;
-using namespace fair::mq;
-
-TEST(Tools, Network)
+TEST(Tools, NetworkDefaultIP)
 {
-    string interface = fair::mq::tools::getDefaultRouteNetworkInterface();
+    auto const interface = fair::mq::tools::getDefaultRouteNetworkInterface();
     EXPECT_NE(interface, "");
-    string interfaceIP = fair::mq::tools::getInterfaceIP(interface);
+    auto const interfaceIP = fair::mq::tools::getInterfaceIP(interface);
     EXPECT_NE(interfaceIP, "");
 }
 
+TEST(Tools, NetworkIPv4Localhost)
+{
+    auto const ip = fair::mq::tools::getIpFromHostname("localhost");
+    EXPECT_FALSE(ip.empty());
+    EXPECT_EQ(ip, "127.0.0.1");
+}
+
+TEST(Tools, NetworkInvalidHostname)
+{
+    auto const ip = fair::mq::tools::getIpFromHostname("non.existent.domain.invalid");
+    EXPECT_TRUE(ip.empty());
+}
+
 } /* namespace */