diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-05 13:14:09 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-05 13:14:09 -0800 |
| commit | 3a35f7ecbcef2f762a86a5874ecfc680bb870aaa (patch) | |
| tree | 3e1c351d70081891ec619477d8f24ef661dd8267 /src/core/ext/resolver/dns/native | |
| parent | 1f5fad5ce387dd38ca9c6357233150a8ad765ac5 (diff) | |
| parent | 4e148d5572e0ba6d83fc4d212637a8337299a2cb (diff) | |
Merge pull request #8705 from ctiller/slice_with_exec_ctx
Fix slice/exec_ctx interactions
Diffstat (limited to 'src/core/ext/resolver/dns/native')
| -rw-r--r-- | src/core/ext/resolver/dns/native/dns_resolver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c index efbb2be4e1..124b16bbc3 100644 --- a/src/core/ext/resolver/dns/native/dns_resolver.c +++ b/src/core/ext/resolver/dns/native/dns_resolver.c @@ -182,7 +182,7 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_arg new_arg = grpc_lb_addresses_create_channel_arg(addresses); result = grpc_channel_args_copy_and_add(r->channel_args, &new_arg, 1); grpc_resolved_addresses_destroy(r->addresses); - grpc_lb_addresses_destroy(addresses); + grpc_lb_addresses_destroy(exec_ctx, addresses); } else { gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec next_try = gpr_backoff_step(&r->backoff_state, now); @@ -203,7 +203,7 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, now); } if (r->resolved_result != NULL) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } r->resolved_result = result; r->resolved_version++; @@ -242,12 +242,12 @@ static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { dns_resolver *r = (dns_resolver *)gr; gpr_mu_destroy(&r->mu); if (r->resolved_result != NULL) { - grpc_channel_args_destroy(r->resolved_result); + grpc_channel_args_destroy(exec_ctx, r->resolved_result); } grpc_pollset_set_destroy(r->interested_parties); gpr_free(r->name_to_resolve); gpr_free(r->default_port); - grpc_channel_args_destroy(r->channel_args); + grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); } |