diff options
author | 2015-04-29 14:10:05 -0700 | |
---|---|---|
committer | 2015-04-29 14:10:05 -0700 | |
commit | bbc0b775e137e6865c9213086c61b84e7415a9ec (patch) | |
tree | 594570ab49a522a7f7f6beb189ada26d15e2f825 /src/cpp/common/call.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/common/call.cc')
-rw-r--r-- | src/cpp/common/call.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc index 41d64276e2..a60282316a 100644 --- a/src/cpp/common/call.cc +++ b/src/cpp/common/call.cc @@ -232,13 +232,13 @@ void CallOpBuffer::FillOps(grpc_op* ops, size_t* nops) { } if (send_message_ || send_message_buffer_) { if (send_message_) { - GRPC_TIMER_BEGIN(PTAG_PROTO_SERIALIZE, 0); + GRPC_TIMER_BEGIN(GRPC_PTAG_PROTO_SERIALIZE, 0); bool success = SerializeProto(*send_message_, &send_buf_); if (!success) { abort(); // TODO handle parse failure } - GRPC_TIMER_END(PTAG_PROTO_SERIALIZE, 0); + GRPC_TIMER_END(GRPC_PTAG_PROTO_SERIALIZE, 0); } else { send_buf_ = send_message_buffer_->buffer(); } @@ -310,10 +310,10 @@ bool CallOpBuffer::FinalizeResult(void** tag, bool* status) { if (recv_buf_) { got_message = *status; if (recv_message_) { - GRPC_TIMER_BEGIN(PTAG_PROTO_DESERIALIZE, 0); + GRPC_TIMER_BEGIN(GRPC_PTAG_PROTO_DESERIALIZE, 0); *status = *status && DeserializeProto(recv_buf_, recv_message_); grpc_byte_buffer_destroy(recv_buf_); - GRPC_TIMER_END(PTAG_PROTO_DESERIALIZE, 0); + GRPC_TIMER_END(GRPC_PTAG_PROTO_DESERIALIZE, 0); } else { recv_message_buffer_->set_buffer(recv_buf_); } |