Merge branch 'transport-refs-4' into transport-refs-5

pull/36632/head
Craig Tiller 10 months ago
commit fd57b7be0c
  1. 3
      src/core/ext/filters/logging/logging_filter.cc
  2. 3
      src/core/ext/filters/logging/logging_filter.h
  3. 17
      src/core/lib/channel/promise_based_filter.h

@ -424,8 +424,7 @@ ServerLoggingFilter::Create(const ChannelArgs& /*args*/,
}
// Construct a promise for one call.
void ServerLoggingFilter::Call::OnClientInitialMetadata(
ClientMetadata& md, ServerLoggingFilter* filter) {
void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) {
call_data_.emplace(false, md, "");
if (!call_data_->ShouldLog()) {
call_data_.reset();

@ -113,8 +113,7 @@ class ServerLoggingFilter final
class Call {
public:
void OnClientInitialMetadata(ClientMetadata& md,
ServerLoggingFilter* filter);
void OnClientInitialMetadata(ClientMetadata& md);
void OnServerInitialMetadata(ServerMetadata& md);
void OnServerTrailingMetadata(ServerMetadata& md);
void OnClientToServerMessage(const Message& message);

@ -537,7 +537,7 @@ auto RunCall(Interceptor interceptor, CallArgs call_args,
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
void (Derived::Call::*fn)(const Message&),
FilterCallData<Derived>* call_data, const CallArgs& call_args) {
FilterCallData<Derived>* call_data, const CallArgs&) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
call_data->call.OnClientToServerMessage(*msg);
@ -548,7 +548,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
ServerMetadataHandle (Derived::Call::*fn)(const Message&),
FilterCallData<Derived>* call_data, const CallArgs& call_args) {
FilterCallData<Derived>* call_data, const CallArgs&) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
auto return_md = call_data->call.OnClientToServerMessage(*msg);
@ -562,7 +562,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
ServerMetadataHandle (Derived::Call::*fn)(const Message&, Derived*),
FilterCallData<Derived>* call_data, const CallArgs& call_args) {
FilterCallData<Derived>* call_data, const CallArgs&) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
auto return_md =
@ -577,7 +577,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
FilterCallData<Derived>* call_data, const CallArgs& call_args) {
FilterCallData<Derived>* call_data, const CallArgs&) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
return call_data->call.OnClientToServerMessage(std::move(msg),
@ -588,7 +588,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
absl::StatusOr<MessageHandle> (Derived::Call::*fn)(MessageHandle, Derived*),
FilterCallData<Derived>* call_data, const CallArgs& call_args) {
FilterCallData<Derived>* call_data, const CallArgs&) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call_data](MessageHandle msg) -> absl::optional<MessageHandle> {
auto r = call_data->call.OnClientToServerMessage(std::move(msg),
@ -611,7 +611,7 @@ inline void InterceptClientToServerMessage(HookFunction hook,
template <typename Derived, typename HookFunction>
inline void InterceptClientToServerMessage(HookFunction hook,
void (Derived::Call::*half_close)(),
void (Derived::Call::*)(),
FilterCallData<Derived>* call_data,
const CallArgs& call_args) {
call_args.client_to_server_messages->InterceptAndMapWithHalfClose(
@ -642,7 +642,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
void (Derived::Call::*fn)(const Message&), typename Derived::Call* call,
Derived*, PipeBasedCallSpine* call_spine) {
Derived*, PipeBasedCallSpine*) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call](MessageHandle msg) -> absl::optional<MessageHandle> {
call->OnClientToServerMessage(*msg);
@ -668,8 +668,7 @@ inline auto InterceptClientToServerMessageHandler(
template <typename Derived>
inline auto InterceptClientToServerMessageHandler(
MessageHandle (Derived::Call::*fn)(MessageHandle, Derived*),
typename Derived::Call* call, Derived* channel,
PipeBasedCallSpine* call_spine) {
typename Derived::Call* call, Derived* channel, PipeBasedCallSpine*) {
DCHECK(fn == &Derived::Call::OnClientToServerMessage);
return [call, channel](MessageHandle msg) {
return call->OnClientToServerMessage(std::move(msg), channel);

Loading…
Cancel
Save