Merge 52a2e58 into 13546f7

.circleci/config.yml

@@ -21,7 +21,7 @@ setup_arm64_machine: &setup_arm64_machine
 
 docker_default: &docker_default
   docker:
-    - image: pikaorg/pika-ci-base:22
+    - image: pikaorg/pika-ci-base:23
 
 defaults: &defaults
   <<: *working_dir_default
@@ -470,6 +470,8 @@ jobs:
           name: Installing
           command: |
               ./bin/hello_world --pika:bind=none
+              ./bin/hello_world --pika:bind=none --pika:print-bind
+              hwloc-bind 0x3 ./bin/hello_world --pika:bind=none --pika:print-bind
               ninja -j2 install
           working_directory: /pika/build
           when: always

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "docker.io/pikaorg/pika-ci-base:22",
+  "image": "docker.io/pikaorg/pika-ci-base:23",
   "features": {},
   "onCreateCommand": "cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug -DPIKA_WITH_MALLOC=system -DPIKA_WITH_EXAMPLES=ON -DPIKA_WITH_TESTS=ON -DPIKA_WITH_TESTS_EXAMPLES=ON -DPIKA_WITH_TESTS_HEADERS=ON -DPIKA_WITH_TESTS_MAX_THREADS=2 -DPIKA_WITH_COMPILER_WARNINGS=ON -DPIKA_WITH_COMPILER_WARNINGS_AS_ERRORS=ON && cmake --build build --target pika",
   "extensions": [

.github/workflows/linux_asan_ubsan_lsan.yml

@@ -21,7 +21,7 @@ jobs:
     name: github/linux/sanitizers/address-undefined-leak
     runs-on: ubuntu-latest
     container:
-      image: pikaorg/pika-ci-base:22
+      image: pikaorg/pika-ci-base:23
       # --privileged is enabled for sysctl further down.
       options: --privileged
 

.github/workflows/linux_coverage.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     name: github/linux/coverage
     runs-on: ubuntu-latest
-    container: pikaorg/pika-ci-base:22
+    container: pikaorg/pika-ci-base:23
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_debug.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     name: github/linux/debug/fast
     runs-on: ubuntu-latest
-    container: pikaorg/pika-ci-base:22
+    container: pikaorg/pika-ci-base:23
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_release_fetchcontent.yml

@@ -20,7 +20,7 @@ jobs:
     name: github/linux/fetchcontent/fast
     if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
-    container: pikaorg/pika-ci-base:22
+    container: pikaorg/pika-ci-base:23
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_tracy.yml

@@ -20,7 +20,7 @@ jobs:
     name: github/linux/tracy/fast
     if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
-    container: pikaorg/pika-ci-base:22
+    container: pikaorg/pika-ci-base:23
 
     steps:
       - name: Check out Tracy

.github/workflows/linux_tsan.yml

@@ -21,7 +21,7 @@ jobs:
     name: github/linux/sanitizers/thread
     runs-on: ubuntu-latest
     container:
-      image: pikaorg/pika-ci-base:22
+      image: pikaorg/pika-ci-base:23
       # --privileged is enabled for sysctl further down.
       options: --privileged
 

.github/workflows/linux_valgrind.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     name: github/linux/valgrind
     runs-on: ubuntu-latest
-    container: pikaorg/pika-ci-base:22
+    container: pikaorg/pika-ci-base:23
 
     strategy:
       matrix:

.gitlab/includes/dockerhub_pipeline.yml

@@ -12,7 +12,7 @@ clang14_debug_build_pika-ci-image:
   extends: .container-builder
   needs: []   # To clear the dotenv artifacts
   variables:
-    BASE_IMAGE: docker.io/pikaorg/pika-ci-base:22
+    BASE_IMAGE: docker.io/pikaorg/pika-ci-base:23
     DOCKERFILE: .gitlab/docker/Dockerfile.dockerhub_build
     DOCKER_BUILD_ARGS: '["BASE_IMAGE","BUILD_DIR","SOURCE_DIR"]'
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/pika-debug-cpu-clang14:$CI_COMMIT_SHORT_SHA

libs/pika/thread_pools/include/pika/thread_pools/scheduled_thread_pool_impl.hpp

@@ -394,26 +394,21 @@ namespace pika::threads::detail {
         topology const& topo = get_topology();
 
         // Set the affinity for the current thread.
-        threads::detail::mask_cref_type mask = affinity_data_.get_pu_mask(topo, global_thread_num);
+        threads::detail::mask_type mask = affinity_data_.get_pu_mask(topo, global_thread_num);
+
+        // If the mask is empty (signaling no binding) we set a full mask anyway, because the whole
+        // process may have a non-full mask set which is inherited by this thread.
+        if (!any(mask)) { mask = ~mask; }
 
         if (LPIKA_ENABLED(debug)) topo.write_to_log();
 
         error_code ec(throwmode::lightweight);
-        if (any(mask))
-        {
-            topo.set_thread_affinity_mask(mask, ec);
-            if (ec)
-            {
-                LTM_(warning).format(
-                    "thread_func: {} setting thread affinity on OS thread {} failed with: {}",
-                    id_.name(), global_thread_num, ec.get_message());
-            }
-        }
-        else
+        topo.set_thread_affinity_mask(mask, ec);
+        if (ec)
         {
-            LTM_(debug).format(
-                "thread_func: {} setting thread affinity on OS thread {} was explicitly disabled.",
-                id_.name(), global_thread_num);
+            LTM_(warning).format(
+                "thread_func: {} setting thread affinity on OS thread {} failed with: {}",
+                id_.name(), global_thread_num, ec.get_message());
         }
 
         // Setting priority of worker threads to a lower priority, this