review feedback

pull/29637/head
Craig Tiller 3 years ago
parent 38f05541c4
commit b04f81fee8
  1. 6
      src/core/ext/filters/client_channel/subchannel_stream_client.cc
  2. 2
      src/core/ext/filters/client_channel/subchannel_stream_client.h
  3. 3
      src/core/ext/filters/http/message_compress/message_decompress_filter.cc
  4. 10
      src/core/ext/transport/inproc/inproc_transport.cc

@ -250,10 +250,10 @@ void SubchannelStreamClient::CallState::StartCallLocked() {
payload_.send_initial_metadata.peer_string = nullptr;
batch_.send_initial_metadata = true;
// Add send_message op.
send_message_.emplace();
send_message_->Append(Slice(
send_message_.Clear();
send_message_.Append(Slice(
subchannel_stream_client_->event_handler_->EncodeSendMessageLocked()));
payload_.send_message.send_message = &*send_message_;
payload_.send_message.send_message = &send_message_;
batch_.send_message = true;
// Add send_trailing_metadata op.
payload_.send_trailing_metadata.send_trailing_metadata =

@ -166,7 +166,7 @@ class SubchannelStreamClient
grpc_metadata_batch send_initial_metadata_;
// send_message
absl::optional<SliceBuffer> send_message_;
SliceBuffer send_message_;
// send_trailing_metadata
grpc_metadata_batch send_trailing_metadata_;

@ -198,7 +198,8 @@ void CallData::OnRecvMessageReady(void* arg, grpc_error_handle error) {
GRPC_WRITE_INTERNAL_TEST_ONLY_WAS_COMPRESSED;
(*calld->recv_message_)->Swap(&decompressed_slices);
}
calld->ContinueRecvMessageReadyCallback(GRPC_ERROR_REF(calld->error_));
return calld->ContinueRecvMessageReadyCallback(
GRPC_ERROR_REF(calld->error_));
}
}
calld->ContinueRecvMessageReadyCallback(GRPC_ERROR_REF(error));

@ -87,8 +87,8 @@ void fill_in_metadata(inproc_stream* s, const grpc_metadata_batch* metadata,
uint32_t flags, grpc_metadata_batch* out_md,
uint32_t* outflags, bool* markfilled);
void ResetSendMessage(grpc_transport_stream_op_batch* msg) {
absl::exchange(msg->payload->send_message.send_message, nullptr)->Clear();
void ResetSendMessage(grpc_transport_stream_op_batch* batch) {
absl::exchange(batch->payload->send_message.send_message, nullptr)->Clear();
}
struct shared_mu {
@ -797,8 +797,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) {
// We should schedule the recv_trailing_md_op completion if
// 1. this stream is the client-side
// 2. this stream is the server-side AND has already sent its trailing
// md
// 2. this stream is the server-side AND has already sent its trailing md
// (If the server hasn't already sent its trailing md, it doesn't
// have
// a final status, so don't mark this op complete)
@ -1211,8 +1210,7 @@ void set_pollset(grpc_transport* /*gt*/, grpc_stream* /*gs*/,
}
void set_pollset_set(grpc_transport* /*gt*/, grpc_stream* /*gs*/,
grpc_pollset_set*
/*pollset_set*/) {
grpc_pollset_set* /*pollset_set*/) {
// Nothing to do here
}

Loading…
Cancel
Save