diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-04-29 14:10:05 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-04-29 14:10:05 -0700 |
| commit | bbc0b775e137e6865c9213086c61b84e7415a9ec (patch) | |
| tree | 594570ab49a522a7f7f6beb189ada26d15e2f825 /src/cpp/client/channel.cc | |
| parent | 735987bea0e48cfe579b48a969d71298ae973c31 (diff) | |
Merge comments. See below.
- Added ptag ignore annotation threshold
- prefixed everythig with grpc_
- removed spurious annotations in channel_create.c and client_channel.c
- removed stap_probes.h (it's generated from stap_probes.d by make)
- Updated Makefile and its template with the right way to generate stap
probe headers from its .d definition.
Diffstat (limited to 'src/cpp/client/channel.cc')
| -rw-r--r-- | src/cpp/client/channel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 3d9d1307a4..475a20d883 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -70,7 +70,7 @@ Call Channel::CreateCall(const RpcMethod& method, ClientContext* context, ? target_.c_str() : context->authority().c_str(), context->raw_deadline()); - GRPC_TIMER_MARK(PTAG_CPP_CALL_CREATED, c_call); + GRPC_TIMER_MARK(GRPC_PTAG_CPP_CALL_CREATED, c_call); context->set_call(c_call, shared_from_this()); return Call(c_call, this, cq); } @@ -79,11 +79,11 @@ void Channel::PerformOpsOnCall(CallOpBuffer* buf, Call* call) { static const size_t MAX_OPS = 8; size_t nops = MAX_OPS; grpc_op ops[MAX_OPS]; - GRPC_TIMER_BEGIN(PTAG_CPP_PERFORM_OPS, call->call()); + GRPC_TIMER_BEGIN(GRPC_PTAG_CPP_PERFORM_OPS, call->call()); buf->FillOps(ops, &nops); GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(call->call(), ops, nops, buf)); - GRPC_TIMER_END(PTAG_CPP_PERFORM_OPS, call->call()); + GRPC_TIMER_END(GRPC_PTAG_CPP_PERFORM_OPS, call->call()); } void* Channel::RegisterMethod(const char* method) { |