diff options
| author |  Yang Gao <yangg@google.com> | 2015-05-01 11:34:45 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-05-01 11:34:45 -0700 |
| commit | ea13af73e09cbf2c212069a17b700f6aa121f280 (patch) | |
| tree | aaf81371e9394ce08b1d80ee574501354f2cd6ee /src/cpp/common | |
| parent | 3921c56bee2adff62cb0f9519114d2aa22a67410 (diff) | |
| parent | 87344c88d535c0cb080d75dc925af369035c87e3 (diff) | |
merge with head
Diffstat (limited to 'src/cpp/common')
| -rw-r--r-- | src/cpp/common/call.cc | 8 | ||||
| -rw-r--r-- | src/cpp/common/completion_queue.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc index 25609a7759..3374bef095 100644 --- a/src/cpp/common/call.cc +++ b/src/cpp/common/call.cc @@ -233,13 +233,13 @@ void CallOpBuffer::FillOps(grpc_op* ops, size_t* nops) { } if (send_message_ || send_message_buffer_) { if (send_message_) { - GRPC_TIMER_MARK(SER_PROTO_BEGIN, 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_MARK(SER_PROTO_END, 0); + GRPC_TIMER_END(GRPC_PTAG_PROTO_SERIALIZE, 0); } else { send_buf_ = send_message_buffer_->buffer(); } @@ -311,10 +311,10 @@ bool CallOpBuffer::FinalizeResult(void** tag, bool* status) { if (recv_buf_) { got_message = *status; if (recv_message_) { - GRPC_TIMER_MARK(DESER_PROTO_BEGIN, 0); + GRPC_TIMER_BEGIN(GRPC_PTAG_PROTO_DESERIALIZE, 0); *status = *status && DeserializeProto(recv_buf_, recv_message_, max_message_size_); grpc_byte_buffer_destroy(recv_buf_); - GRPC_TIMER_MARK(DESER_PROTO_END, 0); + GRPC_TIMER_END(GRPC_PTAG_PROTO_DESERIALIZE, 0); } else { recv_message_buffer_->set_buffer(recv_buf_); } diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc index 07122db4a5..2b9000ea08 100644 --- a/src/cpp/common/completion_queue.cc +++ b/src/cpp/common/completion_queue.cc @@ -92,7 +92,7 @@ bool CompletionQueue::Pluck(CompletionQueueTag* tag) { void CompletionQueue::TryPluck(CompletionQueueTag* tag) { std::unique_ptr<grpc_event, EventDeleter> ev; - ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_inf_past)); + ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_time_0)); if (!ev) return; bool ok = ev->data.op_complete == GRPC_OP_OK; void* ignored = tag; |