More identifier names clean-up

pull/15069/head
Muxi Yan 7 years ago
parent 142cbb5948
commit a8709ae049
  1. 14
      src/core/lib/iomgr/cfstream_handle.cc
  2. 16
      src/core/lib/iomgr/cfstream_handle.h
  3. 4
      src/core/lib/iomgr/endpoint_cfstream.cc
  4. 4
      src/core/lib/iomgr/tcp_client_cfstream.cc

@ -35,16 +35,16 @@ extern grpc_core::TraceFlag grpc_tcp_trace;
void* CFStreamHandle::Retain(void* info) {
CFStreamHandle* handle = static_cast<CFStreamHandle*>(info);
CFSTREAM_SYNC_REF(handle, "retain");
CFSTREAM_HANDLE_REF(handle, "retain");
return info;
}
void CFStreamHandle::Release(void* info) {
CFStreamHandle* handle = static_cast<CFStreamHandle*>(info);
CFSTREAM_SYNC_UNREF(handle, "release");
CFSTREAM_HANDLE_UNREF(handle, "release");
}
CFStreamHandle* CFStreamHandle::CreateStreamSync(
CFStreamHandle* CFStreamHandle::CreateStreamHandle(
CFReadStreamRef read_stream, CFWriteStreamRef write_stream) {
return new CFStreamHandle(read_stream, write_stream);
}
@ -53,7 +53,7 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream,
CFStreamEventType type,
void* client_callback_info) {
CFStreamHandle* handle = static_cast<CFStreamHandle*>(client_callback_info);
CFSTREAM_SYNC_REF(handle, "read callback");
CFSTREAM_HANDLE_REF(handle, "read callback");
dispatch_async(
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
grpc_core::ExecCtx exec_ctx;
@ -77,14 +77,14 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream,
// Impossible
abort();
}
CFSTREAM_SYNC_UNREF(handle, "read callback");
CFSTREAM_HANDLE_UNREF(handle, "read callback");
});
}
void CFStreamHandle::WriteCallback(CFWriteStreamRef stream,
CFStreamEventType type,
void* clientCallBackInfo) {
CFStreamHandle* handle = static_cast<CFStreamHandle*>(clientCallBackInfo);
CFSTREAM_SYNC_REF(handle, "write callback");
CFSTREAM_HANDLE_REF(handle, "write callback");
dispatch_async(
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
grpc_core::ExecCtx exec_ctx;
@ -108,7 +108,7 @@ void CFStreamHandle::WriteCallback(CFWriteStreamRef stream,
// Impossible
abort();
}
CFSTREAM_SYNC_UNREF(handle, "write callback");
CFSTREAM_HANDLE_UNREF(handle, "write callback");
});
}

@ -34,8 +34,8 @@
class CFStreamHandle final {
public:
static CFStreamHandle* CreateStreamSync(CFReadStreamRef read_stream,
CFWriteStreamRef write_stream);
static CFStreamHandle* CreateStreamHandle(CFReadStreamRef read_stream,
CFWriteStreamRef write_stream);
~CFStreamHandle();
CFStreamHandle(const CFReadStreamRef& ref) = delete;
CFStreamHandle(CFReadStreamRef&& ref) = delete;
@ -68,13 +68,13 @@ class CFStreamHandle final {
};
#ifndef NDEBUG
#define CFSTREAM_SYNC_REF(sync, reason) \
(sync)->Ref(__FILE__, __LINE__, (reason))
#define CFSTREAM_SYNC_UNREF(sync, reason) \
(sync)->Unref(__FILE__, __LINE__, (reason))
#define CFSTREAM_HANDLE_REF(handle, reason) \
(handle)->Ref(__FILE__, __LINE__, (reason))
#define CFSTREAM_HANDLE_UNREF(handle, reason) \
(handle)->Unref(__FILE__, __LINE__, (reason))
#else
#define CFSTREAM_SYNC_REF(sync, reason) (sync)->Ref()
#define CFSTREAM_SYNC_UNREF(sync, reason) (sync)->Unref()
#define CFSTREAM_HANDLE_REF(handle, reason) (handle)->Ref()
#define CFSTREAM_HANDLE_UNREF(handle, reason) (handle)->Unref()
#endif
#endif

@ -64,7 +64,7 @@ static void CFStreamFree(CFStreamEndpoint* ep) {
grpc_resource_user_unref(ep->resource_user);
CFRelease(ep->read_stream);
CFRelease(ep->write_stream);
CFSTREAM_SYNC_UNREF(ep->stream_sync, "free");
CFSTREAM_HANDLE_UNREF(ep->stream_sync, "free");
gpr_free(ep->peer_string);
gpr_free(ep);
}
@ -349,7 +349,7 @@ grpc_endpoint* grpc_cfstream_endpoint_create(
CFRetain(read_stream);
CFRetain(write_stream);
ep_impl->stream_sync = stream_sync;
CFSTREAM_SYNC_REF(ep_impl->stream_sync, "endpoint create");
CFSTREAM_HANDLE_REF(ep_impl->stream_sync, "endpoint create");
ep_impl->peer_string = gpr_strdup(peer_string);
ep_impl->read_cb = nil;

@ -71,7 +71,7 @@ typedef struct CFStreamConnect {
static void CFStreamConnectCleanup(CFStreamConnect* connect) {
grpc_resource_quota_unref_internal(connect->resource_quota);
CFSTREAM_SYNC_UNREF(connect->stream_sync, "async connect clean up");
CFSTREAM_HANDLE_UNREF(connect->stream_sync, "async connect clean up");
CFRelease(connect->read_stream);
CFRelease(connect->write_stream);
gpr_mu_destroy(&connect->mu);
@ -194,7 +194,7 @@ static void CFStreamClientConnect(grpc_closure* closure, grpc_endpoint** ep,
connect->read_stream = read_stream;
connect->write_stream = write_stream;
connect->stream_sync =
CFStreamHandle::CreateStreamSync(read_stream, write_stream);
CFStreamHandle::CreateStreamHandle(read_stream, write_stream);
GRPC_CLOSURE_INIT(&connect->on_open, OnOpen, static_cast<void*>(connect),
grpc_schedule_on_exec_ctx);
connect->stream_sync->NotifyOnOpen(&connect->on_open);

Loading…
Cancel
Save