diff options
| author |  Mark D. Roth <roth@google.com> | 2018-06-11 11:11:05 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-06-11 11:11:05 -0700 |
| commit | 9846826b51ce20c1ecec6084898adbbf033b64c0 (patch) | |
| tree | b0515b76af1c7be4c6ed6f759571f5fbf812791d /test/cpp/microbenchmarks/bm_call_create.cc | |
| parent | 3089cc8c38563d27160f9772a2e5ed4e60c058f7 (diff) | |
Revert "Revert "move recv_trailing_metadata into its own callback, don't use on_complete for recv_ops""
This reverts commit f3715134458cb14efd855d948f229dc2661b4028.
Diffstat (limited to 'test/cpp/microbenchmarks/bm_call_create.cc')
| -rw-r--r-- | test/cpp/microbenchmarks/bm_call_create.cc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc index 831b29c506..dd1610dc3d 100644 --- a/test/cpp/microbenchmarks/bm_call_create.cc +++ b/test/cpp/microbenchmarks/bm_call_create.cc @@ -621,18 +621,26 @@ typedef struct { static void StartTransportStreamOp(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { call_data* calld = static_cast<call_data*>(elem->call_data); + // Construct list of closures to return. + grpc_core::CallCombinerClosureList closures; if (op->recv_initial_metadata) { - GRPC_CALL_COMBINER_START( - calld->call_combiner, - op->payload->recv_initial_metadata.recv_initial_metadata_ready, - GRPC_ERROR_NONE, "recv_initial_metadata"); + closures.Add(op->payload->recv_initial_metadata.recv_initial_metadata_ready, + GRPC_ERROR_NONE, "recv_initial_metadata"); } if (op->recv_message) { - GRPC_CALL_COMBINER_START(calld->call_combiner, - op->payload->recv_message.recv_message_ready, - GRPC_ERROR_NONE, "recv_message"); + closures.Add(op->payload->recv_message.recv_message_ready, GRPC_ERROR_NONE, + "recv_message"); } - GRPC_CLOSURE_SCHED(op->on_complete, GRPC_ERROR_NONE); + if (op->recv_trailing_metadata) { + closures.Add( + op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, + GRPC_ERROR_NONE, "recv_trailing_metadata"); + } + if (op->on_complete != nullptr) { + closures.Add(op->on_complete, GRPC_ERROR_NONE, "on_complete"); + } + // Execute closures. + closures.RunClosures(calld->call_combiner); } static void StartTransportOp(grpc_channel_element* elem, |