diff options
author | David Garcia Quintas <dgq@google.com> | 2017-12-13 14:44:29 -0800 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2017-12-13 14:44:29 -0800 |
commit | 54d699ddda18e8aca7a556ad3c38d1684efc88ec (patch) | |
tree | b0ecaaf07074bdcde6c3315f647cc04417da7b90 /src/core/lib/iomgr/endpoint_pair_posix.cc | |
parent | 62d86e9987121c8bd79d4594fb0db019c4faafad (diff) | |
parent | 91a851c6e1f6bc7c1dbf84ea12558d535c911252 (diff) |
Merge branch 'master' of github.com:grpc/grpc into backoff_cpp
Diffstat (limited to 'src/core/lib/iomgr/endpoint_pair_posix.cc')
-rw-r--r-- | src/core/lib/iomgr/endpoint_pair_posix.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc index f5f59f9917..0b4aefd1b7 100644 --- a/src/core/lib/iomgr/endpoint_pair_posix.cc +++ b/src/core/lib/iomgr/endpoint_pair_posix.cc @@ -54,18 +54,17 @@ grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char* name, char* final_name; create_sockets(sv); - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; + grpc_core::ExecCtx exec_ctx; gpr_asprintf(&final_name, "%s:client", name); - p.client = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[1], final_name), args, + p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), args, "socketpair-server"); gpr_free(final_name); gpr_asprintf(&final_name, "%s:server", name); - p.server = grpc_tcp_create(&exec_ctx, grpc_fd_create(sv[0], final_name), args, + p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), args, "socketpair-client"); gpr_free(final_name); - grpc_exec_ctx_finish(&exec_ctx); return p; } |