diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
| commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
| tree | e2b5085817619e9aba3e4f88407f344b36e911af /src/core/surface/surface_trace.h | |
| parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
| parent | 8b131922438d96579cb315777ca980e094883496 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'src/core/surface/surface_trace.h')
| -rw-r--r-- | src/core/surface/surface_trace.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/core/surface/surface_trace.h b/src/core/surface/surface_trace.h index f998de1ad6..4d478d6470 100644 --- a/src/core/surface/surface_trace.h +++ b/src/core/surface/surface_trace.h @@ -34,21 +34,14 @@ #ifndef __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__ #define __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__ +#include "src/core/debug/trace.h" #include <grpc/support/log.h> -/* #define GRPC_ENABLE_SURFACE_TRACE 1 */ - -#ifdef GRPC_ENABLE_SURFACE_TRACE #define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event) \ - do { \ + if (grpc_trace_bits & GRPC_TRACE_SURFACE) { \ char *_ev = grpc_event_string(event); \ gpr_log(GPR_INFO, "RETURN_EVENT[%p]: %s", cq, _ev); \ gpr_free(_ev); \ - } while (0) -#else -#define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event) \ - do { \ - } while (0) -#endif + } #endif /* __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__ */ |