commit 7f4fc98704fa5130f4919139427338ca6b309a52
author Craig Tiller <ctiller@google.com> Mon Aug 24 14:30:07 2015 -0700
committer Craig Tiller <ctiller@google.com> Mon Aug 24 14:30:07 2015 -0700
tree 5fbffd9684acff74d391e240b86cacb5c32c3154
parent d1ed567866e600955b49bfe87d5ee03570aad85a
parent eb95b11bc1ce2a9ef6fd6fee728c7af43cf5536e

Merge branch 'endpoints' of github.com:ctiller/grpc into endpoints

src/core/iomgr/tcp_posix.c

diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c
index 36ba3a7..03be462 100644
--- a/src/core/iomgr/tcp_posix.c
+++ b/src/core/iomgr/tcp_posix.c
@@ -104,7 +104,8 @@
   gpr_free(tcp);
 }
 
-#define GRPC_TCP_REFCOUNT_DEBUG
+/*#define GRPC_TCP_REFCOUNT_DEBUG*/
+#ifdef GRPC_TCP_REFCOUNT_DEBUG
 #define TCP_UNREF(tcp, reason) tcp_unref((tcp), (reason), __FILE__, __LINE__)
 #define TCP_REF(tcp, reason) tcp_ref((tcp), (reason), __FILE__, __LINE__)
 static void tcp_unref(grpc_tcp *tcp, const char *reason, const char *file,
@@ -122,7 +123,6 @@
           reason, tcp->refcount.count, tcp->refcount.count + 1);
   gpr_ref(&tcp->refcount);
 }
-#ifdef GRPC_TCP_REFCOUNT_DEBUG
 #else
 #define TCP_UNREF(tcp, reason) tcp_unref((tcp))
 #define TCP_REF(tcp, reason) tcp_ref((tcp))

src/core/security/secure_endpoint.c

diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c
index 4206c39..b696e38 100644
--- a/src/core/security/secure_endpoint.c
+++ b/src/core/security/secure_endpoint.c
@@ -80,7 +80,8 @@
   gpr_free(ep);
 }
 
-#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG
+/*#define GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG*/
+#ifdef GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG
 #define SECURE_ENDPOINT_UNREF(ep, reason) \
   secure_endpoint_unref((ep), (reason), __FILE__, __LINE__)
 #define SECURE_ENDPOINT_REF(ep, reason) \
@@ -100,7 +101,6 @@
           ep, reason, ep->ref.count, ep->ref.count + 1);
   gpr_ref(&ep->ref);
 }
-#ifdef GRPC_SECURE_ENDPOINT_REFCOUNT_DEBUG
 #else
 #define SECURE_ENDPOINT_UNREF(ep, reason) secure_endpoint_unref((ep))
 #define SECURE_ENDPOINT_REF(ep, reason) secure_endpoint_ref((ep))