diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-05-18 15:03:00 -0700 |
|---|---|---|
| committer | Russ Keldorph <russ.keldorph@microsoft.com> | 2018-05-31 15:25:05 -0700 |
| commit | 0ea5fc4456a859a1009b05d0949d3d878b383e9d (patch) | |
| tree | 36bee11bfd35852be846a6b1b0bfc425aff601b1 /src/pal/src/misc/sysinfo.cpp | |
| parent | 9550fc87a8ace6347e02fb9d103185fe191dafa9 (diff) | |
| download | coreclr-0ea5fc4456a859a1009b05d0949d3d878b383e9d.tar.gz coreclr-0ea5fc4456a859a1009b05d0949d3d878b383e9d.tar.bz2 coreclr-0ea5fc4456a859a1009b05d0949d3d878b383e9d.zip | |
Use sysconf(_SC_NPROCESSORS_CONF) instead of sysconf(_SC_NPROCESSORS_ONLN) in PAL and GC on ARM and ARM64
Diffstat (limited to 'src/pal/src/misc/sysinfo.cpp')
| -rw-r--r-- | src/pal/src/misc/sysinfo.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/pal/src/misc/sysinfo.cpp b/src/pal/src/misc/sysinfo.cpp index bc55dadd4b..495cc8bb94 100644 --- a/src/pal/src/misc/sysinfo.cpp +++ b/src/pal/src/misc/sysinfo.cpp @@ -103,10 +103,18 @@ PAL_GetLogicalCpuCountFromOS() int nrcpus = 0; #if HAVE_SYSCONF - nrcpus = sysconf(_SC_NPROCESSORS_ONLN); + +#if defined(_ARM_) || defined(_ARM64_) +#define SYSCONF_GET_NUMPROCS _SC_NPROCESSORS_CONF +#define SYSCONF_GET_NUMPROCS_NAME "_SC_NPROCESSORS_CONF" +#else +#define SYSCONF_GET_NUMPROCS _SC_NPROCESSORS_ONLN +#define SYSCONF_GET_NUMPROCS_NAME "_SC_NPROCESSORS_ONLN" +#endif + nrcpus = sysconf(SYSCONF_GET_NUMPROCS); if (nrcpus < 1) { - ASSERT("sysconf failed for _SC_NPROCESSORS_ONLN (%d)\n", errno); + ASSERT("sysconf failed for %s (%d)\n", SYSCONF_GET_NUMPROCS_NAME, errno); } #elif HAVE_SYSCTL int rc; |