Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[latent-see] Compilation fix for use_strict_warning=true (#37815)

Browse Source 
Since we don't actually use the `desc` parameter when building without latent_see we had an unused parameter error.
More though, I think the `GRPC_LATENT_SEE_METADATA_RAW` macro was flawed, as the inner `metadata` argument would only be created once, and so all uses would get tagged by whatever passed through `Flusher` first. Correct this by passing in the `latent_see::Metadata*` directly to the function.

Closes #37815

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37815 from ctiller:woah-bubba 606a6350fe
PiperOrigin-RevId: 680136826
pull/37786/head
Craig Tiller 5 months ago committed by Copybara-Service
parent 3ea3e36e95
commit 6b88612d03
3 changed files with 23 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/core/lib/channel/promise_based_filter.cc
  2. 3
      src/core/lib/channel/promise_based_filter.h
  3. 6
      src/core/util/latent_see.h

35
src/core/lib/channel/promise_based_filter.cc
Unescape View File

@ -243,8 +243,8 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error,
///////////////////////////////////////////////////////////////////////////////
// BaseCallData::Flusher
BaseCallData::Flusher::Flusher(BaseCallData* call, const char* desc)
: latent_see::InnerScope(GRPC_LATENT_SEE_METADATA_RAW(desc)), call_(call) {
BaseCallData::Flusher::Flusher(BaseCallData* call, latent_see::Metadata* desc)
: latent_see::InnerScope(desc), call_(call) {
GRPC_CALL_STACK_REF(call_->call_stack(), "flusher");
}
@ -396,7 +396,7 @@ bool BaseCallData::SendMessage::IsIdle() const {
}
void BaseCallData::SendMessage::OnComplete(absl::Status status) {
Flusher flusher(base_, "SendMessage::OnComplete");
Flusher flusher(base_, GRPC_LATENT_SEE_METADATA("SendMessage::OnComplete"));
GRPC_TRACE_LOG(channel, INFO)
<< base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_)
<< " status=" << status;
@ -706,7 +706,8 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) {
break;
}
completed_status_ = status;
Flusher flusher(base_, "ReceiveMessage::OnComplete");
Flusher flusher(base_,
GRPC_LATENT_SEE_METADATA("ReceiveMessage::OnComplete"));
ScopedContext ctx(base_);
base_->WakeInsideCombiner(&flusher);
}
@ -1221,7 +1222,8 @@ class ClientCallData::PollContext {
{
ScopedContext ctx(next_poll->call_data);
Flusher flusher(next_poll->call_data,
"ClientCallData::PollContext::~PollContext");
GRPC_LATENT_SEE_METADATA(
"ClientCallData::PollContext::~PollContext"));
next_poll->call_data->WakeInsideCombiner(&flusher);
}
GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll");
@ -1350,7 +1352,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) {
// Fake out the activity based context.
ScopedContext context(this);
CapturedBatch batch(b);
Flusher flusher(this, "ClientCallData::StartBatch");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::StartBatch"));
GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString();
@ -1556,7 +1558,8 @@ void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) {
<< DebugString() << " error:" << error.ToString()
<< " md:" << recv_initial_metadata_->metadata->DebugString();
ScopedContext context(this);
Flusher flusher(this, "ClientCallData::RecvInitialMetadataReady");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
"ClientCallData::RecvInitialMetadataReady"));
if (!error.ok()) {
switch (recv_initial_metadata_->state) {
case RecvInitialMetadata::kHookedWaitingForPipe:
@ -1742,7 +1745,8 @@ void ClientCallData::RecvTrailingMetadataReadyCallback(
}
void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
Flusher flusher(this, "ClientCallData::RecvTrailingMetadataReady");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
"ClientCallData::RecvTrailingMetadataReady"));
GRPC_TRACE_LOG(channel, INFO)
<< LogTag() << " ClientCallData.RecvTrailingMetadataReady "
<< "recv_trailing_state=" << StateString(recv_trailing_state_)
@ -1798,7 +1802,7 @@ void ClientCallData::WakeInsideCombiner(Flusher* flusher) {
}
void ClientCallData::OnWakeup() {
Flusher flusher(this, "ClientCallData::OnWakeup");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::OnWakeup"));
ScopedContext context(this);
WakeInsideCombiner(&flusher);
}
@ -1875,7 +1879,8 @@ class ServerCallData::PollContext {
auto* next_poll = static_cast<NextPoll*>(p);
{
Flusher flusher(next_poll->call_data,
"ServerCallData::PollContext::~PollContext");
GRPC_LATENT_SEE_METADATA(
"ServerCallData::PollContext::~PollContext"));
ScopedContext context(next_poll->call_data);
next_poll->call_data->WakeInsideCombiner(&flusher);
}
@ -1979,7 +1984,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) {
// Fake out the activity based context.
ScopedContext context(this);
CapturedBatch batch(b);
Flusher flusher(this, "ServerCallData::StartBatch");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::StartBatch"));
bool wake = false;
GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString();
@ -2268,7 +2273,8 @@ void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
GRPC_TRACE_LOG(channel, INFO)
<< LogTag() << ": RecvTrailingMetadataReady error=" << error
<< " md=" << recv_trailing_metadata_->DebugString();
Flusher flusher(this, "ServerCallData::RecvTrailingMetadataReady");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
"ServerCallData::RecvTrailingMetadataReady"));
PollContext poll_ctx(this, &flusher);
Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(),
&flusher);
@ -2282,7 +2288,8 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg,
}
void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) {
Flusher flusher(this, "ServerCallData::RecvInitialMetadataReady");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
"ServerCallData::RecvInitialMetadataReady"));
GRPC_TRACE_LOG(channel, INFO)
<< LogTag() << ": RecvInitialMetadataReady " << error;
CHECK(recv_initial_state_ == RecvInitialState::kForwarded);
@ -2497,7 +2504,7 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) {
}
void ServerCallData::OnWakeup() {
Flusher flusher(this, "ServerCallData::OnWakeup");
Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::OnWakeup"));
ScopedContext context(this);
WakeInsideCombiner(&flusher);
}

3
src/core/lib/channel/promise_based_filter.h
Unescape View File

@ -977,7 +977,8 @@ class BaseCallData : public Activity, private Wakeable {
class Flusher : public latent_see::InnerScope {
public:
explicit Flusher(BaseCallData* call,
const char* desc = "PromiseBasedFilter::Flusher");
latent_see::Metadata* desc = GRPC_LATENT_SEE_METADATA(
"PromiseBasedFilter::Flusher"));
// Calls closures, schedules batches, relinquishes call combiner.
~Flusher();

6
src/core/util/latent_see.h
Unescape View File

@ -260,12 +260,6 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) {
#name}; \
return &metadata; \
}()
#define GRPC_LATENT_SEE_METADATA_RAW(name) \
[ptr = name]() { \
static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \
ptr}; \
return &metadata; \
}()
// Parent scope: logs a begin and end event, and flushes the thread log on scope
// exit. Because the flush takes some time it's better to place one parent scope
// at the top of the stack, and use lighter weight scopes within it.

Write Preview
Loading…
Cancel
Save