diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-23 09:50:27 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-23 09:50:27 -0800 |
| commit | 266f66a67c98bf4886f8d4f2916d881ae4d68149 (patch) | |
| tree | 39d69cc241c332abff1791e76b9aefdaba74dcee /src/core/lib/support | |
| parent | 47de64c70048867f0dbc410860aeb4d49cc395b6 (diff) | |
| parent | 1119a62bf5d10f93c03782f73bdcd97c640aa6f5 (diff) | |
Merge github.com:grpc/grpc into zalloc
Diffstat (limited to 'src/core/lib/support')
| -rw-r--r-- | src/core/lib/support/sync_posix.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/lib/support/sync_posix.c b/src/core/lib/support/sync_posix.c index de0f0484b5..16e7d6e12a 100644 --- a/src/core/lib/support/sync_posix.c +++ b/src/core/lib/support/sync_posix.c @@ -42,8 +42,10 @@ #include <time.h> #include "src/core/lib/profiling/timers.h" -#ifdef GPR_MU_COUNTERS -gpr_atm grpc_mu_locks = 0; +#ifdef GPR_LOW_LEVEL_COUNTERS +gpr_atm gpr_mu_locks = 0; +gpr_atm gpr_counter_atm_cas = 0; +gpr_atm gpr_counter_atm_add = 0; #endif void gpr_mu_init(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_init(mu, NULL) == 0); } @@ -51,8 +53,8 @@ void gpr_mu_init(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_init(mu, NULL) == 0); } void gpr_mu_destroy(gpr_mu* mu) { GPR_ASSERT(pthread_mutex_destroy(mu) == 0); } void gpr_mu_lock(gpr_mu* mu) { -#ifdef GPR_MU_COUNTERS - gpr_atm_no_barrier_fetch_add(&grpc_mu_locks, 1); +#ifdef GPR_LOW_LEVEL_COUNTERS + GPR_ATM_INC_COUNTER(gpr_mu_locks); #endif GPR_TIMER_BEGIN("gpr_mu_lock", 0); GPR_ASSERT(pthread_mutex_lock(mu) == 0); |