Merge 602807e6f9 into 24e7a5b8d0

.github/actions/setup-deps/action.yml

@@ -1,52 +0,0 @@
-name: Install dependencies
-description: Setup spack and install dependencies
-
-inputs:
-  gcc:
-    description: 'GCC version to use'
-    required: true
-  env:
-    description: 'Spack environment name (latest, boost187)'
-    default: 'latest'
-  fresh:
-    description: 'Use fresh concretization'
-    default: 'false'
-
-runs:
-  using: composite
-  # Composite action step names are not shown in the UI (https://github.com/actions/runner/issues/1877),
-  # so we use ::group:: to make them visible.
-  steps:
-    - name: Setup spack
-      uses: spack/setup-spack@v2
-      with:
-        ref: v1.1.0
-        color: true
-        buildcache: true
-
-    - name: Find system compiler
-      shell: spack-bash {0}
-      run: |
-        echo "::group::Find system compiler"
-        spack compiler find
-        echo "::endgroup::"
-
-    - name: Install GCC
-      shell: spack-bash {0}
-      run: |
-        echo "::group::Install GCC"
-        spack install ${{ inputs.fresh == 'true' && '--fresh' || '' }} gcc@${{ inputs.gcc }} target=x86_64_v3
-        gcc_hash=$(spack find --json gcc@${{ inputs.gcc }} target=x86_64_v3 | jq -r 'sort_by(.version | split(".") | map(tonumber)) | last | .hash')
-        spack compiler find "$(spack location -i /$gcc_hash)"
-        echo "::endgroup::"
-
-    - name: Install dependencies
-      shell: spack-bash {0}
-      run: |
-        echo "::group::Install dependencies"
-        spack env create fairmq test/ci/spack-${{ inputs.env }}.yaml
-        spack -e fairmq add gcc@${{ inputs.gcc }}
-        spack -e fairmq config add "packages:all:require:'%gcc@${{ inputs.gcc }}'"
-        spack -e fairmq install --fail-fast ${{ inputs.fresh == 'true' && '--fresh' || '' }}
-        spack env activate --sh fairmq | grep '^export ' | sed 's/^export //;s/;$//' >> $GITHUB_ENV
-        echo "::endgroup::"

.github/workflows/buildcache.yml

@@ -1,74 +0,0 @@
-name: Spack Buildcache
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 3 * * 0'  # Weekly on Sunday at 3am UTC
-  push:
-    paths:
-      - 'test/ci/spack-*.yaml'
-      - '.github/workflows/buildcache.yml'
-      - '.github/actions/setup-deps/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    if: github.repository == 'FairRootGroup/FairMQ'
-    name: ${{ matrix.env }}-gcc-${{ matrix.gcc }}
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        gcc: ['12', '13', '14', '15']
-        env: ['latest']
-        include:
-          - gcc: '15'
-            env: 'boost187'
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup spack environment
-        uses: ./.github/actions/setup-deps
-        with:
-          gcc: ${{ matrix.gcc }}
-          env: ${{ matrix.env }}
-          fresh: 'true'
-
-      - name: Push to buildcache
-        if: ${{ !cancelled() }}
-        shell: spack-bash {0}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          spack -e fairmq mirror set --oci-username ${{ github.actor }} --oci-password-variable GITHUB_TOKEN ghcr-buildcache
-          spack -e fairmq buildcache push --unsigned ghcr-buildcache
-
-  update-index:
-    if: github.repository == 'FairRootGroup/FairMQ' && !cancelled()
-    needs: build
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    permissions:
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup spack
-        uses: spack/setup-spack@v2
-        with:
-          ref: v1.1.0
-          color: true
-
-      - name: Update buildcache index
-        shell: spack-bash {0}
-        run: |
-          spack env create fairmq test/ci/spack-latest.yaml
-          spack -e fairmq mirror set --oci-username ${{ github.actor }} --oci-password-variable GITHUB_TOKEN ghcr-buildcache
-          spack -e fairmq buildcache update-index ghcr-buildcache

.github/workflows/ci.yml

