Remove debug info; clang-format

BUILD

@@ -706,12 +706,15 @@ grpc_cc_library(
         "src/core/lib/http/parser.cc",
         "src/core/lib/iomgr/buffer_list.cc",
         "src/core/lib/iomgr/call_combiner.cc",
+        "src/core/lib/iomgr/cfstream_handle.cc",
         "src/core/lib/iomgr/combiner.cc",
         "src/core/lib/iomgr/endpoint.cc",
+        "src/core/lib/iomgr/endpoint_cfstream.cc",
         "src/core/lib/iomgr/endpoint_pair_posix.cc",
         "src/core/lib/iomgr/endpoint_pair_uv.cc",
         "src/core/lib/iomgr/endpoint_pair_windows.cc",
         "src/core/lib/iomgr/error.cc",
+        "src/core/lib/iomgr/error_cfstream.cc",
         "src/core/lib/iomgr/ev_epoll1_linux.cc",
         "src/core/lib/iomgr/ev_epollex_linux.cc",
         "src/core/lib/iomgr/ev_poll_posix.cc",
@@ -730,6 +733,7 @@ grpc_cc_library(
         "src/core/lib/iomgr/iomgr_custom.cc",
         "src/core/lib/iomgr/iomgr_internal.cc",
         "src/core/lib/iomgr/iomgr_posix.cc",
+        "src/core/lib/iomgr/iomgr_posix_cfstream.cc",
         "src/core/lib/iomgr/iomgr_windows.cc",
         "src/core/lib/iomgr/is_epollexclusive_available.cc",
         "src/core/lib/iomgr/load_file.cc",
@@ -757,6 +761,7 @@ grpc_cc_library(
         "src/core/lib/iomgr/socket_utils_windows.cc",
         "src/core/lib/iomgr/socket_windows.cc",
         "src/core/lib/iomgr/tcp_client.cc",
+        "src/core/lib/iomgr/tcp_client_cfstream.cc",
         "src/core/lib/iomgr/tcp_client_custom.cc",
         "src/core/lib/iomgr/tcp_client_posix.cc",
         "src/core/lib/iomgr/tcp_client_windows.cc",
@@ -858,12 +863,15 @@ grpc_cc_library(
         "src/core/lib/iomgr/block_annotate.h",
         "src/core/lib/iomgr/buffer_list.h",
         "src/core/lib/iomgr/call_combiner.h",
+        "src/core/lib/iomgr/cfstream_handle.h",
         "src/core/lib/iomgr/closure.h",
         "src/core/lib/iomgr/combiner.h",
         "src/core/lib/iomgr/dynamic_annotations.h",
         "src/core/lib/iomgr/endpoint.h",
+        "src/core/lib/iomgr/endpoint_cfstream.h",
         "src/core/lib/iomgr/endpoint_pair.h",
         "src/core/lib/iomgr/error.h",
+        "src/core/lib/iomgr/error_cfstream.h",
         "src/core/lib/iomgr/error_internal.h",
         "src/core/lib/iomgr/ev_epoll1_linux.h",
         "src/core/lib/iomgr/ev_epollex_linux.h",
@@ -1018,26 +1026,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "grpc_cfstream",
-    srcs = [
-        "src/core/lib/iomgr/cfstream_handle.cc",
-        "src/core/lib/iomgr/endpoint_cfstream.cc",
-        "src/core/lib/iomgr/error_cfstream.cc",
-        "src/core/lib/iomgr/iomgr_posix_cfstream.cc",
-        "src/core/lib/iomgr/tcp_client_cfstream.cc",
-    ],
-    hdrs = [
-        "src/core/lib/iomgr/cfstream_handle.h",
-        "src/core/lib/iomgr/endpoint_cfstream.h",
-        "src/core/lib/iomgr/error_cfstream.h",
-    ],
-    deps = [
-        ":gpr_base",
-        ":grpc_base",
-    ],
-)
-
 grpc_cc_library(
     name = "grpc_client_channel",
     srcs = [

include/grpc/impl/codegen/port_platform.h

@@ -185,39 +185,39 @@
 #define _BSD_SOURCE
 #endif
 #if TARGET_OS_IPHONE
-  #define GPR_PLATFORM_STRING "ios"
-  #define GPR_CPU_IPHONE 1
-  #define GPR_PTHREAD_TLS 1
-  #define GRPC_CFSTREAM 1
+#define GPR_PLATFORM_STRING "ios"
+#define GPR_CPU_IPHONE 1
+#define GPR_PTHREAD_TLS 1
+#define GRPC_CFSTREAM 1
 #else /* TARGET_OS_IPHONE */
-  #define GPR_PLATFORM_STRING "osx"
-  #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
-    #if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7
-      #define GPR_CPU_IPHONE 1
-      #define GPR_PTHREAD_TLS 1
-    #else /* __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 */
-      #define GPR_CPU_POSIX 1
-      /* TODO(vjpai): there is a reported issue in bazel build for Mac where __thread
+#define GPR_PLATFORM_STRING "osx"
+#ifdef __MAC_OS_X_VERSION_MIN_REQUIRED
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7
+#define GPR_CPU_IPHONE 1
+#define GPR_PTHREAD_TLS 1
+#else /* __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_7 */
+#define GPR_CPU_POSIX 1
+/* TODO(vjpai): there is a reported issue in bazel build for Mac where __thread
    in a header is currently not working (bazelbuild/bazel#4341). Remove
    the following conditional and use GPR_GCC_TLS when that is fixed */
-      #ifndef GRPC_BAZEL_BUILD
-        #define GPR_GCC_TLS 1
-      #else /* GRPC_BAZEL_BUILD */
-        #define GPR_PTHREAD_TLS 1
-      #endif /* GRPC_BAZEL_BUILD */
-      #define GPR_APPLE_PTHREAD_NAME 1
-    #endif
-  #else /* __MAC_OS_X_VERSION_MIN_REQUIRED */
-    #define GPR_CPU_POSIX 1
-    /* TODO(vjpai): Remove the following conditional and use only GPR_GCC_TLS
+#ifndef GRPC_BAZEL_BUILD
+#define GPR_GCC_TLS 1
+#else /* GRPC_BAZEL_BUILD */
+#define GPR_PTHREAD_TLS 1
+#endif /* GRPC_BAZEL_BUILD */
+#define GPR_APPLE_PTHREAD_NAME 1
+#endif
+#else /* __MAC_OS_X_VERSION_MIN_REQUIRED */
+#define GPR_CPU_POSIX 1
+/* TODO(vjpai): Remove the following conditional and use only GPR_GCC_TLS
    when bazelbuild/bazel#4341 is fixed */
-    #ifndef GRPC_BAZEL_BUILD
-      #define GPR_GCC_TLS 1
-    #else /* GRPC_BAZEL_BUILD */
-      #define GPR_PTHREAD_TLS 1
-    #endif /* GRPC_BAZEL_BUILD */
-  #endif
-  #define GPR_POSIX_CRASH_HANDLER 1
+#ifndef GRPC_BAZEL_BUILD
+#define GPR_GCC_TLS 1
+#else /* GRPC_BAZEL_BUILD */
+#define GPR_PTHREAD_TLS 1
+#endif /* GRPC_BAZEL_BUILD */
+#endif
+#define GPR_POSIX_CRASH_HANDLER 1
 #endif
 #define GPR_APPLE 1
 #define GPR_GCC_ATOMIC 1

src/core/lib/iomgr/cfstream_handle.cc

@@ -79,7 +79,6 @@ void CFStreamHandle::WriteCallback(CFWriteStreamRef stream,
                                    void* clientCallBackInfo) {
   grpc_core::ExecCtx exec_ctx;
   CFStreamHandle* handle = static_cast<CFStreamHandle*>(clientCallBackInfo);
-  printf("** CFStreamHandle::WriteCallback\n");
   if (grpc_tcp_trace.enabled()) {
     gpr_log(GPR_DEBUG, "CFStream WriteCallback (%p, %p, %lu, %p)", handle,
             stream, type, clientCallBackInfo);