aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/iomgr/resolve_address_windows.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-23 09:31:51 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-09-23 09:31:51 -0700
commit82f9bd84e5303c78b4b766655653ddb3e1e669f4 (patch)
tree8d0d6bb59a79d7dfce90caf38b924107d0828401 /src/core/iomgr/resolve_address_windows.c
parent4ed7a7585f14175137b39bc9b59ae4687ef35d0f (diff)
Update Windows stuff
Diffstat (limited to 'src/core/iomgr/resolve_address_windows.c')
-rw-r--r--src/core/iomgr/resolve_address_windows.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c
index fb5fd0d4f6..fcd80b3912 100644
--- a/src/core/iomgr/resolve_address_windows.c
+++ b/src/core/iomgr/resolve_address_windows.c
@@ -128,6 +128,7 @@ done:
/* Thread function to asynch-ify grpc_blocking_resolve_address */
static void do_request(void *rp) {
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
request *r = rp;
grpc_resolved_addresses *resolved =
grpc_blocking_resolve_address(r->name, r->default_port);
@@ -137,7 +138,8 @@ static void do_request(void *rp) {
gpr_free(r->default_port);
grpc_iomgr_unregister_object(&r->iomgr_object);
gpr_free(r);
- cb(arg, resolved);
+ cb(&exec_ctx, arg, resolved);
+ grpc_exec_ctx_finish(&exec_ctx);
}
void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) {
@@ -149,7 +151,7 @@ void grpc_resolve_address(const char *name, const char *default_port,
grpc_resolve_cb cb, void *arg) {
request *r = gpr_malloc(sizeof(request));
gpr_thd_id id;
- const char *label;
+ char *label;
gpr_asprintf(&label, "resolve:%s", name);
grpc_iomgr_register_object(&r->iomgr_object, label);
gpr_free(label);