Fix compile after flowctl merge

reviewable/pr13109/r2
ncteisen 7 years ago
parent fcdafde9bd
commit 3e3f806cff
  1. 1
      src/core/ext/transport/chttp2/transport/chttp2_transport.cc
  2. 1
      src/core/ext/transport/chttp2/transport/chttp2_transport.h
  3. 2
      src/core/ext/transport/chttp2/transport/flow_control.cc
  4. 4
      src/core/ext/transport/chttp2/transport/flow_control.h
  5. 1
      src/core/ext/transport/chttp2/transport/internal.h
  6. 2
      src/core/lib/debug/trace.cc
  7. 2
      src/core/lib/debug/trace.h

@ -91,7 +91,6 @@ static int g_default_max_ping_strikes = DEFAULT_MAX_PING_STRIKES;
#define MAX_CLIENT_STREAM_ID 0x7fffffffu
grpc_core::TraceFlag grpc_http_trace(false, "http");
grpc_core::TraceFlag grpc_flowctl_trace(false, "flowctl");
grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false,
"chttp2_refcount");

@ -28,7 +28,6 @@ extern "C" {
#endif
extern grpc_core::TraceFlag grpc_http_trace;
extern grpc_core::TraceFlag grpc_flowctl_trace;
extern grpc_core::TraceFlag grpc_trace_http2_stream_state;
#ifndef NDEBUG

@ -31,6 +31,8 @@
#include "src/core/ext/transport/chttp2/transport/internal.h"
#include "src/core/lib/support/string.h"
grpc_core::TraceFlag grpc_flowctl_trace(false, "flowctl");
namespace grpc_core {
namespace chttp2 {

@ -30,7 +30,7 @@
struct grpc_chttp2_transport;
struct grpc_chttp2_stream;
extern "C" grpc_tracer_flag grpc_flowctl_trace;
extern grpc_core::TraceFlag grpc_flowctl_trace;
namespace grpc_core {
namespace chttp2 {
@ -112,7 +112,7 @@ class FlowControlTrace {
StreamFlowControl* sfc);
void Finish();
const bool enabled_ = GRPC_TRACER_ON(grpc_flowctl_trace);
const bool enabled_ = grpc_flowctl_trace.enabled();
TransportFlowControl* tfc_;
StreamFlowControl* sfc_;

@ -679,7 +679,6 @@ void grpc_chttp2_complete_closure_step(grpc_exec_ctx *exec_ctx,
(sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1)
extern grpc_core::TraceFlag grpc_http_trace;
extern grpc_core::TraceFlag grpc_flowctl_trace;
#define GRPC_CHTTP2_IF_TRACING(stmt) \
if (!grpc_http_trace.enabled()) \

@ -29,6 +29,8 @@ int grpc_tracer_set_enabled(const char *name, int enabled);
namespace grpc_core {
TraceFlag* TraceFlag::root_tracer_ = nullptr;
TraceFlag::TraceFlag(bool default_enabled, const char *name)
: next_tracer_(root_tracer_), name_(name), value_(default_enabled) {
root_tracer_ = this;

@ -47,7 +47,7 @@ namespace grpc_core {
class TraceFlag {
public:
TraceFlag(bool default_enabled, const char *name);
~TraceFlag();
~TraceFlag() { }
static bool Set(const char *tracer, bool enabled);

Loading…
Cancel
Save