Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Gpr_To_Absl_Logging] Fix use of GRPC_TRACE_FLAG_ENABLED in gen code (#37514)

Browse Source 
[Gpr_To_Absl_Logging] Fix use of GRPC_TRACE_FLAG_ENABLED in gen code

Closes #37514

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37514 from tanvi-jagtap:fix_gen_code_GRPC_TRACE_FLAG_ENABLED 096004c6d7
PiperOrigin-RevId: 663762507
pull/37519/head
Tanvi Jagtap 7 months ago committed by Copybara-Service
parent cd2a624a14
commit 42bd720fee
5 changed files with 1151 additions and 1413 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. 1
      src/core/BUILD
  2. 88
      src/core/lib/promise/detail/join_state.h
  3. 2457
      src/core/lib/promise/detail/seq_state.h
  4. 2
      tools/codegen/core/gen_join.py
  5. 16
      tools/codegen/core/gen_seq.py

1
src/core/BUILD
Unescape View File

@ -954,6 +954,7 @@ grpc_cc_library(
grpc_cc_library(
name = "seq",
external_deps = ["absl/log:log"],
language = "c++",
public_hdrs = [
"lib/promise/seq.h",

88
src/core/lib/promise/detail/join_state.h
Unescape View File

@ -103,7 +103,7 @@ struct JoinState<Traits, P0, P1> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/2 already ready";
}
@ -125,7 +125,7 @@ struct JoinState<Traits, P0, P1> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/2 already ready";
}
@ -216,7 +216,7 @@ struct JoinState<Traits, P0, P1, P2> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/3 already ready";
}
@ -238,7 +238,7 @@ struct JoinState<Traits, P0, P1, P2> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/3 already ready";
}
@ -260,7 +260,7 @@ struct JoinState<Traits, P0, P1, P2> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/3 already ready";
}
@ -367,7 +367,7 @@ struct JoinState<Traits, P0, P1, P2, P3> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/4 already ready";
}
@ -389,7 +389,7 @@ struct JoinState<Traits, P0, P1, P2, P3> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/4 already ready";
}
@ -411,7 +411,7 @@ struct JoinState<Traits, P0, P1, P2, P3> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/4 already ready";
}
@ -433,7 +433,7 @@ struct JoinState<Traits, P0, P1, P2, P3> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/4 already ready";
}
@ -555,7 +555,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/5 already ready";
}
@ -577,7 +577,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/5 already ready";
}
@ -599,7 +599,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/5 already ready";
}
@ -621,7 +621,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/5 already ready";
}
@ -643,7 +643,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 5/5 already ready";
}
@ -780,7 +780,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/6 already ready";
}
@ -802,7 +802,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/6 already ready";
}
@ -824,7 +824,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/6 already ready";
}
@ -846,7 +846,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/6 already ready";
}
@ -868,7 +868,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 5/6 already ready";
}
@ -890,7 +890,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 6/6 already ready";
}
@ -1042,7 +1042,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/7 already ready";
}
@ -1064,7 +1064,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/7 already ready";
}
@ -1086,7 +1086,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/7 already ready";
}
@ -1108,7 +1108,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/7 already ready";
}
@ -1130,7 +1130,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 5/7 already ready";
}
@ -1152,7 +1152,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 6/7 already ready";
}
@ -1174,7 +1174,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 7/7 already ready";
}
@ -1341,7 +1341,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/8 already ready";
}
@ -1363,7 +1363,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/8 already ready";
}
@ -1385,7 +1385,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/8 already ready";
}
@ -1407,7 +1407,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/8 already ready";
}
@ -1429,7 +1429,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 5/8 already ready";
}
@ -1451,7 +1451,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 6/8 already ready";
}
@ -1473,7 +1473,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 7/8 already ready";
}
@ -1495,7 +1495,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 8/8 already ready";
}
@ -1677,7 +1677,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 1/9 already ready";
}
@ -1699,7 +1699,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 2/9 already ready";
}
@ -1721,7 +1721,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 3/9 already ready";
}
@ -1743,7 +1743,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 4/9 already ready";
}
@ -1765,7 +1765,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 5/9 already ready";
}
@ -1787,7 +1787,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 6/9 already ready";
}
@ -1809,7 +1809,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 7/9 already ready";
}
@ -1831,7 +1831,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 8/9 already ready";
}
@ -1853,7 +1853,7 @@ struct JoinState<Traits, P0, P1, P2, P3, P4, P5, P6, P7, P8> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2)
<< "join[" << this << "]: joint 9/9 already ready";
}

2457
src/core/lib/promise/detail/seq_state.h
View File

File diff suppressed because it is too large Load Diff

2
tools/codegen/core/gen_join.py
Unescape View File

@ -79,7 +79,7 @@ struct JoinState<Traits, ${",".join(f"P{i}" for i in range(0,n))}> {
return Traits::template EarlyReturn<Result>(std::move(*p));
}
}
} else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
} else {
GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: joint ${i+1}/${n} already ready";
}
% endfor

16
tools/codegen/core/gen_seq.py
Unescape View File

@ -133,21 +133,17 @@ tail${i}:
switch (state) {
% for i in range(0,n-1):
case State::kState${i}: {
if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
VLOG(2).AtLocation(whence.file(), whence.line())
GRPC_TRACE_VLOG(promise_primitives, 2).AtLocation(whence.file(), whence.line())
<< "seq[" << this << "]: begin poll step ${i+1}/${n}";
}
auto result = ${"prior."*(n-1-i)}current_promise();
PromiseResult${i}* p = result.value_if_ready();
if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
VLOG(2).AtLocation(whence.file(), whence.line())
GRPC_TRACE_VLOG(promise_primitives, 2).AtLocation(whence.file(), whence.line())
<< "seq[" << this << "]: poll step ${i+1}/${n} gets "
<< (p != nullptr
? (PromiseResultTraits${i}::IsOk(*p)
? "ready"
: absl::StrCat("early-error:", PromiseResultTraits${i}::ErrorString(*p)).c_str())
: "pending");
}
if (p == nullptr) return Pending{};
if (!PromiseResultTraits${i}::IsOk(*p)) {
return PromiseResultTraits${i}::template ReturnValue<Result>(std::move(*p));
@ -162,16 +158,12 @@ tail${i}:
% endfor
default:
case State::kState${n-1}: {
if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
VLOG(2).AtLocation(whence.file(), whence.line())
GRPC_TRACE_VLOG(promise_primitives, 2).AtLocation(whence.file(), whence.line())
<< "seq[" << this << "]: begin poll step ${n}/${n}";
}
auto result = current_promise();
if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) {
VLOG(2).AtLocation(whence.file(), whence.line())
GRPC_TRACE_VLOG(promise_primitives, 2).AtLocation(whence.file(), whence.line())
<< "seq[" << this << "]: poll step ${n}/${n} gets "
<< (result.ready()? "ready" : "pending");
}
auto* p = result.value_if_ready();
if (p == nullptr) return Pending{};
return Result(std::move(*p));

Write Preview
Loading…
Cancel
Save