grpc 1.28.0 → 1.36.0

data/src/core/ext/filters/deadline/deadline_filter.h

@@ -22,26 +22,22 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/iomgr/timer.h"
 
-enum grpc_deadline_timer_state {
-  GRPC_DEADLINE_STATE_INITIAL,
-  GRPC_DEADLINE_STATE_PENDING,
-  GRPC_DEADLINE_STATE_FINISHED
-};
+namespace grpc_core {
+class TimerState;
+}  // namespace grpc_core
 
 // State used for filters that enforce call deadlines.
 // Must be the first field in the filter's call_data.
 struct grpc_deadline_state {
-  grpc_deadline_state(grpc_call_element* elem, grpc_call_stack* call_stack,
-                      grpc_core::CallCombiner* call_combiner,
-                      grpc_millis deadline);
+  grpc_deadline_state(grpc_call_element* elem,
+                      const grpc_call_element_args& args, grpc_millis deadline);
   ~grpc_deadline_state();
 
   // We take a reference to the call stack for the timer callback.
   grpc_call_stack* call_stack;
   grpc_core::CallCombiner* call_combiner;
-  grpc_deadline_timer_state timer_state = GRPC_DEADLINE_STATE_INITIAL;
-  grpc_timer timer;
-  grpc_closure timer_callback;
+  grpc_core::Arena* arena;
+  grpc_core::TimerState* timer_state = nullptr;
   // Closure to invoke when we receive trailing metadata.
   // We use this to cancel the timer.
   grpc_closure recv_trailing_metadata_ready;

data/src/core/ext/filters/http/client/http_client_filter.cc

@@ -17,11 +17,19 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 #include <stdint.h>
 #include <string.h>
+
+#include <string>
+#include <vector>
+
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
@@ -31,10 +39,11 @@
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/transport/static_metadata.h"
+#include "src/core/lib/transport/status_conversion.h"
 #include "src/core/lib/transport/transport_impl.h"
 
 #define EXPECTED_CONTENT_TYPE "application/grpc"
-#define EXPECTED_CONTENT_TYPE_LENGTH sizeof(EXPECTED_CONTENT_TYPE) - 1
+#define EXPECTED_CONTENT_TYPE_LENGTH (sizeof(EXPECTED_CONTENT_TYPE) - 1)
 
 /* default maximum size of payload eligible for GET request */
 static constexpr size_t kMaxPayloadSizeForGet = 2048;
@@ -112,18 +121,19 @@ static grpc_error* client_filter_incoming_metadata(grpc_metadata_batch* b) {
     } else {
       char* val = grpc_dump_slice(GRPC_MDVALUE(b->idx.named.status->md),
                                   GPR_DUMP_ASCII);
-      char* msg;
-      gpr_asprintf(&msg, "Received http2 header with status: %s", val);
+      std::string msg =
+          absl::StrCat("Received http2 header with status: ", val);
       grpc_error* e = grpc_error_set_str(
           grpc_error_set_int(
               grpc_error_set_str(
                   GRPC_ERROR_CREATE_FROM_STATIC_STRING(
                       "Received http2 :status header with non-200 OK status"),
                   GRPC_ERROR_STR_VALUE, grpc_slice_from_copied_string(val)),
-              GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_CANCELLED),
-          GRPC_ERROR_STR_GRPC_MESSAGE, grpc_slice_from_copied_string(msg));
+              GRPC_ERROR_INT_GRPC_STATUS,
+              grpc_http2_status_to_grpc_status(atoi(val))),
+          GRPC_ERROR_STR_GRPC_MESSAGE,
+          grpc_slice_from_cpp_string(std::move(msg)));
       gpr_free(val);
-      gpr_free(msg);
       return e;
     }
   }
