diff options
author | Yuchen Zeng <zyc@google.com> | 2017-02-27 13:38:58 -0800 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2017-03-17 15:57:27 -0700 |
commit | cabb1517e5ac3cdbe59415678d4f0d284f9fabda (patch) | |
tree | 61250cec14095b909f8fd54bcef59ccaa818e3c2 /src | |
parent | 2c977084c8fec4bc395976338683d1d480bab91e (diff) |
Update with the client channel combiner change
Diffstat (limited to 'src')
-rw-r--r-- | src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c b/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c index 0e260ce194..db26d12fdd 100644 --- a/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c +++ b/src/core/ext/resolver/dns/c_ares/dns_resolver_ares.c @@ -290,7 +290,7 @@ static void dns_ares_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { if (r->resolved_result != NULL) { grpc_channel_args_destroy(exec_ctx, r->resolved_result); } - grpc_pollset_set_destroy(r->interested_parties); + grpc_pollset_set_destroy(exec_ctx, r->interested_parties); gpr_free(r->name_to_resolve); gpr_free(r->default_port); grpc_channel_args_destroy(exec_ctx, r->channel_args); @@ -310,8 +310,8 @@ static grpc_resolver *dns_ares_create(grpc_exec_ctx *exec_ctx, // Create resolver. ares_dns_resolver *r = gpr_malloc(sizeof(ares_dns_resolver)); memset(r, 0, sizeof(*r)); - grpc_resolver_init(&r->base, &dns_ares_resolver_vtable); r->combiner = grpc_combiner_create(NULL); + grpc_resolver_init(&r->base, &dns_ares_resolver_vtable, r->combiner); r->name_to_resolve = gpr_strdup(path); r->default_port = gpr_strdup(default_port); r->channel_args = grpc_channel_args_copy(args->args); |