Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

nit - Rename stream_sync to stream_handle to match class name

Browse Source
pull/15714/head
Muxi Yan 7 years ago
parent 0f6016a854
commit c63673e41d
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/core/lib/iomgr/tcp_client_cfstream.cc

14
src/core/lib/iomgr/tcp_client_cfstream.cc
Unescape View File

@ -52,7 +52,7 @@ typedef struct CFStreamConnect {
CFReadStreamRef read_stream; CFReadStreamRef read_stream;
CFWriteStreamRef write_stream; CFWriteStreamRef write_stream;
CFStreamHandle* stream_sync; CFStreamHandle* stream_handle;
grpc_timer alarm; grpc_timer alarm;
grpc_closure on_alarm; grpc_closure on_alarm;
@ -71,7 +71,7 @@ typedef struct CFStreamConnect {
static void CFStreamConnectCleanup(CFStreamConnect* connect) { static void CFStreamConnectCleanup(CFStreamConnect* connect) {
grpc_resource_quota_unref_internal(connect->resource_quota); grpc_resource_quota_unref_internal(connect->resource_quota);
CFSTREAM_HANDLE_UNREF(connect->stream_sync, "async connect clean up"); CFSTREAM_HANDLE_UNREF(connect->stream_handle, "async connect clean up");
CFRelease(connect->read_stream); CFRelease(connect->read_stream);
CFRelease(connect->write_stream); CFRelease(connect->write_stream);
gpr_mu_destroy(&connect->mu); gpr_mu_destroy(&connect->mu);
@ -131,7 +131,7 @@ static void OnOpen(void* arg, grpc_error* error) {
if (error == GRPC_ERROR_NONE) { if (error == GRPC_ERROR_NONE) {
*endpoint = grpc_cfstream_endpoint_create( *endpoint = grpc_cfstream_endpoint_create(
connect->read_stream, connect->write_stream, connect->addr_name, connect->read_stream, connect->write_stream, connect->addr_name,
connect->resource_quota, connect->stream_sync); connect->resource_quota, connect->stream_handle);
} }
} else { } else {
GRPC_ERROR_REF(error); GRPC_ERROR_REF(error);
@ -170,8 +170,8 @@ static void CFStreamClientConnect(grpc_closure* closure, grpc_endpoint** ep,
gpr_mu_init(&connect->mu); gpr_mu_init(&connect->mu);
if (grpc_tcp_trace.enabled()) { if (grpc_tcp_trace.enabled()) {
gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %s: asynchronously connecting", gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %p, %s: asynchronously connecting",
connect->addr_name); connect, connect->addr_name);
} }
grpc_resource_quota* resource_quota = grpc_resource_quota_create(NULL); grpc_resource_quota* resource_quota = grpc_resource_quota_create(NULL);
@ -197,11 +197,11 @@ static void CFStreamClientConnect(grpc_closure* closure, grpc_endpoint** ep,
CFRelease(host); CFRelease(host);
connect->read_stream = read_stream; connect->read_stream = read_stream;
connect->write_stream = write_stream; connect->write_stream = write_stream;
connect->stream_sync = connect->stream_handle =
CFStreamHandle::CreateStreamHandle(read_stream, write_stream); CFStreamHandle::CreateStreamHandle(read_stream, write_stream);
GRPC_CLOSURE_INIT(&connect->on_open, OnOpen, static_cast<void*>(connect), GRPC_CLOSURE_INIT(&connect->on_open, OnOpen, static_cast<void*>(connect),
grpc_schedule_on_exec_ctx); grpc_schedule_on_exec_ctx);
connect->stream_sync->NotifyOnOpen(&connect->on_open); connect->stream_handle->NotifyOnOpen(&connect->on_open);
GRPC_CLOSURE_INIT(&connect->on_alarm, OnAlarm, connect, GRPC_CLOSURE_INIT(&connect->on_alarm, OnAlarm, connect,
grpc_schedule_on_exec_ctx); grpc_schedule_on_exec_ctx);
gpr_mu_lock(&connect->mu); gpr_mu_lock(&connect->mu);

Write Preview
Loading…
Cancel
Save