diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-24 14:30:07 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-24 14:30:07 -0700 |
| commit | 7f4fc98704fa5130f4919139427338ca6b309a52 (patch) | |
| tree | 5fbffd9684acff74d391e240b86cacb5c32c3154 | |
| parent | d1ed567866e600955b49bfe87d5ee03570aad85a (diff) | |
| parent | eb95b11bc1ce2a9ef6fd6fee728c7af43cf5536e (diff) | |
Merge branch 'endpoints' of github.com:ctiller/grpc into endpoints
| -rw-r--r-- | src/core/iomgr/tcp_posix.c | 4 | ||||
| -rw-r--r-- | src/core/security/secure_endpoint.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c index 36ba3a7606..03be462960 100644 --- a/src/core/iomgr/tcp_posix.c +++ b/src/core/iomgr/tcp_posix.c @@ -104,7 +104,8 @@ static void tcp_free(grpc_tcp *tcp) { 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 @@ static void tcp_ref(grpc_tcp *tcp, const char *reason, const char *file, 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)) diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c index 4206c39318..b696e384fc 100644 --- a/src/core/security/secure_endpoint.c +++ b/src/core/security/secure_endpoint.c @@ -80,7 +80,8 @@ static void destroy(secure_endpoint *secure_ep) { 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 @@ static void secure_endpoint_ref(secure_endpoint *ep, const char *reason, 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)) |