From 539a40ff8efc391b7e6a55f6d3641c34318f9af2 Mon Sep 17 00:00:00 2001 From: Philip Marshall Date: Tue, 23 Jan 2024 09:49:15 -0800 Subject: [PATCH] Implement Dave's feedback on styling and comments --- configure.ac | 8 ++++---- src/init.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 236934f7..b3ef9ce0 100755 --- a/configure.ac +++ b/configure.ac @@ -78,13 +78,13 @@ AC_ARG_ENABLE([completion-polling], AC_ARG_ENABLE([hwloc-enforce-single-socket], [AC_HELP_STRING([--enable-hwloc-enforce-single-socket], - [Repin process if assigned affinity to cores across multiple sockets (default:disabled)])]) -AS_IF([test "$enable_hwloc_enforce_single_socket" = "yes"], [AC_DEFINE([HWLOC_ENFORCE_SINGLE_SOCKET], [1], [Re-assign CPU affinity on processes with affinity to cores on multiple sockets])]) + [Repin process to ensure it has affinity to cores within a single socket (default:disabled)])]) +AS_IF([test "$enable_hwloc_enforce_single_socket" = "yes"], [AC_DEFINE([HWLOC_ENFORCE_SINGLE_SOCKET], [1], [Repin process to ensure it has affinity to cores within a single socket])]) AC_ARG_ENABLE([hwloc-enforce-single-numa-node], [AC_HELP_STRING([--enable-hwloc-enforce-single-numa-node], - [Repin process if assigned affinity to cores across multiple NUMA nodes (default:disabled)])]) -AS_IF([test "$enable_hwloc_enforce_single_numa_node" = "yes"], [AC_DEFINE([HWLOC_ENFORCE_SINGLE_NUMA_NODE], [1], [Re-assign CPU affinity on processes with affinity to cores on multiple NUMA nodes])]) + [Repin process to ensure it has affinity to cores within a single NUMA node (default:disabled)])]) +AS_IF([test "$enable_hwloc_enforce_single_numa_node" = "yes"], [AC_DEFINE([HWLOC_ENFORCE_SINGLE_NUMA_NODE], [1], [Repin process to ensure it has affinity to cores within a single NUMA node])]) AC_ARG_ENABLE([manual-progress], [AC_HELP_STRING([--enable-manual-progress], diff --git a/src/init.c b/src/init.c index d6470367..3d749223 100644 --- a/src/init.c +++ b/src/init.c @@ -390,7 +390,7 @@ shmem_internal_heap_postinit(void) } ret = hwloc_topology_set_io_types_filter(shmem_internal_topology, HWLOC_TYPE_FILTER_KEEP_ALL); - if (ret < 0) { + if (ret < 0) { RETURN_ERROR_MSG("hwloc_topology_set_io_types_filter failed (%s)\n", strerror(errno)); } @@ -398,7 +398,7 @@ shmem_internal_heap_postinit(void) if (ret < 0) { RETURN_ERROR_MSG("hwloc_topology_load failed (%s)\n", strerror(errno)); } -#if defined HWLOC_ENFORCE_SINGLE_SOCKET || defined HWLOC_ENFORCE_SINGLE_NUMA_NODE +#if defined(HWLOC_ENFORCE_SINGLE_SOCKET) || defined(HWLOC_ENFORCE_SINGLE_NUMA_NODE) hwloc_bitmap_t bindset = hwloc_bitmap_alloc(); hwloc_bitmap_t bindset_all = hwloc_bitmap_alloc(); hwloc_bitmap_t bindset_covering_obj = hwloc_bitmap_alloc();