diff options
| author | Reid Kleckner <rnk@google.com> | 2017-11-08 01:33:15 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-11-08 01:33:15 +0000 |
| commit | 3806f9ea105f0e9554d87862d81caeadb81d44f6 (patch) | |
| tree | ef7f32f4eb63c256d6fed8307dfded142465578d /lib/sanitizer_common/sanitizer_linux_libcdep.cc | |
| parent | 644af7779f086cb428b7b76da5509348e3a2358f (diff) | |
Revert "[scudo] Make getNumberOfCPUs Fuchsia compliant"
This reverts commit r317604.
Android doesn't have cpu_set_t.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317655 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_linux_libcdep.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 495fa255d..0dc437585 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -37,14 +37,9 @@ #if SANITIZER_FREEBSD #include <pthread_np.h> #include <osreldate.h> -#include <sys/sysctl.h> #define pthread_getattr_np pthread_attr_get_np #endif -#if SANITIZER_NETBSD -#include <sys/sysctl.h> -#endif - #if SANITIZER_LINUX #include <sys/prctl.h> #endif @@ -543,23 +538,6 @@ uptr GetRSS() { return rss * GetPageSizeCached(); } -// sysconf(_SC_NPROCESSORS_{CONF,ONLN}) cannot be used as they allocate memory. -u32 GetNumberOfCPUs() { -#if SANITIZER_FREEBSD || SANITIZER_NETBSD - u32 ncpu; - int req[2]; - size_t len = sizeof(ncpu); - req[0] = CTL_HW; - req[1] = HW_NCPU; - CHECK_EQ(sysctl(req, 2, &ncpu, &len, NULL, 0), 0); - return ncpu; -#else - cpu_set_t CPUs; - CHECK_EQ(sched_getaffinity(0, sizeof(cpu_set_t), &CPUs), 0); - return CPU_COUNT(&CPUs); -#endif -} - // 64-bit Android targets don't provide the deprecated __android_log_write. // Starting with the L release, syslog() works and is preferable to // __android_log_write. |