Mesa (main): util: Change order of PIPE_OS_UNIX code in util_cpu_detect_once

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1786e847d94bc5162a8013c91c0bce4d64f0087e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1786e847d94bc5162a8013c91c0bce4d64f0087e

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Jun  8 14:40:19 2021 -0700

util: Change order of PIPE_OS_UNIX code in util_cpu_detect_once

This makes it easier to add preferred vs. fallback paths later.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11228>

---

 src/util/u_cpu_detect.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
index ea066b96d8a..b60ce165702 100644
--- a/src/util/u_cpu_detect.c
+++ b/src/util/u_cpu_detect.c
@@ -564,11 +564,12 @@ util_cpu_detect_once(void)
       GetSystemInfo(&system_info);
       util_cpu_caps.nr_cpus = MAX2(1, system_info.dwNumberOfProcessors);
    }
-#elif defined(PIPE_OS_UNIX) && defined(_SC_NPROCESSORS_ONLN)
+#elif defined(PIPE_OS_UNIX)
+#  if defined(_SC_NPROCESSORS_ONLN)
    util_cpu_caps.nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
    if (util_cpu_caps.nr_cpus == ~0)
       util_cpu_caps.nr_cpus = 1;
-#elif defined(PIPE_OS_BSD)
+#  elif defined(PIPE_OS_BSD)
    {
       int mib[2], ncpu;
       int len;
@@ -580,9 +581,11 @@ util_cpu_detect_once(void)
       sysctl(mib, 2, &ncpu, &len, NULL, 0);
       util_cpu_caps.nr_cpus = ncpu;
    }
-#else
-   util_cpu_caps.nr_cpus = 1;
-#endif
+#  endif
+#endif /* defined(PIPE_OS_UNIX) */
+
+   if (util_cpu_caps.nr_cpus == 0)
+      util_cpu_caps.nr_cpus = 1;
 
    util_cpu_caps.num_cpu_mask_bits = align(util_cpu_caps.nr_cpus, 32);