diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-17 09:09:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-17 09:09:06 -0700 |
| commit | 22cf101597975f502d8d13181e30d4d6a69f6d42 (patch) | |
| tree | e4f9753fbe68b8f35a3bdb36b022d06ad32b1359 /src/core/lib | |
| parent | 71f0e5ecd101a3129c0d078717ac331503bf377e (diff) | |
| parent | 494a778ec6baf78413ca8a7052ca93d22bd20e73 (diff) | |
Merge github.com:grpc/grpc into pid++
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/security/credentials/oauth2/oauth2_credentials.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/support/cpu_linux.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index f52a424e36..7867105f56 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -262,7 +262,7 @@ static bool oauth2_token_fetcher_get_request_metadata( grpc_mdelem cached_access_token_md = GRPC_MDNULL; gpr_mu_lock(&c->mu); if (!GRPC_MDISNULL(c->access_token_md) && - (c->token_expiration + grpc_exec_ctx_now(exec_ctx) > refresh_threshold)) { + (c->token_expiration - grpc_exec_ctx_now(exec_ctx) > refresh_threshold)) { cached_access_token_md = GRPC_MDELEM_REF(c->access_token_md); } if (!GRPC_MDISNULL(cached_access_token_md)) { diff --git a/src/core/lib/support/cpu_linux.cc b/src/core/lib/support/cpu_linux.cc index 2280668442..53619caa5f 100644 --- a/src/core/lib/support/cpu_linux.cc +++ b/src/core/lib/support/cpu_linux.cc @@ -38,8 +38,9 @@ static int ncpus = 0; static void init_num_cpus() { /* This must be signed. sysconf returns -1 when the number cannot be determined */ + int cpu = sched_getcpu(); ncpus = (int)sysconf(_SC_NPROCESSORS_ONLN); - if (ncpus < 1) { + if (ncpus < 1 || cpu < 0) { gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1"); ncpus = 1; } @@ -56,6 +57,9 @@ unsigned gpr_cpu_current_cpu(void) { // sched_getcpu() is undefined on musl return 0; #else + if (gpr_cpu_num_cores() == 1) { + return 0; + } int cpu = sched_getcpu(); if (cpu < 0) { gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); |