@@ -1,134 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [master, dev]
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    if: github.repository == 'FairRootGroup/FairMQ'
-    name: ${{ matrix.env }}-gcc-${{ matrix.gcc }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        gcc: ['12', '13', '14', '15']
-        env: ['latest']
-        include:
-          - gcc: '15'
-            env: 'boost187'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-tags: true
-          fetch-depth: 0
-
-      - name: Setup spack environment
-        uses: ./.github/actions/setup-deps
-        with:
-          gcc: ${{ matrix.gcc }}
-          env: ${{ matrix.env }}
-
-      - name: Configure and Build
-        uses: threeal/cmake-action@v2
-        with:
-          generator: Ninja
-          options: |
-            CMAKE_BUILD_TYPE=RelWithDebInfo
-            CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
-            BUILD_TESTING=ON
-
-      - name: Test
-        uses: threeal/ctest-action@v1
-        with:
-          test-dir: build
-
-      - name: Install
-        run: cmake --install build
-
-  sanitizers:
-    if: github.repository == 'FairRootGroup/FairMQ'
-    name: ${{ matrix.sanitizer.name }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer:
-          - name: asan+lsan+ubsan
-            options: |
-              ENABLE_SANITIZER_ADDRESS=ON
-              ENABLE_SANITIZER_LEAK=ON
-              ENABLE_SANITIZER_UNDEFINED_BEHAVIOUR=ON
-            cxx-flags: -O1 -fno-omit-frame-pointer
-          - name: tsan
-            options: ENABLE_SANITIZER_THREAD=ON
-            cxx-compiler: clang++
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-tags: true
-          fetch-depth: 0
-
-      - name: Setup spack environment
-        uses: ./.github/actions/setup-deps
-        with:
-          gcc: '14'
-
-      - name: Configure and Build
-        uses: threeal/cmake-action@v2
-        with:
-          generator: Ninja
-          cxx-compiler: ${{ matrix.sanitizer.cxx-compiler }}
-          cxx-flags: ${{ matrix.sanitizer.cxx-flags }}
-          options: |
-            CMAKE_BUILD_TYPE=Debug
-            BUILD_TESTING=ON
-            ${{ matrix.sanitizer.options }}
-
-      - name: Test
-        uses: threeal/ctest-action@v1
-        with:
-          test-dir: build
-
-  static-analysis:
-    if: github.repository == 'FairRootGroup/FairMQ'
-    name: static-analysis
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-tags: true
-          fetch-depth: 0
-
-      - name: Setup spack environment
-        uses: ./.github/actions/setup-deps
-        with:
-          gcc: '14'
-
-      - name: Configure and Build
-        uses: threeal/cmake-action@v2
-        with:
-          generator: Ninja
-          options: |
-            CMAKE_BUILD_TYPE=Debug
-            BUILD_TESTING=ON
-            RUN_STATIC_ANALYSIS=ON
-
-      - name: Check for warnings
-        run: |
-          if grep -q "warning:" build.log; then
-            echo "::warning::Static analysis found warnings"
-            grep "warning:" build.log
-            exit 1
-          fi

FairMQTest.cmake

@@ -0,0 +1,93 @@
+################################################################################
+# Copyright (C) 2021-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"                       #
+################################################################################
+
+cmake_host_system_information(RESULT fqdn QUERY FQDN)
+
+set(CTEST_SOURCE_DIRECTORY .)
+set(CTEST_BINARY_DIRECTORY build)
+set(CTEST_CMAKE_GENERATOR "Ninja")
+set(CTEST_USE_LAUNCHERS ON)
+set(CTEST_CONFIGURATION_TYPE "RelWithDebInfo")
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 102400)
+
+if(NOT NCPUS)
+  if(ENV{SLURM_CPUS_PER_TASK})
+    set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
+  else()
+    include(ProcessorCount)
+    ProcessorCount(NCPUS)
+    if(NCPUS EQUAL 0)
+      set(NCPUS 1)
+    endif()
+  endif()
+endif()
+
+if ("$ENV{CTEST_SITE}" STREQUAL "")
+  set(CTEST_SITE "${fqdn}")
+else()
+  set(CTEST_SITE $ENV{CTEST_SITE})
+endif()
+
+if ("$ENV{LABEL}" STREQUAL "")
+  set(CTEST_BUILD_NAME "build")
+else()
+  set(CTEST_BUILD_NAME $ENV{LABEL})
+endif()
+
+ctest_start(Continuous)
+
+list(APPEND options "-DDISABLE_COLOR=ON" "-DBUILD_EXAMPLES=ON" "-DBUILD_TESTING=ON")
+if(RUN_STATIC_ANALYSIS)
+  list(APPEND options "-DRUN_STATIC_ANALYSIS=ON")
+endif()
+if(CMAKE_BUILD_TYPE)
+  set(CTEST_CONFIGURATION_TYPE ${CMAKE_BUILD_TYPE})
+endif()
+if(ENABLE_SANITIZER_ADDRESS)
+  list(APPEND options "-DENABLE_SANITIZER_ADDRESS=ON")
+endif()
+if(ENABLE_SANITIZER_LEAK)
+  list(APPEND options "-DENABLE_SANITIZER_LEAK=ON")
+endif()
+if(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR)
+  list(APPEND options "-DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=ON")
+endif()
+if(ENABLE_SANITIZER_MEMORY)
+  list(APPEND options "-DENABLE_SANITIZER_MEMORY=ON")
+endif()
+if(ENABLE_SANITIZER_THREAD)
+  list(APPEND options "-DENABLE_SANITIZER_THREAD=ON")
+endif()
+if(CMAKE_CXX_COMPILER)
+  list(APPEND options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
+endif()
+if(CMAKE_CXX_FLAGS)
+  list(APPEND options "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
+endif()
+list(REMOVE_DUPLICATES options)
+list(JOIN options ";" optionsstr)
+ctest_configure(OPTIONS "${optionsstr}")
+
+ctest_submit()
+
+ctest_build(FLAGS "-j${NCPUS}")
+
+ctest_submit()
+
+if(NOT RUN_STATIC_ANALYSIS)
+  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}"
+             PARALLEL_LEVEL ${NCPUS}
+             SCHEDULE_RANDOM ON
+             RETURN_VALUE _ctest_test_ret_val)
+
+  ctest_submit()
+endif()
+
+if(_ctest_test_ret_val)
+  Message(FATAL_ERROR "Some tests failed.")
+endif()

Jenkinsfile

@@ -0,0 +1,118 @@
+#!groovy
+
+def jobMatrix(String type, List specs) {
+  def nodes = [:]
+  for (spec in specs) {
+    def job = ""
+    def selector = "slurm"
+    def os = ""
+    def ver = ""
+
+    if (type == 'build') {
+      job = "${spec.os}-${spec.ver}-${spec.arch}-${spec.compiler}"
+      if (spec.os =~ /^macos/) {
+        selector = "${spec.os}-${spec.ver}-${spec.arch}"
+      }
+      os = spec.os
+      ver = spec.ver
+    } else { // == 'check'
+      job = "${spec.name}"
+      os = 'fedora'
+      ver = '36'
+    }
+
+    def label = "${job}"
+    def extra = spec.extra
+
+    nodes[label] = {
+      node(selector) {
+        githubNotify(context: "${label}", description: 'Building ...', status: 'PENDING')
+        try {
+          deleteDir()
+          checkout scm
+
+          def jobscript = 'job.sh'
+          def ctestcmd = "ctest ${extra} -S FairMQTest.cmake -V --output-on-failure"
+          sh "echo \"set -e\" >> ${jobscript}"
+          sh "echo \"export LABEL=\\\"\${JOB_BASE_NAME} ${label}\\\"\" >> ${jobscript}"
+          if (selector =~ /^macos/) {
+            sh """\
+              echo \"${ctestcmd}\" >> ${jobscript}
+            """
+            sh "cat ${jobscript}"
+            sh "bash ${jobscript}"
+          } else { // selector == "slurm"
+            def imageurl = "oras://ghcr.io/fairrootgroup/fairmq-dev/${os}-${ver}-sif:latest"
+            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}
+              echo \"echo \\\"*** Job ID ...............: \\\${SLURM_JOB_ID}\\\"\" >> ${jobscript}
+              echo \"echo \\\"*** Compute node .........: \\\$(hostname -f)\\\"\" >> ${jobscript}
+              echo \"unset http_proxy\" >> ${jobscript}
+              echo \"unset HTTP_PROXY\" >> ${jobscript}
+              echo \"${containercmd}\" >> ${jobscript}
+            """
+            sh "cat ${jobscript}"
+            sh "test/ci/slurm-submit.sh \"FairMQ \${JOB_BASE_NAME} ${label}\" ${jobscript}"
+
+            if (job == "static-analyzers") {
+              recordIssues(enabledForFailure: true,
+                           tools: [gcc(pattern: 'build/Testing/Temporary/*.log')],
+                           filters: [excludeFile('extern/*'), excludeFile('usr/*')],
+                           skipBlames: true,
+                           skipPublishingChecks: true)
+            }
+          }
+
+          deleteDir()
+          githubNotify(context: "${label}", description: 'Success', status: 'SUCCESS')
+        } catch (e) {
+          deleteDir()
+          githubNotify(context: "${label}", description: 'Error', status: 'ERROR')
+          throw e
+        }
+      }
+    }
+  }
+  return nodes
+}
+
+pipeline{
+  agent none
+  stages {
+    stage("CI") {
+      steps{
+        script {
+          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: '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"
+
+          def checks = jobMatrix('check', [
+            [name: 'static-analyzers', extra: "${all_debug} -DRUN_STATIC_ANALYSIS=ON"],
+            [name: '{address,leak,ub}-sanitizers',
+             extra: "${all_debug} -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_LEAK=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOUR=ON -DCMAKE_CXX_FLAGS='-O1 -fno-omit-frame-pointer'"],
+            [name: 'thread-sanitizer', extra: "${all_debug} -DENABLE_SANITIZER_THREAD=ON -DCMAKE_CXX_COMPILER=clang++"],
+          ])
+
+          parallel(builds + checks)
+        }
+      }
+    }
+  }
+}

fairmq/CMakeLists.txt

@@ -55,6 +55,7 @@ if(BUILD_FAIRMQ)
     ProgOptionsFwd.h
     Properties.h
     PropertyOutput.h
+    SmallVector.h
     Socket.h
     StateMachine.h
     States.h
@@ -127,6 +128,7 @@ if(BUILD_FAIRMQ)
     PluginServices.cxx
     ProgOptions.cxx
     Properties.cxx
+    SmallVector.cxx
     StateMachine.cxx
     States.cxx
     SuboptParser.cxx

fairmq/MemoryResources.h

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

fairmq/Parts.h

@@ -11,6 +11,7 @@
 
 #include <algorithm>          // std::move
 #include <fairmq/Message.h>   // fair::mq::MessagePtr
+#include <fairmq/SmallVector.h>
 #include <iterator>           // std::back_inserter
 #include <utility>            // std::move, std::forward
 #include <vector>             // std::vector
@@ -21,7 +22,7 @@ namespace fair::mq {
 /// Message, used for sending multi-part messages
 struct Parts
 {
-    using container = std::vector<MessagePtr>;
+    using container = fair::llvm_copy::SmallVector<MessagePtr, 8>;
     using size_type = container::size_type;
     using reference = container::reference;
     using const_reference = container::const_reference;
@@ -71,9 +72,9 @@ struct Parts
     // const_reference operator[](size_type index) const { return fParts[index]; }
 
     [[deprecated("Redundant, dereference at call site e.g. '*(parts.At(index))' instead.")]]
-    Message& AtRef(size_type index) { return *(fParts.at(index)); }
+    Message& AtRef(size_type index) { return *(fParts[index]); }
-    reference At(size_type index) { return fParts.at(index); }
+    reference At(size_type index) { return fParts[index]; }
-    const_reference At(size_type index) const { return fParts.at(index); }
+    const_reference At(size_type index) const { return fParts[index]; }
 
     size_type Size() const noexcept { return fParts.size(); }
     bool Empty() const noexcept { return fParts.empty(); }
@@ -82,10 +83,10 @@ struct Parts
     // range access
     iterator begin() noexcept { return fParts.begin(); }
     const_iterator begin() const noexcept { return fParts.begin(); }
-    const_iterator cbegin() const noexcept { return fParts.cbegin(); }
+    const_iterator cbegin() const noexcept { return fParts.begin(); }
     iterator end() noexcept { return fParts.end(); }
     const_iterator end() const noexcept { return fParts.end(); }
-    const_iterator cend() const noexcept { return fParts.cend(); }
+    const_iterator cend() const noexcept { return fParts.end(); }
 
     container fParts{};
 };

fairmq/SmallVector.cxx

@@ -0,0 +1,120 @@
+//===- llvm/ADT/SmallVector.cpp - 'Normally small' vectors ----------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the SmallVector class.
+//
+//===----------------------------------------------------------------------===//
+ 
+#include <SmallVector.h>
+//#include "llvm/Support/MemAlloc.h"
+#include <cstdint>
+using namespace fair::llvm_copy;
+ 
+// Check that no bytes are wasted and everything is well-aligned.
+namespace {
+struct Struct16B {
+  alignas(16) void *X;
+};
+struct Struct32B {
+  alignas(32) void *X;
+};
+}
+static_assert(sizeof(SmallVector<void *, 0>) ==
+                  sizeof(unsigned) * 2 + sizeof(void *),
+              "wasted space in SmallVector size 0");
+static_assert(alignof(SmallVector<Struct16B, 0>) >= alignof(Struct16B),
+              "wrong alignment for 16-byte aligned T");
+static_assert(alignof(SmallVector<Struct32B, 0>) >= alignof(Struct32B),
+              "wrong alignment for 32-byte aligned T");
+static_assert(sizeof(SmallVector<Struct16B, 0>) >= alignof(Struct16B),
+              "missing padding for 16-byte aligned T");
+static_assert(sizeof(SmallVector<Struct32B, 0>) >= alignof(Struct32B),
+              "missing padding for 32-byte aligned T");
+static_assert(sizeof(SmallVector<void *, 1>) ==
+                  sizeof(unsigned) * 2 + sizeof(void *) * 2,
+              "wasted space in SmallVector size 1");
+ 
+static_assert(sizeof(SmallVector<char, 0>) ==
+                  sizeof(void *) * 2 + sizeof(void *),
+              "1 byte elements have word-sized type for size and capacity");
+ 
+// Note: Moving this function into the header may cause performance regression.
+template <class Size_T>
+static size_t getNewCapacity(size_t MinSize, size_t , size_t OldCapacity) {
+  constexpr size_t MaxSize = std::numeric_limits<Size_T>::max();
+ 
+  // In theory 2*capacity can overflow if the capacity is 64 bit, but the
+  // original capacity would never be large enough for this to be a problem.
+  size_t NewCapacity = 2 * OldCapacity + 1; // Always grow.
+  return std::clamp(NewCapacity, MinSize, MaxSize);
+}
+ 
+template <class Size_T>
+void *SmallVectorBase<Size_T>::replaceAllocation(void *NewElts, size_t TSize,
+                                                 size_t NewCapacity,
+                                                 size_t VSize) {
+  void *NewEltsReplace = malloc(NewCapacity * TSize);
+  if (VSize)
+    memcpy(NewEltsReplace, NewElts, VSize * TSize);
+  free(NewElts);
+  return NewEltsReplace;
+}
+ 
+// Note: Moving this function into the header may cause performance regression.
+template <class Size_T>
+void *SmallVectorBase<Size_T>::mallocForGrow(void *FirstEl, size_t MinSize,
+                                             size_t TSize,
+                                             size_t &NewCapacity) {
+  NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
+  // Even if capacity is not 0 now, if the vector was originally created with
+  // capacity 0, it's possible for the malloc to return FirstEl.
+  void *NewElts = malloc(NewCapacity * TSize);
+  if (NewElts == FirstEl)
+    NewElts = replaceAllocation(NewElts, TSize, NewCapacity);
+  return NewElts;
+}
+ 
+// Note: Moving this function into the header may cause performance regression.
+template <class Size_T>
+void SmallVectorBase<Size_T>::grow_pod(void *FirstEl, size_t MinSize,
+                                       size_t TSize) {
+  size_t NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
+  void *NewElts;
+  if (BeginX == FirstEl) {
+    NewElts = malloc(NewCapacity * TSize);
+    if (NewElts == FirstEl)
+      NewElts = replaceAllocation(NewElts, TSize, NewCapacity);
+ 
+    // Copy the elements over.  No need to run dtors on PODs.
+    memcpy(NewElts, this->BeginX, size() * TSize);
+  } else {
+    // If this wasn't grown from the inline copy, grow the allocated space.
+    NewElts = realloc(this->BeginX, NewCapacity * TSize);
+    if (NewElts == FirstEl)
+      NewElts = replaceAllocation(NewElts, TSize, NewCapacity, size());
+  }
+ 
+  this->set_allocation_range(NewElts, NewCapacity);
+}
+ 
+template class fair::llvm_copy::SmallVectorBase<uint32_t>;
+ 
+// Disable the uint64_t instantiation for 32-bit builds.
+// Both uint32_t and uint64_t instantiations are needed for 64-bit builds.
+// This instantiation will never be used in 32-bit builds, and will cause
+// warnings when sizeof(Size_T) > sizeof(size_t).
+#if SIZE_MAX > UINT32_MAX
+template class fair::llvm_copy::SmallVectorBase<uint64_t>;
+ 
+// Assertions to ensure this #if stays in sync with SmallVectorSizeType.
+static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint64_t),
+              "Expected SmallVectorBase<uint64_t> variant to be in use.");
+#else
+static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint32_t),
+              "Expected SmallVectorBase<uint32_t> variant to be in use.");
+#endif

test/ci/Containerfile.fedora

@@ -0,0 +1,19 @@
+ARG VERSION=latest
+FROM fedora:${VERSION}
+ARG VERSION=latest
+LABEL org.opencontainers.image.source "https://github.com/FairRootGroup/FairMQ"
+LABEL org.opencontainers.image.description "FairMQ development environment"
+RUN dnf -y update
+# https://git.gsi.de/SDE/packages/builder
+RUN dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-$VERSION-x86_64/fairsoft-release-dev.rpm
+RUN dnf -y install clang cli11-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra
+RUN dnf -y builddep fairmq
+RUN dnf -y clean all
+
+# buildah build --build-arg "VERSION=36" -t "ghcr.io/fairrootgroup/fairmq-dev/fedora-36:latest" -f test/ci/Containerfile.fedora .
+# echo $GH_PAT | buildah login -u dennisklein --password-stdin ghcr.io
+# buildah push ghcr.io/fairrootgroup/fairmq-dev/fedora-36:latest
+
+# apptainer pull docker://ghcr.io/fairrootgroup/fairmq-dev/fedora-36:latest
+# echo $GH_PAT | apptainer remote login -u dennisklein --password-stdin oras://ghcr.io
+# apptainer push ./fedora-36_latest.sif oras://ghcr.io/fairrootgroup/fairmq-dev/fedora-36-sif:latest

test/ci/Containerfile.ubuntu

@@ -0,0 +1,36 @@
+ARG VERSION=latest
+FROM ubuntu:${VERSION}
+ARG VERSION=latest
+LABEL org.opencontainers.image.source "https://github.com/FairRootGroup/FairMQ"
+LABEL org.opencontainers.image.description "FairMQ development environment"
+
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y install ca-certificates patch cmake git libboost-dev libboost-log-dev libboost-system-dev libboost-regex-dev libboost-filesystem-dev libboost-container-dev libboost-thread-dev libboost-date-time-dev libboost-program-options-dev g++ libfmt-dev ninja-build wget libczmq-dev libxml2-utils libfabric-dev libfabric-bin pkg-config
+RUN apt-get -y clean
+
+RUN cd /tmp
+
+RUN git clone -b v1.19.2 --recurse-submodules https://github.com/FairRootGroup/asio
+RUN cmake -GNinja -S asio -B asio_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+RUN cmake --build asio_build --target install
+RUN rm -rf asio asio_build
+
+RUN git clone -b v1.0.0 https://github.com/FairRootGroup/FairCMakeModules
+RUN cmake -GNinja -S FairCMakeModules -B FairCMakeModules_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+RUN cmake --build FairCMakeModules_build --target install
+RUN rm -rf FairCMakeModules FairCMakeModules_build
+
+RUN git clone -b v1.11.0 https://github.com/FairRootGroup/FairLogger
+RUN cmake -GNinja -S FairLogger -B FairLogger_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_EXTERNAL_FMT=ON
+RUN cmake --build FairLogger_build --target install
+RUN rm -rf FairLogger FairLogger_build
+
+# buildah build --build-arg "VERSION=22.04" -t "ghcr.io/fairrootgroup/fairmq-dev/ubuntu-22.04:latest" -f test/ci/Containerfile.ubuntu .
+# echo $GH_PAT | buildah login -u dennisklein --password-stdin ghcr.io
+# buildah push ghcr.io/fairrootgroup/fairmq-dev/ubuntu-22.04:latest
+
+# apptainer pull docker://ghcr.io/fairrootgroup/fairmq-dev/ubuntu-22.04:latest
+# echo $GH_PAT | apptainer remote login -u dennisklein --password-stdin oras://ghcr.io
+# apptainer push ./ubuntu-22.04_latest.sif oras://ghcr.io/fairrootgroup/fairmq-dev/ubuntu-22.04-sif:latest

test/ci/slurm-submit.sh

@@ -0,0 +1,42 @@
+#! /bin/bash
+
+label="$1"
+jobsh="$2"
+
+if [ -z "$ALFACI_SLURM_CPUS" ]
+then
+	ALFACI_SLURM_CPUS=20
+fi
+CPUS_PER_JOB=$(($ALFACI_SLURM_CPUS / 2))
+if [ -z "$ALFACI_SLURM_EXTRA_OPTS" ]
+then
+	ALFACI_SLURM_EXTRA_OPTS="--hint=compute_bound"
+fi
+if [ -z "$ALFACI_SLURM_TIMEOUT" ]
+then
+	ALFACI_SLURM_TIMEOUT=30
+fi
+if [ -z "$ALFACI_SLURM_QUEUE" ]
+then
+	ALFACI_SLURM_QUEUE=main
+fi
+
+echo "*** Slurm request options :"
+echo "***   Working directory ..: $PWD"
+echo "***   Queue ..............: $ALFACI_SLURM_QUEUE"
+echo "***   CPUs ...............: $ALFACI_SLURM_CPUS"
+echo "***   Wall Time ..........: $ALFACI_SLURM_TIMEOUT min"
+echo "***   Job Name ...........: ${label}"
+echo "***   Extra Options ......: ${ALFACI_SLURM_EXTRA_OPTS}"
+echo "*** Submitting job at ....: $(date -R)"
+(
+	set -x
+	srun -p $ALFACI_SLURM_QUEUE -c $CPUS_PER_JOB -n 1 \
+		-t $ALFACI_SLURM_TIMEOUT \
+		--job-name="${label}" \
+		${ALFACI_SLURM_EXTRA_OPTS} \
+		bash "${jobsh}"
+)
+retval=$?
+echo "*** Exit Code ............: $retval"
+exit "$retval"

test/ci/spack-boost187.yaml

@@ -1,21 +0,0 @@
-spack:
-  specs:
-    - "fairlogger@2.2.0 ^fmt@:11"
-    - "boost@1.87 +container +program_options +filesystem +date_time +regex"
-    - "libzmq@4.1.4:"
-    - ninja
-    - "cmake@3.15:"
-
-  concretizer:
-    targets:
-      granularity: generic
-
-  packages:
-    all:
-      require:
-        - target=x86_64_v3
-
-  mirrors:
-    ghcr-buildcache:
-      url: oci://ghcr.io/fairrootgroup/fairmq-spack-buildcache
-      signed: false

test/ci/spack-latest.yaml

@@ -1,21 +0,0 @@
-spack:
-  specs:
-    - "fairlogger@2.2.0 ^fmt@:11"
-    - "boost@1.66: +container +program_options +filesystem +date_time +regex"
-    - "libzmq@4.1.4:"
-    - ninja
-    - "cmake@3.15:"
-
-  concretizer:
-    targets:
-      granularity: generic
-
-  packages:
-    all:
-      require:
-        - target=x86_64_v3
-
-  mirrors:
-    ghcr-buildcache:
-      url: oci://ghcr.io/fairrootgroup/fairmq-spack-buildcache
-      signed: false

test/memory_resources/_memory_resources.cxx

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