Merge branch 'c3+r' of github.com:ctiller/grpc into c3+r

src/core/ext/resolver/dns/native/dns_resolver.c

@@ -235,7 +235,7 @@ static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 
 static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
   dns_resolver *r = (dns_resolver *)gr;
-  grpc_combiner_unref(exec_ctx, r->combiner);
+  GRPC_COMBINER_UNREF(exec_ctx, r->combiner, "dns_destroy");
   if (r->resolved_result != NULL) {
     grpc_channel_args_destroy(exec_ctx, r->resolved_result);
   }
@@ -259,7 +259,7 @@ static grpc_resolver *dns_create(grpc_exec_ctx *exec_ctx,
   // Create resolver.
   dns_resolver *r = gpr_malloc(sizeof(dns_resolver));
   memset(r, 0, sizeof(*r));
-  r->combiner = args->combiner;
+  r->combiner = GRPC_COMBINER_REF(args->combiner, "dns_resolver");
   grpc_resolver_init(&r->base, &dns_resolver_vtable);
   r->name_to_resolve = gpr_strdup(path);
   r->default_port = gpr_strdup(default_port);

src/core/ext/resolver/sockaddr/sockaddr_resolver.c

@@ -127,7 +127,7 @@ 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);
+  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,7 +197,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);
+  r->combiner = GRPC_COMBINER_REF(args->combiner, "sockaddr_resolver");
   grpc_resolver_init(&r->base, &sockaddr_resolver_vtable);
   return &r->base;
 }