diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-05-05 10:27:17 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-05-05 10:27:17 -0700 |
| commit | fde16afefa41510c6dc06afd88bfd6c3002467b5 (patch) | |
| tree | 143deed3716f5b13f9340d7f57de27379a255e37 /src/core/lib/support/cpu_linux.c | |
| parent | cc7e17b2d6d015d88b94c0d3b089a65e0450614b (diff) | |
| parent | 6815e414a4dbca4d0d4dd62b5ec3c6faa60c9bb9 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into serialization-refactor
Diffstat (limited to 'src/core/lib/support/cpu_linux.c')
| -rw-r--r-- | src/core/lib/support/cpu_linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/support/cpu_linux.c b/src/core/lib/support/cpu_linux.c index 1e50f59823..b826dde160 100644 --- a/src/core/lib/support/cpu_linux.c +++ b/src/core/lib/support/cpu_linux.c @@ -67,16 +67,16 @@ unsigned gpr_cpu_num_cores(void) { } unsigned gpr_cpu_current_cpu(void) { -#ifdef __GLIBC__ +#ifdef GPR_MUSL_LIBC_COMPAT + // sched_getcpu() is undefined on musl + return 0; +#else int cpu = sched_getcpu(); if (cpu < 0) { gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); return 0; } return (unsigned)cpu; -#else - // sched_getcpu() is undefined on musl - return 0; #endif } |