diff options
author | Craig Tiller <ctiller@google.com> | 2016-09-16 12:11:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-16 12:11:11 -0700 |
commit | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (patch) | |
tree | 46e7b607b14425dc575520f089f4e9373322f250 /src/core/lib/surface/init.c | |
parent | d72df881d62a89c7bb55424740cea8dbb58c99f3 (diff) | |
parent | 57726ca5a9c08ba17c882a798b93e03d333edd9f (diff) |
Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-closures
Revert "Revert "Grand unified closures""
Diffstat (limited to 'src/core/lib/surface/init.c')
-rw-r--r-- | src/core/lib/surface/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index 5397913a21..edda0c85fa 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -47,6 +47,7 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/profiling/timers.h" @@ -165,6 +166,7 @@ void grpc_init(void) { grpc_register_tracer("http1", &grpc_http1_trace); grpc_register_tracer("compression", &grpc_compression_trace); grpc_register_tracer("queue_pluck", &grpc_cq_pluck_trace); + grpc_register_tracer("combiner", &grpc_combiner_trace); // Default pluck trace to 1 grpc_cq_pluck_trace = 1; grpc_register_tracer("queue_timeout", &grpc_cq_event_timeout_trace); |