Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13773 from ncteisen/tsan

Browse Source 
Fix tsan in bad_client tests
pull/13776/head
Noah Eisen 7 years ago committed by GitHub
parent 5d37e61d06 430f745e6b
commit ba6ca24a18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/core/lib/iomgr/resource_quota.cc

2
src/core/lib/iomgr/resource_quota.cc
Unescape View File

@ -507,6 +507,7 @@ static void ru_shutdown(void* ru, grpc_error* error) {
gpr_log(GPR_DEBUG, "RU shutdown %p", ru); gpr_log(GPR_DEBUG, "RU shutdown %p", ru);
} }
grpc_resource_user* resource_user = (grpc_resource_user*)ru; grpc_resource_user* resource_user = (grpc_resource_user*)ru;
gpr_mu_lock(&resource_user->mu);
GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED); GRPC_CLOSURE_SCHED(resource_user->reclaimers[0], GRPC_ERROR_CANCELLED);
GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED); GRPC_CLOSURE_SCHED(resource_user->reclaimers[1], GRPC_ERROR_CANCELLED);
resource_user->reclaimers[0] = nullptr; resource_user->reclaimers[0] = nullptr;
@ -516,6 +517,7 @@ static void ru_shutdown(void* ru, grpc_error* error) {
if (resource_user->allocating) { if (resource_user->allocating) {
rq_step_sched(resource_user->resource_quota); rq_step_sched(resource_user->resource_quota);
} }
gpr_mu_unlock(&resource_user->mu);
} }
static void ru_destroy(void* ru, grpc_error* error) { static void ru_destroy(void* ru, grpc_error* error) {

Write Preview
Loading…
Cancel
Save