diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-17 16:01:08 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-17 16:01:08 -0800 |
| commit | 0bfad14fd5d608ac33dff93c93ff44595c3670ef (patch) | |
| tree | 228d2ec9b0241dea06da6a0bc977590b48a3fe9c /src/core/ext/resolver/sockaddr | |
| parent | bd1a0461eff7b51d9e23b7b6d03ebe4d35ec453b (diff) | |
Make resolver combiner part of the base type, to be consistent with future changes to lb_policy
Diffstat (limited to 'src/core/ext/resolver/sockaddr')
| -rw-r--r-- | src/core/ext/resolver/sockaddr/sockaddr_resolver.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c index 54179f970e..e7f66649b5 100644 --- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c +++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c @@ -59,8 +59,6 @@ typedef struct { grpc_lb_addresses *addresses; /** channel args */ grpc_channel_args *channel_args; - /** combiner guarding the rest of the state */ - grpc_combiner *combiner; /** have we published? */ bool published; /** pending next completion, or NULL */ @@ -127,7 +125,6 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx, static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) { sockaddr_resolver *r = (sockaddr_resolver *)gr; - GRPC_COMBINER_UNREF(exec_ctx, r->combiner, "sockaddr_resolver"); grpc_lb_addresses_destroy(exec_ctx, r->addresses); grpc_channel_args_destroy(exec_ctx, r->channel_args); gpr_free(r); @@ -197,8 +194,7 @@ static grpc_resolver *sockaddr_create(grpc_exec_ctx *exec_ctx, memset(r, 0, sizeof(*r)); r->addresses = addresses; r->channel_args = grpc_channel_args_copy(args->args); - r->combiner = GRPC_COMBINER_REF(args->combiner, "sockaddr_resolver"); - grpc_resolver_init(&r->base, &sockaddr_resolver_vtable); + grpc_resolver_init(&r->base, &sockaddr_resolver_vtable, args->combiner); return &r->base; } |