@@ -518,51 +528,36 @@ static size_t max_payload_size_from_args(const grpc_channel_args* args) {
 
 static grpc_core::ManagedMemorySlice user_agent_from_args(
     const grpc_channel_args* args, const char* transport_name) {
-  gpr_strvec v;
-  size_t i;
-  int is_first = 1;
-  char* tmp;
+  std::vector<std::string> user_agent_fields;
 
-  gpr_strvec_init(&v);
-
-  for (i = 0; args && i < args->num_args; i++) {
+  for (size_t i = 0; args && i < args->num_args; i++) {
     if (0 == strcmp(args->args[i].key, GRPC_ARG_PRIMARY_USER_AGENT_STRING)) {
       if (args->args[i].type != GRPC_ARG_STRING) {
         gpr_log(GPR_ERROR, "Channel argument '%s' should be a string",
                 GRPC_ARG_PRIMARY_USER_AGENT_STRING);
       } else {
-        if (!is_first) gpr_strvec_add(&v, gpr_strdup(" "));
-        is_first = 0;
-        gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string));
+        user_agent_fields.push_back(args->args[i].value.string);
       }
     }
   }
 
-  gpr_asprintf(&tmp, "%sgrpc-c/%s (%s; %s; %s)", is_first ? "" : " ",
-               grpc_version_string(), GPR_PLATFORM_STRING, transport_name,
-               grpc_g_stands_for());
-  is_first = 0;
-  gpr_strvec_add(&v, tmp);
+  user_agent_fields.push_back(
+      absl::StrFormat("grpc-c/%s (%s; %s)", grpc_version_string(),
+                      GPR_PLATFORM_STRING, transport_name));
 
-  for (i = 0; args && i < args->num_args; i++) {
+  for (size_t i = 0; args && i < args->num_args; i++) {
     if (0 == strcmp(args->args[i].key, GRPC_ARG_SECONDARY_USER_AGENT_STRING)) {
       if (args->args[i].type != GRPC_ARG_STRING) {
         gpr_log(GPR_ERROR, "Channel argument '%s' should be a string",
                 GRPC_ARG_SECONDARY_USER_AGENT_STRING);
       } else {
-        if (!is_first) gpr_strvec_add(&v, gpr_strdup(" "));
-        is_first = 0;
-        gpr_strvec_add(&v, gpr_strdup(args->args[i].value.string));
+        user_agent_fields.push_back(args->args[i].value.string);
       }
     }
   }
 
-  tmp = gpr_strvec_flatten(&v, nullptr);
-  gpr_strvec_destroy(&v);
-  grpc_core::ManagedMemorySlice result(tmp);
-  gpr_free(tmp);
-
-  return result;
+  std::string user_agent_string = absl::StrJoin(user_agent_fields, " ");
+  return grpc_core::ManagedMemorySlice(user_agent_string.c_str());
 }
 
 /* Constructor for channel_data */

data/src/core/ext/filters/http/client_authority_filter.cc

@@ -53,13 +53,13 @@ void client_authority_start_transport_stream_op_batch(
   channel_data* chand = static_cast<channel_data*>(elem->channel_data);
   call_data* calld = static_cast<call_data*>(elem->call_data);
   // Handle send_initial_metadata.
-  auto* initial_metadata =
-      batch->payload->send_initial_metadata.send_initial_metadata;
   // If the initial metadata doesn't already contain :authority, add it.
   if (batch->send_initial_metadata &&
-      initial_metadata->idx.named.authority == nullptr) {
+      batch->payload->send_initial_metadata.send_initial_metadata->idx.named
+              .authority == nullptr) {
     grpc_error* error = grpc_metadata_batch_add_head(
-        initial_metadata, &calld->authority_storage,
+        batch->payload->send_initial_metadata.send_initial_metadata,
+        &calld->authority_storage,
         GRPC_MDELEM_REF(chand->default_authority_mdelem), GRPC_BATCH_AUTHORITY);
     if (error != GRPC_ERROR_NONE) {
       grpc_transport_stream_op_batch_finish_with_failure(batch, error,
@@ -148,12 +148,12 @@ static bool add_client_authority_filter(grpc_channel_stack_builder* builder,
 }
 
 void grpc_client_authority_filter_init(void) {
-  grpc_channel_init_register_stage(GRPC_CLIENT_SUBCHANNEL, INT_MAX,
-                                   add_client_authority_filter,
-                                   (void*)&grpc_client_authority_filter);
-  grpc_channel_init_register_stage(GRPC_CLIENT_DIRECT_CHANNEL, INT_MAX,
-                                   add_client_authority_filter,
-                                   (void*)&grpc_client_authority_filter);
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_SUBCHANNEL, INT_MAX, add_client_authority_filter,
+      const_cast<grpc_channel_filter*>(&grpc_client_authority_filter));
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_DIRECT_CHANNEL, INT_MAX, add_client_authority_filter,
+      const_cast<grpc_channel_filter*>(&grpc_client_authority_filter));
 }
 
 void grpc_client_authority_filter_shutdown(void) {}

data/src/core/ext/filters/http/http_filters_plugin.cc

@@ -22,26 +22,32 @@
 
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_decompress_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/transport/transport_impl.h"
 
-typedef struct {
+struct optional_filter {
   const grpc_channel_filter* filter;
   const char* control_channel_arg;
-} optional_filter;
+};
 
 static optional_filter compress_filter = {
     &grpc_message_compress_filter, GRPC_ARG_ENABLE_PER_MESSAGE_COMPRESSION};
 
+static optional_filter decompress_filter = {
+    &grpc_core::MessageDecompressFilter,
+    GRPC_ARG_ENABLE_PER_MESSAGE_DECOMPRESSION};
+
 static bool is_building_http_like_transport(
     grpc_channel_stack_builder* builder) {
   grpc_transport* t = grpc_channel_stack_builder_get_transport(builder);
   return t != nullptr && strstr(t->vtable->name, "http");
 }
 
+template <bool enable_in_minimal_stack>
 static bool maybe_add_optional_filter(grpc_channel_stack_builder* builder,
                                       void* arg) {
   if (!is_building_http_like_transport(builder)) return true;
@@ -50,7 +56,8 @@ static bool maybe_add_optional_filter(grpc_channel_stack_builder* builder,
       grpc_channel_stack_builder_get_channel_arguments(builder);
   bool enable = grpc_channel_arg_get_bool(
       grpc_channel_args_find(channel_args, filtarg->control_channel_arg),
-      !grpc_channel_args_want_minimal_stack(channel_args));
+      enable_in_minimal_stack ||
+          !grpc_channel_args_want_minimal_stack(channel_args));
   return enable ? grpc_channel_stack_builder_prepend_filter(
                       builder, filtarg->filter, nullptr, nullptr)
                 : true;
@@ -66,24 +73,36 @@ static bool maybe_add_required_filter(grpc_channel_stack_builder* builder,
 }
 
 void grpc_http_filters_init(void) {
-  grpc_channel_init_register_stage(GRPC_CLIENT_SUBCHANNEL,
-                                   GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-                                   maybe_add_optional_filter, &compress_filter);
-  grpc_channel_init_register_stage(GRPC_CLIENT_DIRECT_CHANNEL,
-                                   GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-                                   maybe_add_optional_filter, &compress_filter);
-  grpc_channel_init_register_stage(GRPC_SERVER_CHANNEL,
-                                   GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-                                   maybe_add_optional_filter, &compress_filter);
   grpc_channel_init_register_stage(
       GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-      maybe_add_required_filter, (void*)&grpc_http_client_filter);
+      maybe_add_optional_filter<false>, &compress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_optional_filter<false>, &compress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_optional_filter<false>, &compress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_optional_filter<true>, &decompress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_optional_filter<true>, &decompress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_optional_filter<true>, &decompress_filter);
+  grpc_channel_init_register_stage(
+      GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
+      maybe_add_required_filter,
+      const_cast<grpc_channel_filter*>(&grpc_http_client_filter));
   grpc_channel_init_register_stage(
       GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-      maybe_add_required_filter, (void*)&grpc_http_client_filter);
+      maybe_add_required_filter,
+      const_cast<grpc_channel_filter*>(&grpc_http_client_filter));
   grpc_channel_init_register_stage(
       GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY,
-      maybe_add_required_filter, (void*)&grpc_http_server_filter);
+      maybe_add_required_filter,
+      const_cast<grpc_channel_filter*>(&grpc_http_server_filter));
 }
 
 void grpc_http_filters_shutdown(void) {}

data/src/core/ext/filters/http/message_compress/message_compress_filter.cc

@@ -21,6 +21,8 @@
 #include <assert.h>
 #include <string.h>
 
+#include "absl/types/optional.h"
+
 #include <grpc/compression.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
@@ -40,94 +42,156 @@
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/transport/static_metadata.h"
 
-static void start_send_message_batch(void* arg, grpc_error* unused);
-static void send_message_on_complete(void* arg, grpc_error* error);
-static void on_send_message_next_done(void* arg, grpc_error* error);
-
 namespace {
 
-struct channel_data {
+class ChannelData {
+ public:
+  explicit ChannelData(grpc_channel_element_args* args) {
+    // Get the enabled and the default algorithms from channel args.
+    enabled_compression_algorithms_bitset_ =
+        grpc_channel_args_compression_algorithm_get_states(args->channel_args);
+    default_compression_algorithm_ =
+        grpc_channel_args_get_channel_default_compression_algorithm(
+            args->channel_args);
+    // Make sure the default is enabled.
+    if (!GPR_BITGET(enabled_compression_algorithms_bitset_,
+                    default_compression_algorithm_)) {
+      const char* name;
+      GPR_ASSERT(grpc_compression_algorithm_name(default_compression_algorithm_,
+                                                 &name) == 1);
+      gpr_log(GPR_ERROR,
+              "default compression algorithm %s not enabled: switching to none",
+              name);
+      default_compression_algorithm_ = GRPC_COMPRESS_NONE;
+    }
+    enabled_message_compression_algorithms_bitset_ =
+        grpc_compression_bitset_to_message_bitset(
+            enabled_compression_algorithms_bitset_);
+    enabled_stream_compression_algorithms_bitset_ =
+        grpc_compression_bitset_to_stream_bitset(
+            enabled_compression_algorithms_bitset_);
+    GPR_ASSERT(!args->is_last);
+  }
+
+  grpc_compression_algorithm default_compression_algorithm() const {
+    return default_compression_algorithm_;
+  }
+
+  uint32_t enabled_compression_algorithms_bitset() const {
+    return enabled_compression_algorithms_bitset_;
+  }
+
+  uint32_t enabled_message_compression_algorithms_bitset() const {
+    return enabled_message_compression_algorithms_bitset_;
+  }
+
+  uint32_t enabled_stream_compression_algorithms_bitset() const {
+    return enabled_stream_compression_algorithms_bitset_;
+  }
+
+ private:
   /** The default, channel-level, compression algorithm */
-  grpc_compression_algorithm default_compression_algorithm;
+  grpc_compression_algorithm default_compression_algorithm_;
   /** Bitset of enabled compression algorithms */
-  uint32_t enabled_compression_algorithms_bitset;
+  uint32_t enabled_compression_algorithms_bitset_;
   /** Bitset of enabled message compression algorithms */
-  uint32_t enabled_message_compression_algorithms_bitset;
+  uint32_t enabled_message_compression_algorithms_bitset_;
   /** Bitset of enabled stream compression algorithms */
-  uint32_t enabled_stream_compression_algorithms_bitset;
+  uint32_t enabled_stream_compression_algorithms_bitset_;
 };
 
-struct call_data {
-  call_data(grpc_call_element* elem, const grpc_call_element_args& args)
-      : call_combiner(args.call_combiner) {
-    channel_data* channeld = static_cast<channel_data*>(elem->channel_data);
+class CallData {
+ public:
+  CallData(grpc_call_element* elem, const grpc_call_element_args& args)
+      : call_combiner_(args.call_combiner) {
+    ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data);
     // The call's message compression algorithm is set to channel's default
     // setting. It can be overridden later by initial metadata.
-    if (GPR_LIKELY(GPR_BITGET(channeld->enabled_compression_algorithms_bitset,
-                              channeld->default_compression_algorithm))) {
-      message_compression_algorithm =
+    if (GPR_LIKELY(GPR_BITGET(channeld->enabled_compression_algorithms_bitset(),
+                              channeld->default_compression_algorithm()))) {
+      message_compression_algorithm_ =
           grpc_compression_algorithm_to_message_compression_algorithm(
-              channeld->default_compression_algorithm);
+              channeld->default_compression_algorithm());
     }
-    GRPC_CLOSURE_INIT(&start_send_message_batch_in_call_combiner,
-                      start_send_message_batch, elem,
-                      grpc_schedule_on_exec_ctx);
+    GRPC_CLOSURE_INIT(&start_send_message_batch_in_call_combiner_,
+                      StartSendMessageBatch, elem, grpc_schedule_on_exec_ctx);
   }
 
-  ~call_data() {
-    if (state_initialized) {
-      grpc_slice_buffer_destroy_internal(&slices);
+  ~CallData() {
+    if (state_initialized_) {
+      grpc_slice_buffer_destroy_internal(&slices_);
     }
-    GRPC_ERROR_UNREF(cancel_error);
+    GRPC_ERROR_UNREF(cancel_error_);
   }
 
-  grpc_core::CallCombiner* call_combiner;
-  grpc_message_compression_algorithm message_compression_algorithm =
+  void CompressStartTransportStreamOpBatch(
+      grpc_call_element* elem, grpc_transport_stream_op_batch* batch);
+
+ private:
+  bool SkipMessageCompression();
+  void InitializeState(grpc_call_element* elem);
+
+  grpc_error* ProcessSendInitialMetadata(grpc_call_element* elem,
+                                         grpc_metadata_batch* initial_metadata);
+
+  // Methods for processing a send_message batch
+  static void StartSendMessageBatch(void* elem_arg, grpc_error* unused);
+  static void OnSendMessageNextDone(void* elem_arg, grpc_error* error);
+  grpc_error* PullSliceFromSendMessage();
+  void ContinueReadingSendMessage(grpc_call_element* elem);
+  void FinishSendMessage(grpc_call_element* elem);
+  void SendMessageBatchContinue(grpc_call_element* elem);
+  static void FailSendMessageBatchInCallCombiner(void* calld_arg,
+                                                 grpc_error* error);
+
+  static void SendMessageOnComplete(void* calld_arg, grpc_error* error);
+
+  grpc_core::CallCombiner* call_combiner_;
+  grpc_message_compression_algorithm message_compression_algorithm_ =
       GRPC_MESSAGE_COMPRESS_NONE;
-  grpc_error* cancel_error = GRPC_ERROR_NONE;
-  grpc_transport_stream_op_batch* send_message_batch = nullptr;
-  bool seen_initial_metadata = false;
+  grpc_error* cancel_error_ = GRPC_ERROR_NONE;
+  grpc_transport_stream_op_batch* send_message_batch_ = nullptr;
+  bool seen_initial_metadata_ = false;
   /* Set to true, if the fields below are initialized. */
-  bool state_initialized = false;
-  grpc_closure start_send_message_batch_in_call_combiner;
+  bool state_initialized_ = false;
+  grpc_closure start_send_message_batch_in_call_combiner_;
   /* The fields below are only initialized when we compress the payload.
    * Keep them at the bottom of the struct, so they don't pollute the
    * cache-lines. */
-  grpc_linked_mdelem message_compression_algorithm_storage;
-  grpc_linked_mdelem stream_compression_algorithm_storage;
-  grpc_linked_mdelem accept_encoding_storage;
-  grpc_linked_mdelem accept_stream_encoding_storage;
-  grpc_slice_buffer slices; /**< Buffers up input slices to be compressed */
-  grpc_core::ManualConstructor<grpc_core::SliceBufferByteStream>
-      replacement_stream;
-  grpc_closure* original_send_message_on_complete;
-  grpc_closure send_message_on_complete;
-  grpc_closure on_send_message_next_done;
+  grpc_linked_mdelem message_compression_algorithm_storage_;
+  grpc_linked_mdelem stream_compression_algorithm_storage_;
+  grpc_linked_mdelem accept_encoding_storage_;
+  grpc_linked_mdelem accept_stream_encoding_storage_;
+  grpc_slice_buffer slices_; /**< Buffers up input slices to be compressed */
+  // Allocate space for the replacement stream
+  std::aligned_storage<sizeof(grpc_core::SliceBufferByteStream),
+                       alignof(grpc_core::SliceBufferByteStream)>::type
+      replacement_stream_;
+  grpc_closure* original_send_message_on_complete_ = nullptr;
+  grpc_closure send_message_on_complete_;
+  grpc_closure on_send_message_next_done_;
 };
 
-}  // namespace
-
 // Returns true if we should skip message compression for the current message.
-static bool skip_message_compression(grpc_call_element* elem) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
+bool CallData::SkipMessageCompression() {
   // If the flags of this message indicate that it shouldn't be compressed, we
   // skip message compression.
   uint32_t flags =
-      calld->send_message_batch->payload->send_message.send_message->flags();
+      send_message_batch_->payload->send_message.send_message->flags();
   if (flags & (GRPC_WRITE_NO_COMPRESS | GRPC_WRITE_INTERNAL_COMPRESS)) {
     return true;
   }
   // If this call doesn't have any message compression algorithm set, skip
   // message compression.
-  return calld->message_compression_algorithm == GRPC_MESSAGE_COMPRESS_NONE;
+  return message_compression_algorithm_ == GRPC_MESSAGE_COMPRESS_NONE;
 }
 
 // Determines the compression algorithm from the initial metadata and the
 // channel's default setting.
-static grpc_compression_algorithm find_compression_algorithm(
-    grpc_metadata_batch* initial_metadata, channel_data* channeld) {
+grpc_compression_algorithm FindCompressionAlgorithm(
+    grpc_metadata_batch* initial_metadata, ChannelData* channeld) {
   if (initial_metadata->idx.named.grpc_internal_encoding_request == nullptr) {
-    return channeld->default_compression_algorithm;
+    return channeld->default_compression_algorithm();
   }
   grpc_compression_algorithm compression_algorithm;
   // Parse the compression algorithm from the initial metadata.
@@ -143,7 +207,7 @@ static grpc_compression_algorithm find_compression_algorithm(
   // enabled.
   // TODO(juanlishen): Maybe use channel default or abort() if the algorithm
   // from the initial metadata is disabled.
-  if (GPR_LIKELY(GPR_BITGET(channeld->enabled_compression_algorithms_bitset,
+  if (GPR_LIKELY(GPR_BITGET(channeld->enabled_compression_algorithms_bitset(),
                             compression_algorithm))) {
     return compression_algorithm;
   }
@@ -158,30 +222,24 @@ static grpc_compression_algorithm find_compression_algorithm(
   return GRPC_COMPRESS_NONE;
 }
 
-static void initialize_state(grpc_call_element* elem, call_data* calld) {
-  GPR_DEBUG_ASSERT(!calld->state_initialized);
-  calld->state_initialized = true;
-  grpc_slice_buffer_init(&calld->slices);
-  GRPC_CLOSURE_INIT(&calld->send_message_on_complete,
-                    ::send_message_on_complete, elem,
+void CallData::InitializeState(grpc_call_element* elem) {
+  GPR_DEBUG_ASSERT(!state_initialized_);
+  state_initialized_ = true;
+  grpc_slice_buffer_init(&slices_);
+  GRPC_CLOSURE_INIT(&send_message_on_complete_, SendMessageOnComplete, this,
                     grpc_schedule_on_exec_ctx);
-  GRPC_CLOSURE_INIT(&calld->on_send_message_next_done,
-                    ::on_send_message_next_done, elem,
+  GRPC_CLOSURE_INIT(&on_send_message_next_done_, OnSendMessageNextDone, elem,
                     grpc_schedule_on_exec_ctx);
 }
 
-static grpc_error* process_send_initial_metadata(
-    grpc_call_element* elem,
-    grpc_metadata_batch* initial_metadata) GRPC_MUST_USE_RESULT;
-static grpc_error* process_send_initial_metadata(
+grpc_error* CallData::ProcessSendInitialMetadata(
     grpc_call_element* elem, grpc_metadata_batch* initial_metadata) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  channel_data* channeld = static_cast<channel_data*>(elem->channel_data);
+  ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data);
   // Find the compression algorithm.
   grpc_compression_algorithm compression_algorithm =
-      find_compression_algorithm(initial_metadata, channeld);
+      FindCompressionAlgorithm(initial_metadata, channeld);
   // Note that at most one of the following algorithms can be set.
-  calld->message_compression_algorithm =
+  message_compression_algorithm_ =
       grpc_compression_algorithm_to_message_compression_algorithm(
           compression_algorithm);
   grpc_stream_compression_algorithm stream_compression_algorithm =
@@ -189,321 +247,300 @@ static grpc_error* process_send_initial_metadata(
           compression_algorithm);
   // Hint compression algorithm.
   grpc_error* error = GRPC_ERROR_NONE;
-  if (calld->message_compression_algorithm != GRPC_MESSAGE_COMPRESS_NONE) {
-    initialize_state(elem, calld);
+  if (message_compression_algorithm_ != GRPC_MESSAGE_COMPRESS_NONE) {
+    InitializeState(elem);
     error = grpc_metadata_batch_add_tail(
-        initial_metadata, &calld->message_compression_algorithm_storage,
+        initial_metadata, &message_compression_algorithm_storage_,
         grpc_message_compression_encoding_mdelem(
-            calld->message_compression_algorithm),
+            message_compression_algorithm_),
         GRPC_BATCH_GRPC_ENCODING);
   } else if (stream_compression_algorithm != GRPC_STREAM_COMPRESS_NONE) {
-    initialize_state(elem, calld);
+    InitializeState(elem);
     error = grpc_metadata_batch_add_tail(
-        initial_metadata, &calld->stream_compression_algorithm_storage,
+        initial_metadata, &stream_compression_algorithm_storage_,
         grpc_stream_compression_encoding_mdelem(stream_compression_algorithm),
         GRPC_BATCH_CONTENT_ENCODING);
   }
   if (error != GRPC_ERROR_NONE) return error;
   // Convey supported compression algorithms.
   error = grpc_metadata_batch_add_tail(
-      initial_metadata, &calld->accept_encoding_storage,
+      initial_metadata, &accept_encoding_storage_,
       GRPC_MDELEM_ACCEPT_ENCODING_FOR_ALGORITHMS(
-          channeld->enabled_message_compression_algorithms_bitset),
+          channeld->enabled_message_compression_algorithms_bitset()),
       GRPC_BATCH_GRPC_ACCEPT_ENCODING);
   if (error != GRPC_ERROR_NONE) return error;
   // Do not overwrite accept-encoding header if it already presents (e.g., added
   // by some proxy).
   if (!initial_metadata->idx.named.accept_encoding) {
     error = grpc_metadata_batch_add_tail(
-        initial_metadata, &calld->accept_stream_encoding_storage,
+        initial_metadata, &accept_stream_encoding_storage_,
         GRPC_MDELEM_ACCEPT_STREAM_ENCODING_FOR_ALGORITHMS(
-            channeld->enabled_stream_compression_algorithms_bitset),
+            channeld->enabled_stream_compression_algorithms_bitset()),
         GRPC_BATCH_ACCEPT_ENCODING);
   }
   return error;
 }
 
-static void send_message_on_complete(void* arg, grpc_error* error) {
-  grpc_call_element* elem = static_cast<grpc_call_element*>(arg);
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  grpc_slice_buffer_reset_and_unref_internal(&calld->slices);
+void CallData::SendMessageOnComplete(void* calld_arg, grpc_error* error) {
+  CallData* calld = static_cast<CallData*>(calld_arg);
+  grpc_slice_buffer_reset_and_unref_internal(&calld->slices_);
   grpc_core::Closure::Run(DEBUG_LOCATION,
-                          calld->original_send_message_on_complete,
+                          calld->original_send_message_on_complete_,
                           GRPC_ERROR_REF(error));
 }
 
-static void send_message_batch_continue(grpc_call_element* elem) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
+void CallData::SendMessageBatchContinue(grpc_call_element* elem) {
   // Note: The call to grpc_call_next_op() results in yielding the
-  // call combiner, so we need to clear calld->send_message_batch
-  // before we do that.
-  grpc_transport_stream_op_batch* send_message_batch =
-      calld->send_message_batch;
-  calld->send_message_batch = nullptr;
+  // call combiner, so we need to clear send_message_batch_ before we do that.
+  grpc_transport_stream_op_batch* send_message_batch = send_message_batch_;
+  send_message_batch_ = nullptr;
   grpc_call_next_op(elem, send_message_batch);
 }
 
-static void finish_send_message(grpc_call_element* elem) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  GPR_DEBUG_ASSERT(calld->message_compression_algorithm !=
+void CallData::FinishSendMessage(grpc_call_element* elem) {
+  GPR_DEBUG_ASSERT(message_compression_algorithm_ !=
                    GRPC_MESSAGE_COMPRESS_NONE);
   // Compress the data if appropriate.
   grpc_slice_buffer tmp;
   grpc_slice_buffer_init(&tmp);
   uint32_t send_flags =
-      calld->send_message_batch->payload->send_message.send_message->flags();
-  bool did_compress = grpc_msg_compress(calld->message_compression_algorithm,
-                                        &calld->slices, &tmp);
+      send_message_batch_->payload->send_message.send_message->flags();
+  bool did_compress =
+      grpc_msg_compress(message_compression_algorithm_, &slices_, &tmp);
   if (did_compress) {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
       const char* algo_name;
-      const size_t before_size = calld->slices.length;
+      const size_t before_size = slices_.length;
       const size_t after_size = tmp.length;
       const float savings_ratio = 1.0f - static_cast<float>(after_size) /
                                              static_cast<float>(before_size);
       GPR_ASSERT(grpc_message_compression_algorithm_name(
-          calld->message_compression_algorithm, &algo_name));
+          message_compression_algorithm_, &algo_name));
       gpr_log(GPR_INFO,
               "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR
               " bytes (%.2f%% savings)",
               algo_name, before_size, after_size, 100 * savings_ratio);
     }
-    grpc_slice_buffer_swap(&calld->slices, &tmp);
+    grpc_slice_buffer_swap(&slices_, &tmp);
     send_flags |= GRPC_WRITE_INTERNAL_COMPRESS;
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
       const char* algo_name;
       GPR_ASSERT(grpc_message_compression_algorithm_name(
-          calld->message_compression_algorithm, &algo_name));
+          message_compression_algorithm_, &algo_name));
       gpr_log(GPR_INFO,
               "Algorithm '%s' enabled but decided not to compress. Input size: "
               "%" PRIuPTR,
-              algo_name, calld->slices.length);
+              algo_name, slices_.length);
     }
   }
   grpc_slice_buffer_destroy_internal(&tmp);
   // Swap out the original byte stream with our new one and send the
   // batch down.
-  calld->replacement_stream.Init(&calld->slices, send_flags);
-  calld->send_message_batch->payload->send_message.send_message.reset(
-      calld->replacement_stream.get());
-  calld->original_send_message_on_complete =
-      calld->send_message_batch->on_complete;
-  calld->send_message_batch->on_complete = &calld->send_message_on_complete;
-  send_message_batch_continue(elem);
+  new (&replacement_stream_)
+      grpc_core::SliceBufferByteStream(&slices_, send_flags);
+  send_message_batch_->payload->send_message.send_message.reset(
+      reinterpret_cast<grpc_core::SliceBufferByteStream*>(
+          &replacement_stream_));
+  original_send_message_on_complete_ = send_message_batch_->on_complete;
+  send_message_batch_->on_complete = &send_message_on_complete_;
+  SendMessageBatchContinue(elem);
 }
 
-static void fail_send_message_batch_in_call_combiner(void* arg,
-                                                     grpc_error* error) {
-  call_data* calld = static_cast<call_data*>(arg);
-  if (calld->send_message_batch != nullptr) {
+void CallData::FailSendMessageBatchInCallCombiner(void* calld_arg,
+                                                  grpc_error* error) {
+  CallData* calld = static_cast<CallData*>(calld_arg);
+  if (calld->send_message_batch_ != nullptr) {
     grpc_transport_stream_op_batch_finish_with_failure(
-        calld->send_message_batch, GRPC_ERROR_REF(error), calld->call_combiner);
-    calld->send_message_batch = nullptr;
+        calld->send_message_batch_, GRPC_ERROR_REF(error),
+        calld->call_combiner_);
+    calld->send_message_batch_ = nullptr;
   }
 }
 
-// Pulls a slice from the send_message byte stream and adds it to calld->slices.
-static grpc_error* pull_slice_from_send_message(call_data* calld) {
+// Pulls a slice from the send_message byte stream and adds it to slices_.
+grpc_error* CallData::PullSliceFromSendMessage() {
   grpc_slice incoming_slice;
   grpc_error* error =
-      calld->send_message_batch->payload->send_message.send_message->Pull(
+      send_message_batch_->payload->send_message.send_message->Pull(
           &incoming_slice);
   if (error == GRPC_ERROR_NONE) {
-    grpc_slice_buffer_add(&calld->slices, incoming_slice);
+    grpc_slice_buffer_add(&slices_, incoming_slice);
   }
   return error;
 }
 
 // Reads as many slices as possible from the send_message byte stream.
-// If all data has been read, invokes finish_send_message().  Otherwise,
+// If all data has been read, invokes FinishSendMessage().  Otherwise,
 // an async call to ByteStream::Next() has been started, which will
-// eventually result in calling on_send_message_next_done().
-static void continue_reading_send_message(grpc_call_element* elem) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  if (calld->slices.length ==
-      calld->send_message_batch->payload->send_message.send_message->length()) {
-    finish_send_message(elem);
+// eventually result in calling OnSendMessageNextDone().
+void CallData::ContinueReadingSendMessage(grpc_call_element* elem) {
+  if (slices_.length ==
+      send_message_batch_->payload->send_message.send_message->length()) {
+    FinishSendMessage(elem);
     return;
   }
-  while (calld->send_message_batch->payload->send_message.send_message->Next(
-      ~static_cast<size_t>(0), &calld->on_send_message_next_done)) {
-    grpc_error* error = pull_slice_from_send_message(calld);
+  while (send_message_batch_->payload->send_message.send_message->Next(
+      ~static_cast<size_t>(0), &on_send_message_next_done_)) {
+    grpc_error* error = PullSliceFromSendMessage();
     if (error != GRPC_ERROR_NONE) {
       // Closure callback; does not take ownership of error.
-      fail_send_message_batch_in_call_combiner(calld, error);
+      FailSendMessageBatchInCallCombiner(this, error);
       GRPC_ERROR_UNREF(error);
       return;
     }
-    if (calld->slices.length == calld->send_message_batch->payload->send_message
-                                    .send_message->length()) {
-      finish_send_message(elem);
+    if (slices_.length ==
+        send_message_batch_->payload->send_message.send_message->length()) {
+      FinishSendMessage(elem);
       break;
     }
   }
 }
 
 // Async callback for ByteStream::Next().
-static void on_send_message_next_done(void* arg, grpc_error* error) {
-  grpc_call_element* elem = static_cast<grpc_call_element*>(arg);
-  call_data* calld = static_cast<call_data*>(elem->call_data);
+void CallData::OnSendMessageNextDone(void* elem_arg, grpc_error* error) {
+  grpc_call_element* elem = static_cast<grpc_call_element*>(elem_arg);
+  CallData* calld = static_cast<CallData*>(elem->call_data);
   if (error != GRPC_ERROR_NONE) {
     // Closure callback; does not take ownership of error.
-    fail_send_message_batch_in_call_combiner(calld, error);
+    FailSendMessageBatchInCallCombiner(calld, error);
     return;
   }
-  error = pull_slice_from_send_message(calld);
+  error = calld->PullSliceFromSendMessage();
   if (error != GRPC_ERROR_NONE) {
     // Closure callback; does not take ownership of error.
-    fail_send_message_batch_in_call_combiner(calld, error);
+    FailSendMessageBatchInCallCombiner(calld, error);
     GRPC_ERROR_UNREF(error);
     return;
   }
-  if (calld->slices.length ==
-      calld->send_message_batch->payload->send_message.send_message->length()) {
-    finish_send_message(elem);
+  if (calld->slices_.length == calld->send_message_batch_->payload->send_message
+                                   .send_message->length()) {
+    calld->FinishSendMessage(elem);
   } else {
-    continue_reading_send_message(elem);
+    calld->ContinueReadingSendMessage(elem);
   }
 }
 
-static void start_send_message_batch(void* arg, grpc_error* /*unused*/) {
-  grpc_call_element* elem = static_cast<grpc_call_element*>(arg);
-  if (skip_message_compression(elem)) {
-    send_message_batch_continue(elem);
+void CallData::StartSendMessageBatch(void* elem_arg, grpc_error* /*unused*/) {
+  grpc_call_element* elem = static_cast<grpc_call_element*>(elem_arg);
+  CallData* calld = static_cast<CallData*>(elem->call_data);
+  if (calld->SkipMessageCompression()) {
+    calld->SendMessageBatchContinue(elem);
   } else {
-    continue_reading_send_message(elem);
+    calld->ContinueReadingSendMessage(elem);
   }
 }
 
-static void compress_start_transport_stream_op_batch(
+void CallData::CompressStartTransportStreamOpBatch(
     grpc_call_element* elem, grpc_transport_stream_op_batch* batch) {
   GPR_TIMER_SCOPE("compress_start_transport_stream_op_batch", 0);
-  call_data* calld = static_cast<call_data*>(elem->call_data);
   // Handle cancel_stream.
   if (batch->cancel_stream) {
-    GRPC_ERROR_UNREF(calld->cancel_error);
-    calld->cancel_error =
-        GRPC_ERROR_REF(batch->payload->cancel_stream.cancel_error);
-    if (calld->send_message_batch != nullptr) {
-      if (!calld->seen_initial_metadata) {
+    GRPC_ERROR_UNREF(cancel_error_);
+    cancel_error_ = GRPC_ERROR_REF(batch->payload->cancel_stream.cancel_error);
+    if (send_message_batch_ != nullptr) {
+      if (!seen_initial_metadata_) {
         GRPC_CALL_COMBINER_START(
-            calld->call_combiner,
-            GRPC_CLOSURE_CREATE(fail_send_message_batch_in_call_combiner, calld,
+            call_combiner_,
+            GRPC_CLOSURE_CREATE(FailSendMessageBatchInCallCombiner, this,
                                 grpc_schedule_on_exec_ctx),
-            GRPC_ERROR_REF(calld->cancel_error), "failing send_message op");
+            GRPC_ERROR_REF(cancel_error_), "failing send_message op");
       } else {
-        calld->send_message_batch->payload->send_message.send_message->Shutdown(
-            GRPC_ERROR_REF(calld->cancel_error));
+        send_message_batch_->payload->send_message.send_message->Shutdown(
+            GRPC_ERROR_REF(cancel_error_));
       }
     }
-  } else if (calld->cancel_error != GRPC_ERROR_NONE) {
+  } else if (cancel_error_ != GRPC_ERROR_NONE) {
     grpc_transport_stream_op_batch_finish_with_failure(
-        batch, GRPC_ERROR_REF(calld->cancel_error), calld->call_combiner);
+        batch, GRPC_ERROR_REF(cancel_error_), call_combiner_);
     return;
   }
   // Handle send_initial_metadata.
   if (batch->send_initial_metadata) {
-    GPR_ASSERT(!calld->seen_initial_metadata);
-    grpc_error* error = process_send_initial_metadata(
+    GPR_ASSERT(!seen_initial_metadata_);
+    grpc_error* error = ProcessSendInitialMetadata(
         elem, batch->payload->send_initial_metadata.send_initial_metadata);
     if (error != GRPC_ERROR_NONE) {
       grpc_transport_stream_op_batch_finish_with_failure(batch, error,
-                                                         calld->call_combiner);
+                                                         call_combiner_);
       return;
     }
-    calld->seen_initial_metadata = true;
+    seen_initial_metadata_ = true;
     // If we had previously received a batch containing a send_message op,
     // handle it now.  Note that we need to re-enter the call combiner
     // for this, since we can't send two batches down while holding the
     // call combiner, since the connected_channel filter (at the bottom of
     // the call stack) will release the call combiner for each batch it sees.
-    if (calld->send_message_batch != nullptr) {
+    if (send_message_batch_ != nullptr) {
       GRPC_CALL_COMBINER_START(
-          calld->call_combiner,
-          &calld->start_send_message_batch_in_call_combiner, GRPC_ERROR_NONE,
-          "starting send_message after send_initial_metadata");
+          call_combiner_, &start_send_message_batch_in_call_combiner_,
+          GRPC_ERROR_NONE, "starting send_message after send_initial_metadata");
     }
   }
   // Handle send_message.
   if (batch->send_message) {
-    GPR_ASSERT(calld->send_message_batch == nullptr);
-    calld->send_message_batch = batch;
+    GPR_ASSERT(send_message_batch_ == nullptr);
+    send_message_batch_ = batch;
     // If we have not yet seen send_initial_metadata, then we have to
-    // wait.  We save the batch in calld and then drop the call
-    // combiner, which we'll have to pick up again later when we get
-    // send_initial_metadata.
-    if (!calld->seen_initial_metadata) {
+    // wait.  We save the batch and then drop the call combiner, which we'll
+    // have to pick up again later when we get send_initial_metadata.
+    if (!seen_initial_metadata_) {
       GRPC_CALL_COMBINER_STOP(
-          calld->call_combiner,
-          "send_message batch pending send_initial_metadata");
+          call_combiner_, "send_message batch pending send_initial_metadata");
       return;
     }
-    start_send_message_batch(elem, GRPC_ERROR_NONE);
+    StartSendMessageBatch(elem, GRPC_ERROR_NONE);
   } else {
     // Pass control down the stack.
     grpc_call_next_op(elem, batch);
   }
 }
 
+void CompressStartTransportStreamOpBatch(
+    grpc_call_element* elem, grpc_transport_stream_op_batch* batch) {
+  CallData* calld = static_cast<CallData*>(elem->call_data);
+  calld->CompressStartTransportStreamOpBatch(elem, batch);
+}
+
 /* Constructor for call_data */
-static grpc_error* compress_init_call_elem(grpc_call_element* elem,
-                                           const grpc_call_element_args* args) {
-  new (elem->call_data) call_data(elem, *args);
+grpc_error* CompressInitCallElem(grpc_call_element* elem,
+                                 const grpc_call_element_args* args) {
+  new (elem->call_data) CallData(elem, *args);
   return GRPC_ERROR_NONE;
 }
 
 /* Destructor for call_data */
-static void compress_destroy_call_elem(
-    grpc_call_element* elem, const grpc_call_final_info* /*final_info*/,
-    grpc_closure* /*ignored*/) {
-  call_data* calld = static_cast<call_data*>(elem->call_data);
-  calld->~call_data();
+void CompressDestroyCallElem(grpc_call_element* elem,
+                             const grpc_call_final_info* /*final_info*/,
+                             grpc_closure* /*ignored*/) {
+  CallData* calld = static_cast<CallData*>(elem->call_data);
+  calld->~CallData();
 }
 
-/* Constructor for channel_data */
-static grpc_error* compress_init_channel_elem(grpc_channel_element* elem,
-                                              grpc_channel_element_args* args) {
-  channel_data* channeld = static_cast<channel_data*>(elem->channel_data);
-  // Get the enabled and the default algorithms from channel args.
-  channeld->enabled_compression_algorithms_bitset =
-      grpc_channel_args_compression_algorithm_get_states(args->channel_args);
-  channeld->default_compression_algorithm =
-      grpc_channel_args_get_channel_default_compression_algorithm(
-          args->channel_args);
-  // Make sure the default is enabled.
-  if (!GPR_BITGET(channeld->enabled_compression_algorithms_bitset,
-                  channeld->default_compression_algorithm)) {
-    const char* name;
-    GPR_ASSERT(grpc_compression_algorithm_name(
-                   channeld->default_compression_algorithm, &name) == 1);
-    gpr_log(GPR_ERROR,
-            "default compression algorithm %s not enabled: switching to none",
-            name);
-    channeld->default_compression_algorithm = GRPC_COMPRESS_NONE;
-  }
-  channeld->enabled_message_compression_algorithms_bitset =
-      grpc_compression_bitset_to_message_bitset(
-          channeld->enabled_compression_algorithms_bitset);
-  channeld->enabled_stream_compression_algorithms_bitset =
-      grpc_compression_bitset_to_stream_bitset(
-          channeld->enabled_compression_algorithms_bitset);
-  GPR_ASSERT(!args->is_last);
+/* Constructor for ChannelData */
+grpc_error* CompressInitChannelElem(grpc_channel_element* elem,
+                                    grpc_channel_element_args* args) {
+  new (elem->channel_data) ChannelData(args);
   return GRPC_ERROR_NONE;
 }
 
 /* Destructor for channel data */
-static void compress_destroy_channel_elem(grpc_channel_element* /*elem*/) {}
+void CompressDestroyChannelElem(grpc_channel_element* elem) {
+  ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data);
+  channeld->~ChannelData();
+}
+
+}  // namespace
 
 const grpc_channel_filter grpc_message_compress_filter = {
-    compress_start_transport_stream_op_batch,
+    CompressStartTransportStreamOpBatch,
     grpc_channel_next_op,
-    sizeof(call_data),
-    compress_init_call_elem,
+    sizeof(CallData),
+    CompressInitCallElem,
     grpc_call_stack_ignore_set_pollset_or_pollset_set,
-    compress_destroy_call_elem,
-    sizeof(channel_data),
-    compress_init_channel_elem,
-    compress_destroy_channel_elem,
+    CompressDestroyCallElem,
+    sizeof(ChannelData),
+    CompressInitChannelElem,
+    CompressDestroyChannelElem,
     grpc_channel_next_get_info,
     "message_compress"};