grpc 1.18.0 → 1.19.0.pre1

data/src/core/ext/filters/client_channel/client_channel.h

@@ -60,7 +60,7 @@ void grpc_client_channel_watch_connectivity_state(
     grpc_closure* watcher_timer_init);
 
 /* Debug helper: pull the subchannel call from a call stack element */
-grpc_subchannel_call* grpc_client_channel_get_subchannel_call(
-    grpc_call_element* elem);
+grpc_core::RefCountedPtr<grpc_core::SubchannelCall>
+grpc_client_channel_get_subchannel_call(grpc_call_element* elem);
 
 #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H */

data/src/core/ext/filters/client_channel/client_channel_channelz.cc

@@ -113,12 +113,11 @@ RefCountedPtr<ChannelNode> ClientChannelNode::MakeClientChannelNode(
                                            is_top_level_channel);
 }
 
-SubchannelNode::SubchannelNode(grpc_subchannel* subchannel,
+SubchannelNode::SubchannelNode(Subchannel* subchannel,
                                size_t channel_tracer_max_nodes)
     : BaseNode(EntityType::kSubchannel),
       subchannel_(subchannel),
-      target_(
-          UniquePtr<char>(gpr_strdup(grpc_subchannel_get_target(subchannel_)))),
+      target_(UniquePtr<char>(gpr_strdup(subchannel_->GetTargetAddress()))),
       trace_(channel_tracer_max_nodes) {}
 
 SubchannelNode::~SubchannelNode() {}
@@ -128,8 +127,8 @@ void SubchannelNode::PopulateConnectivityState(grpc_json* json) {
   if (subchannel_ == nullptr) {
     state = GRPC_CHANNEL_SHUTDOWN;
   } else {
-    state = grpc_subchannel_check_connectivity(
-        subchannel_, nullptr, true /* inhibit_health_checking */);
+    state = subchannel_->CheckConnectivity(nullptr,
+                                           true /* inhibit_health_checking */);
   }
   json = grpc_json_create_child(nullptr, json, "state", nullptr,
                                 GRPC_JSON_OBJECT, false);
@@ -170,7 +169,7 @@ grpc_json* SubchannelNode::RenderJson() {
   call_counter_.PopulateCallCounts(json);
   json = top_level_json;
   // populate the child socket.
-  intptr_t socket_uuid = grpc_subchannel_get_child_socket_uuid(subchannel_);
+  intptr_t socket_uuid = subchannel_->GetChildSocketUuid();
   if (socket_uuid != 0) {
     grpc_json* array_parent = grpc_json_create_child(
         nullptr, json, "socketRef", nullptr, GRPC_JSON_ARRAY, false);

data/src/core/ext/filters/client_channel/client_channel_channelz.h

@@ -26,9 +26,10 @@
 #include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/channelz.h"
 
-typedef struct grpc_subchannel grpc_subchannel;
-
 namespace grpc_core {
+
+class Subchannel;
+
 namespace channelz {
 
 // Subtype of ChannelNode that overrides and provides client_channel specific
@@ -59,7 +60,7 @@ class ClientChannelNode : public ChannelNode {
 // Handles channelz bookkeeping for sockets
 class SubchannelNode : public BaseNode {
  public:
-  SubchannelNode(grpc_subchannel* subchannel, size_t channel_tracer_max_nodes);
+  SubchannelNode(Subchannel* subchannel, size_t channel_tracer_max_nodes);
   ~SubchannelNode() override;
 
   void MarkSubchannelDestroyed() {
@@ -84,7 +85,7 @@ class SubchannelNode : public BaseNode {
   void RecordCallSucceeded() { call_counter_.RecordCallSucceeded(); }
 
  private:
-  grpc_subchannel* subchannel_;
+  Subchannel* subchannel_;
   UniquePtr<char> target_;
   CallCountingHelper call_counter_;
   ChannelTrace trace_;

data/src/core/ext/filters/client_channel/client_channel_factory.cc

@@ -29,8 +29,8 @@ void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory) {
   factory->vtable->unref(factory);
 }
 
-grpc_subchannel* grpc_client_channel_factory_create_subchannel(
-    grpc_client_channel_factory* factory, const grpc_subchannel_args* args) {
+grpc_core::Subchannel* grpc_client_channel_factory_create_subchannel(
+    grpc_client_channel_factory* factory, const grpc_channel_args* args) {
   return factory->vtable->create_subchannel(factory, args);
 }
 

data/src/core/ext/filters/client_channel/client_channel_factory.h

@@ -48,8 +48,8 @@ struct grpc_client_channel_factory {
 struct grpc_client_channel_factory_vtable {
   void (*ref)(grpc_client_channel_factory* factory);
   void (*unref)(grpc_client_channel_factory* factory);
-  grpc_subchannel* (*create_subchannel)(grpc_client_channel_factory* factory,
-                                        const grpc_subchannel_args* args);
+  grpc_core::Subchannel* (*create_subchannel)(
+      grpc_client_channel_factory* factory, const grpc_channel_args* args);
   grpc_channel* (*create_client_channel)(grpc_client_channel_factory* factory,
                                          const char* target,
                                          grpc_client_channel_type type,
@@ -60,8 +60,8 @@ void grpc_client_channel_factory_ref(grpc_client_channel_factory* factory);
 void grpc_client_channel_factory_unref(grpc_client_channel_factory* factory);
 
 /** Create a new grpc_subchannel */
-grpc_subchannel* grpc_client_channel_factory_create_subchannel(
-    grpc_client_channel_factory* factory, const grpc_subchannel_args* args);
+grpc_core::Subchannel* grpc_client_channel_factory_create_subchannel(
+    grpc_client_channel_factory* factory, const grpc_channel_args* args);
 
 /** Create a new grpc_channel */
 grpc_channel* grpc_client_channel_factory_create_channel(

data/src/core/ext/filters/client_channel/client_channel_plugin.cc

@@ -26,13 +26,13 @@
 
 #include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/ext/filters/client_channel/client_channel_channelz.h"
+#include "src/core/ext/filters/client_channel/global_subchannel_pool.h"
 #include "src/core/ext/filters/client_channel/http_connect_handshaker.h"
 #include "src/core/ext/filters/client_channel/http_proxy.h"
 #include "src/core/ext/filters/client_channel/lb_policy_registry.h"
 #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
 #include "src/core/ext/filters/client_channel/resolver_registry.h"
 #include "src/core/ext/filters/client_channel/retry_throttle.h"
-#include "src/core/ext/filters/client_channel/subchannel_index.h"
 #include "src/core/lib/surface/channel_init.h"
 
 static bool append_filter(grpc_channel_stack_builder* builder, void* arg) {
@@ -54,7 +54,7 @@ void grpc_client_channel_init(void) {
   grpc_core::internal::ServerRetryThrottleMap::Init();
   grpc_proxy_mapper_registry_init();
   grpc_register_http_proxy_mapper();
-  grpc_subchannel_index_init();
+  grpc_core::GlobalSubchannelPool::Init();
   grpc_channel_init_register_stage(
       GRPC_CLIENT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, append_filter,
       (void*)&grpc_client_channel_filter);
@@ -62,7 +62,7 @@ void grpc_client_channel_init(void) {
 }
 
 void grpc_client_channel_shutdown(void) {
-  grpc_subchannel_index_shutdown();
+  grpc_core::GlobalSubchannelPool::Shutdown();
   grpc_channel_init_shutdown();
   grpc_proxy_mapper_registry_shutdown();
   grpc_core::internal::ServerRetryThrottleMap::Shutdown();

data/src/core/ext/filters/client_channel/global_subchannel_pool.cc

@@ -0,0 +1,176 @@
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/filters/client_channel/global_subchannel_pool.h"
+
+#include "src/core/ext/filters/client_channel/subchannel.h"
+
+namespace grpc_core {
+
+GlobalSubchannelPool::GlobalSubchannelPool() {
+  subchannel_map_ = grpc_avl_create(&subchannel_avl_vtable_);
+  gpr_mu_init(&mu_);
+}
+
+GlobalSubchannelPool::~GlobalSubchannelPool() {
+  gpr_mu_destroy(&mu_);
+  grpc_avl_unref(subchannel_map_, nullptr);
+}
+
+void GlobalSubchannelPool::Init() {
+  instance_ = New<RefCountedPtr<GlobalSubchannelPool>>(
+      MakeRefCounted<GlobalSubchannelPool>());
+}
+
+void GlobalSubchannelPool::Shutdown() {
+  // To ensure Init() was called before.
+  GPR_ASSERT(instance_ != nullptr);
+  // To ensure Shutdown() was not called before.
+  GPR_ASSERT(*instance_ != nullptr);
+  instance_->reset();
+  Delete(instance_);
+}
+
+RefCountedPtr<GlobalSubchannelPool> GlobalSubchannelPool::instance() {
+  GPR_ASSERT(instance_ != nullptr);
+  GPR_ASSERT(*instance_ != nullptr);
+  return *instance_;
+}
+
+Subchannel* GlobalSubchannelPool::RegisterSubchannel(SubchannelKey* key,
+                                                     Subchannel* constructed) {
+  Subchannel* c = nullptr;
+  // Compare and swap (CAS) loop:
+  while (c == nullptr) {
+    // Ref the shared map to have a local copy.
+    gpr_mu_lock(&mu_);
+    grpc_avl old_map = grpc_avl_ref(subchannel_map_, nullptr);
+    gpr_mu_unlock(&mu_);
+    // Check to see if a subchannel already exists.
+    c = static_cast<Subchannel*>(grpc_avl_get(old_map, key, nullptr));
+    if (c != nullptr) {
+      // The subchannel already exists. Reuse it.
+      c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "subchannel_register+reuse");
+      GRPC_SUBCHANNEL_UNREF(constructed, "subchannel_register+found_existing");
+      // Exit the CAS loop without modifying the shared map.
+    } else {
+      // There hasn't been such subchannel. Add one.
+      // Note that we should ref the old map first because grpc_avl_add() will
+      // unref it while we still need to access it later.
+      grpc_avl new_map = grpc_avl_add(
+          grpc_avl_ref(old_map, nullptr), New<SubchannelKey>(*key),
+          GRPC_SUBCHANNEL_WEAK_REF(constructed, "subchannel_register+new"),
+          nullptr);
+      // Try to publish the change to the shared map. It may happen (but
+      // unlikely) that some other thread has changed the shared map, so compare
+      // to make sure it's unchanged before swapping. Retry if it's changed.
+      gpr_mu_lock(&mu_);
+      if (old_map.root == subchannel_map_.root) {
+        GPR_SWAP(grpc_avl, new_map, subchannel_map_);
+        c = constructed;
+      }
+      gpr_mu_unlock(&mu_);
+      grpc_avl_unref(new_map, nullptr);
+    }
+    grpc_avl_unref(old_map, nullptr);
+  }
+  return c;
+}
+
+void GlobalSubchannelPool::UnregisterSubchannel(SubchannelKey* key) {
+  bool done = false;
+  // Compare and swap (CAS) loop:
+  while (!done) {
+    // Ref the shared map to have a local copy.
+    gpr_mu_lock(&mu_);
+    grpc_avl old_map = grpc_avl_ref(subchannel_map_, nullptr);
+    gpr_mu_unlock(&mu_);
+    // Remove the subchannel.
+    // Note that we should ref the old map first because grpc_avl_remove() will
+    // unref it while we still need to access it later.
+    grpc_avl new_map =
+        grpc_avl_remove(grpc_avl_ref(old_map, nullptr), key, nullptr);
+    // Try to publish the change to the shared map. It may happen (but
+    // unlikely) that some other thread has changed the shared map, so compare
+    // to make sure it's unchanged before swapping. Retry if it's changed.
+    gpr_mu_lock(&mu_);
+    if (old_map.root == subchannel_map_.root) {
+      GPR_SWAP(grpc_avl, new_map, subchannel_map_);
+      done = true;
+    }
+    gpr_mu_unlock(&mu_);
+    grpc_avl_unref(new_map, nullptr);
+    grpc_avl_unref(old_map, nullptr);
+  }
+}
+
+Subchannel* GlobalSubchannelPool::FindSubchannel(SubchannelKey* key) {
+  // Lock, and take a reference to the subchannel map.
+  // We don't need to do the search under a lock as AVL's are immutable.
+  gpr_mu_lock(&mu_);
+  grpc_avl index = grpc_avl_ref(subchannel_map_, nullptr);
+  gpr_mu_unlock(&mu_);
+  Subchannel* c = static_cast<Subchannel*>(grpc_avl_get(index, key, nullptr));
+  if (c != nullptr) GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "found_from_pool");
+  grpc_avl_unref(index, nullptr);
+  return c;
+}
+
+RefCountedPtr<GlobalSubchannelPool>* GlobalSubchannelPool::instance_ = nullptr;
+
+namespace {
+
+void sck_avl_destroy(void* p, void* user_data) {
+  SubchannelKey* key = static_cast<SubchannelKey*>(p);
+  Delete(key);
+}
+
+void* sck_avl_copy(void* p, void* unused) {
+  const SubchannelKey* key = static_cast<const SubchannelKey*>(p);
+  auto* new_key = New<SubchannelKey>(*key);
+  return static_cast<void*>(new_key);
+}
+
+long sck_avl_compare(void* a, void* b, void* unused) {
+  const SubchannelKey* key_a = static_cast<const SubchannelKey*>(a);
+  const SubchannelKey* key_b = static_cast<const SubchannelKey*>(b);
+  return key_a->Cmp(*key_b);
+}
+
+void scv_avl_destroy(void* p, void* user_data) {
+  GRPC_SUBCHANNEL_WEAK_UNREF((Subchannel*)p, "global_subchannel_pool");
+}
+
+void* scv_avl_copy(void* p, void* unused) {
+  GRPC_SUBCHANNEL_WEAK_REF((Subchannel*)p, "global_subchannel_pool");
+  return p;
+}
+
+}  // namespace
+
+const grpc_avl_vtable GlobalSubchannelPool::subchannel_avl_vtable_ = {
+    sck_avl_destroy,  // destroy_key
+    sck_avl_copy,     // copy_key
+    sck_avl_compare,  // compare_keys
+    scv_avl_destroy,  // destroy_value
+    scv_avl_copy      // copy_value
+};
+
+}  // namespace grpc_core

data/src/core/ext/filters/client_channel/global_subchannel_pool.h

@@ -0,0 +1,68 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
+#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
+
+namespace grpc_core {
+
+// The global subchannel pool. It shares subchannels among channels. There
+// should be only one instance of this class. Init() should be called once at
+// the filter initialization time; Shutdown() should be called once at the
+// filter shutdown time.
+// TODO(juanlishen): Enable subchannel retention.
+class GlobalSubchannelPool final : public SubchannelPoolInterface {
+ public:
+  // The ctor and dtor are not intended to use directly.
+  GlobalSubchannelPool();
+  ~GlobalSubchannelPool() override;
+
+  // Should be called exactly once at filter initialization time.
+  static void Init();
+  // Should be called exactly once at filter shutdown time.
+  static void Shutdown();
+
+  // Gets the singleton instance.
+  static RefCountedPtr<GlobalSubchannelPool> instance();
+
+  // Implements interface methods.
+  Subchannel* RegisterSubchannel(SubchannelKey* key,
+                                 Subchannel* constructed) override;
+  void UnregisterSubchannel(SubchannelKey* key) override;
+  Subchannel* FindSubchannel(SubchannelKey* key) override;
+
+ private:
+  // The singleton instance. (It's a pointer to RefCountedPtr so that this
+  // non-local static object can be trivially destructible.)
+  static RefCountedPtr<GlobalSubchannelPool>* instance_;
+
+  // The vtable for subchannel operations in an AVL tree.
+  static const grpc_avl_vtable subchannel_avl_vtable_;
+  // A map from subchannel key to subchannel.
+  grpc_avl subchannel_map_;
+  // To protect subchannel_map_.
+  gpr_mu mu_;
+};
+
+}  // namespace grpc_core
+
+#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_GLOBAL_SUBCHANNEL_POOL_H */

data/src/core/ext/filters/client_channel/health/health_check_client.cc

@@ -295,7 +295,9 @@ HealthCheckClient::CallState::~CallState() {
     gpr_log(GPR_INFO, "HealthCheckClient %p: destroying CallState %p",
             health_check_client_.get(), this);
   }
-  if (call_ != nullptr) GRPC_SUBCHANNEL_CALL_UNREF(call_, "call_ended");
+  // The subchannel call is in the arena, so reset the pointer before we destroy
+  // the arena.
+  call_.reset();
   for (size_t i = 0; i < GRPC_CONTEXT_COUNT; i++) {
     if (context_[i].destroy != nullptr) {
       context_[i].destroy(context_[i].value);
@@ -329,8 +331,8 @@ void HealthCheckClient::CallState::StartCall() {
       &call_combiner_,
       0,  // parent_data_size
   };
-  grpc_error* error =
-      health_check_client_->connected_subchannel_->CreateCall(args, &call_);
+  grpc_error* error = GRPC_ERROR_NONE;
+  call_ = health_check_client_->connected_subchannel_->CreateCall(args, &error);
   if (error != GRPC_ERROR_NONE) {
     gpr_log(GPR_ERROR,
             "HealthCheckClient %p CallState %p: error creating health "
@@ -423,14 +425,14 @@ void HealthCheckClient::CallState::StartBatchInCallCombiner(void* arg,
                                                             grpc_error* error) {
   grpc_transport_stream_op_batch* batch =
       static_cast<grpc_transport_stream_op_batch*>(arg);
-  grpc_subchannel_call* call =
-      static_cast<grpc_subchannel_call*>(batch->handler_private.extra_arg);
-  grpc_subchannel_call_process_op(call, batch);
+  SubchannelCall* call =
+      static_cast<SubchannelCall*>(batch->handler_private.extra_arg);
+  call->StartTransportStreamOpBatch(batch);
 }
 
 void HealthCheckClient::CallState::StartBatch(
     grpc_transport_stream_op_batch* batch) {
-  batch->handler_private.extra_arg = call_;
+  batch->handler_private.extra_arg = call_.get();
   GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner,
                     batch, grpc_schedule_on_exec_ctx);
   GRPC_CALL_COMBINER_START(&call_combiner_, &batch->handler_private.closure,
@@ -452,7 +454,7 @@ void HealthCheckClient::CallState::StartCancel(void* arg, grpc_error* error) {
       GRPC_CLOSURE_CREATE(OnCancelComplete, self, grpc_schedule_on_exec_ctx));
   batch->cancel_stream = true;
   batch->payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED;
-  grpc_subchannel_call_process_op(self->call_, batch);
+  self->call_->StartTransportStreamOpBatch(batch);
 }
 
 void HealthCheckClient::CallState::Cancel() {

data/src/core/ext/filters/client_channel/health/health_check_client.h

@@ -99,7 +99,7 @@ class HealthCheckClient : public InternallyRefCounted<HealthCheckClient> {
     grpc_call_context_element context_[GRPC_CONTEXT_COUNT] = {};
 
     // The streaming call to the backend. Always non-NULL.
-    grpc_subchannel_call* call_;
+    RefCountedPtr<SubchannelCall> call_;
 
     grpc_transport_stream_op_batch_payload payload_;
     grpc_transport_stream_op_batch batch_;

data/src/core/ext/filters/client_channel/http_connect_handshaker.cc

@@ -33,151 +33,160 @@
 #include "src/core/lib/channel/handshaker_registry.h"
 #include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/mutex_lock.h"
 #include "src/core/lib/http/format_request.h"
 #include "src/core/lib/http/parser.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/uri/uri_parser.h"
 
-typedef struct http_connect_handshaker {
-  // Base class.  Must be first.
-  grpc_handshaker base;
+namespace grpc_core {
 
-  gpr_refcount refcount;
-  gpr_mu mu;
+namespace {
 
-  bool shutdown;
+class HttpConnectHandshaker : public Handshaker {
+ public:
+  HttpConnectHandshaker();
+  void Shutdown(grpc_error* why) override;
+  void DoHandshake(grpc_tcp_server_acceptor* acceptor,
+                   grpc_closure* on_handshake_done,
+                   HandshakerArgs* args) override;
+  const char* name() const override { return "http_connect"; }
+
+ private:
+  virtual ~HttpConnectHandshaker();
+  void CleanupArgsForFailureLocked();
+  void HandshakeFailedLocked(grpc_error* error);
+  static void OnWriteDone(void* arg, grpc_error* error);
+  static void OnReadDone(void* arg, grpc_error* error);
+
+  gpr_mu mu_;
+
+  bool is_shutdown_ = false;
   // Endpoint and read buffer to destroy after a shutdown.
-  grpc_endpoint* endpoint_to_destroy;
-  grpc_slice_buffer* read_buffer_to_destroy;
+  grpc_endpoint* endpoint_to_destroy_ = nullptr;
+  grpc_slice_buffer* read_buffer_to_destroy_ = nullptr;
 
   // State saved while performing the handshake.
-  grpc_handshaker_args* args;
-  grpc_closure* on_handshake_done;
+  HandshakerArgs* args_ = nullptr;
+  grpc_closure* on_handshake_done_ = nullptr;
 
   // Objects for processing the HTTP CONNECT request and response.
-  grpc_slice_buffer write_buffer;
-  grpc_closure request_done_closure;
-  grpc_closure response_read_closure;
-  grpc_http_parser http_parser;
-  grpc_http_response http_response;
-} http_connect_handshaker;
+  grpc_slice_buffer write_buffer_;
+  grpc_closure request_done_closure_;
+  grpc_closure response_read_closure_;
+  grpc_http_parser http_parser_;
+  grpc_http_response http_response_;
+};
 
-// Unref and clean up handshaker.
-static void http_connect_handshaker_unref(http_connect_handshaker* handshaker) {
-  if (gpr_unref(&handshaker->refcount)) {
-    gpr_mu_destroy(&handshaker->mu);
-    if (handshaker->endpoint_to_destroy != nullptr) {
-      grpc_endpoint_destroy(handshaker->endpoint_to_destroy);
-    }
-    if (handshaker->read_buffer_to_destroy != nullptr) {
-      grpc_slice_buffer_destroy_internal(handshaker->read_buffer_to_destroy);
-      gpr_free(handshaker->read_buffer_to_destroy);
-    }
-    grpc_slice_buffer_destroy_internal(&handshaker->write_buffer);
-    grpc_http_parser_destroy(&handshaker->http_parser);
-    grpc_http_response_destroy(&handshaker->http_response);
-    gpr_free(handshaker);
+HttpConnectHandshaker::~HttpConnectHandshaker() {
+  gpr_mu_destroy(&mu_);
+  if (endpoint_to_destroy_ != nullptr) {
+    grpc_endpoint_destroy(endpoint_to_destroy_);
+  }
+  if (read_buffer_to_destroy_ != nullptr) {
+    grpc_slice_buffer_destroy_internal(read_buffer_to_destroy_);
+    gpr_free(read_buffer_to_destroy_);
   }
+  grpc_slice_buffer_destroy_internal(&write_buffer_);
+  grpc_http_parser_destroy(&http_parser_);
+  grpc_http_response_destroy(&http_response_);
 }
 
 // Set args fields to nullptr, saving the endpoint and read buffer for
 // later destruction.
-static void cleanup_args_for_failure_locked(
-    http_connect_handshaker* handshaker) {
-  handshaker->endpoint_to_destroy = handshaker->args->endpoint;
-  handshaker->args->endpoint = nullptr;
-  handshaker->read_buffer_to_destroy = handshaker->args->read_buffer;
-  handshaker->args->read_buffer = nullptr;
-  grpc_channel_args_destroy(handshaker->args->args);
-  handshaker->args->args = nullptr;
+void HttpConnectHandshaker::CleanupArgsForFailureLocked() {
+  endpoint_to_destroy_ = args_->endpoint;
+  args_->endpoint = nullptr;
+  read_buffer_to_destroy_ = args_->read_buffer;
+  args_->read_buffer = nullptr;
+  grpc_channel_args_destroy(args_->args);
+  args_->args = nullptr;
 }
 
 // If the handshake failed or we're shutting down, clean up and invoke the
 // callback with the error.
-static void handshake_failed_locked(http_connect_handshaker* handshaker,
-                                    grpc_error* error) {
+void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error* error) {
   if (error == GRPC_ERROR_NONE) {
     // If we were shut down after an endpoint operation succeeded but
     // before the endpoint callback was invoked, we need to generate our
     // own error.
     error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshaker shutdown");
   }
-  if (!handshaker->shutdown) {
+  if (!is_shutdown_) {
     // TODO(ctiller): It is currently necessary to shutdown endpoints
     // before destroying them, even if we know that there are no
     // pending read/write callbacks.  This should be fixed, at which
     // point this can be removed.
-    grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(error));
+    grpc_endpoint_shutdown(args_->endpoint, GRPC_ERROR_REF(error));
     // Not shutting down, so the handshake failed.  Clean up before
     // invoking the callback.
-    cleanup_args_for_failure_locked(handshaker);
+    CleanupArgsForFailureLocked();
     // Set shutdown to true so that subsequent calls to
     // http_connect_handshaker_shutdown() do nothing.
-    handshaker->shutdown = true;
+    is_shutdown_ = true;
   }
   // Invoke callback.
-  GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error);
+  GRPC_CLOSURE_SCHED(on_handshake_done_, error);
 }
 
 // Callback invoked when finished writing HTTP CONNECT request.
-static void on_write_done(void* arg, grpc_error* error) {
-  http_connect_handshaker* handshaker =
-      static_cast<http_connect_handshaker*>(arg);
-  gpr_mu_lock(&handshaker->mu);
-  if (error != GRPC_ERROR_NONE || handshaker->shutdown) {
+void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) {
+  auto* handshaker = static_cast<HttpConnectHandshaker*>(arg);
+  gpr_mu_lock(&handshaker->mu_);
+  if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) {
     // If the write failed or we're shutting down, clean up and invoke the
     // callback with the error.
-    handshake_failed_locked(handshaker, GRPC_ERROR_REF(error));
-    gpr_mu_unlock(&handshaker->mu);
-    http_connect_handshaker_unref(handshaker);
+    handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error));
+    gpr_mu_unlock(&handshaker->mu_);
+    handshaker->Unref();
   } else {
     // Otherwise, read the response.
     // The read callback inherits our ref to the handshaker.
-    grpc_endpoint_read(handshaker->args->endpoint,
-                       handshaker->args->read_buffer,
-                       &handshaker->response_read_closure);
-    gpr_mu_unlock(&handshaker->mu);
+    grpc_endpoint_read(handshaker->args_->endpoint,
+                       handshaker->args_->read_buffer,
+                       &handshaker->response_read_closure_);
+    gpr_mu_unlock(&handshaker->mu_);
   }
 }
 
 // Callback invoked for reading HTTP CONNECT response.
-static void on_read_done(void* arg, grpc_error* error) {
-  http_connect_handshaker* handshaker =
-      static_cast<http_connect_handshaker*>(arg);
-  gpr_mu_lock(&handshaker->mu);
-  if (error != GRPC_ERROR_NONE || handshaker->shutdown) {
+void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) {
+  auto* handshaker = static_cast<HttpConnectHandshaker*>(arg);
+
+  gpr_mu_lock(&handshaker->mu_);
+  if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) {
     // If the read failed or we're shutting down, clean up and invoke the
     // callback with the error.
-    handshake_failed_locked(handshaker, GRPC_ERROR_REF(error));
+    handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error));
     goto done;
   }
   // Add buffer to parser.
-  for (size_t i = 0; i < handshaker->args->read_buffer->count; ++i) {
-    if (GRPC_SLICE_LENGTH(handshaker->args->read_buffer->slices[i]) > 0) {
+  for (size_t i = 0; i < handshaker->args_->read_buffer->count; ++i) {
+    if (GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i]) > 0) {
       size_t body_start_offset = 0;
-      error = grpc_http_parser_parse(&handshaker->http_parser,
-                                     handshaker->args->read_buffer->slices[i],
+      error = grpc_http_parser_parse(&handshaker->http_parser_,
+                                     handshaker->args_->read_buffer->slices[i],
                                      &body_start_offset);
       if (error != GRPC_ERROR_NONE) {
-        handshake_failed_locked(handshaker, error);
+        handshaker->HandshakeFailedLocked(error);
         goto done;
       }
-      if (handshaker->http_parser.state == GRPC_HTTP_BODY) {
+      if (handshaker->http_parser_.state == GRPC_HTTP_BODY) {
         // Remove the data we've already read from the read buffer,
         // leaving only the leftover bytes (if any).
         grpc_slice_buffer tmp_buffer;
         grpc_slice_buffer_init(&tmp_buffer);
         if (body_start_offset <
-            GRPC_SLICE_LENGTH(handshaker->args->read_buffer->slices[i])) {
+            GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i])) {
           grpc_slice_buffer_add(
               &tmp_buffer,
-              grpc_slice_split_tail(&handshaker->args->read_buffer->slices[i],
+              grpc_slice_split_tail(&handshaker->args_->read_buffer->slices[i],
                                     body_start_offset));
         }
         grpc_slice_buffer_addn(&tmp_buffer,
-                               &handshaker->args->read_buffer->slices[i + 1],
-                               handshaker->args->read_buffer->count - i - 1);
-        grpc_slice_buffer_swap(handshaker->args->read_buffer, &tmp_buffer);
+                               &handshaker->args_->read_buffer->slices[i + 1],
+                               handshaker->args_->read_buffer->count - i - 1);
+        grpc_slice_buffer_swap(handshaker->args_->read_buffer, &tmp_buffer);
         grpc_slice_buffer_destroy_internal(&tmp_buffer);
         break;
       }
@@ -194,64 +203,53 @@ static void on_read_done(void* arg, grpc_error* error) {
   // need to fix the HTTP parser to understand when the body is
   // complete (e.g., handling chunked transfer encoding or looking
   // at the Content-Length: header).
-  if (handshaker->http_parser.state != GRPC_HTTP_BODY) {
-    grpc_slice_buffer_reset_and_unref_internal(handshaker->args->read_buffer);
-    grpc_endpoint_read(handshaker->args->endpoint,
-                       handshaker->args->read_buffer,
-                       &handshaker->response_read_closure);
-    gpr_mu_unlock(&handshaker->mu);
+  if (handshaker->http_parser_.state != GRPC_HTTP_BODY) {
+    grpc_slice_buffer_reset_and_unref_internal(handshaker->args_->read_buffer);
+    grpc_endpoint_read(handshaker->args_->endpoint,
+                       handshaker->args_->read_buffer,
+                       &handshaker->response_read_closure_);
+    gpr_mu_unlock(&handshaker->mu_);
     return;
   }
   // Make sure we got a 2xx response.
-  if (handshaker->http_response.status < 200 ||
-      handshaker->http_response.status >= 300) {
+  if (handshaker->http_response_.status < 200 ||
+      handshaker->http_response_.status >= 300) {
     char* msg;
     gpr_asprintf(&msg, "HTTP proxy returned response code %d",
-                 handshaker->http_response.status);
+                 handshaker->http_response_.status);
     error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg);
     gpr_free(msg);
-    handshake_failed_locked(handshaker, error);
+    handshaker->HandshakeFailedLocked(error);
     goto done;
   }
   // Success.  Invoke handshake-done callback.
-  GRPC_CLOSURE_SCHED(handshaker->on_handshake_done, error);
+  GRPC_CLOSURE_SCHED(handshaker->on_handshake_done_, error);
 done:
   // Set shutdown to true so that subsequent calls to
   // http_connect_handshaker_shutdown() do nothing.
-  handshaker->shutdown = true;
-  gpr_mu_unlock(&handshaker->mu);
-  http_connect_handshaker_unref(handshaker);
+  handshaker->is_shutdown_ = true;
+  gpr_mu_unlock(&handshaker->mu_);
+  handshaker->Unref();
 }
 
 //
 // Public handshaker methods
 //
 
-static void http_connect_handshaker_destroy(grpc_handshaker* handshaker_in) {
-  http_connect_handshaker* handshaker =
-      reinterpret_cast<http_connect_handshaker*>(handshaker_in);
-  http_connect_handshaker_unref(handshaker);
-}
-
-static void http_connect_handshaker_shutdown(grpc_handshaker* handshaker_in,
-                                             grpc_error* why) {
-  http_connect_handshaker* handshaker =
-      reinterpret_cast<http_connect_handshaker*>(handshaker_in);
-  gpr_mu_lock(&handshaker->mu);
-  if (!handshaker->shutdown) {
-    handshaker->shutdown = true;
-    grpc_endpoint_shutdown(handshaker->args->endpoint, GRPC_ERROR_REF(why));
-    cleanup_args_for_failure_locked(handshaker);
+void HttpConnectHandshaker::Shutdown(grpc_error* why) {
+  gpr_mu_lock(&mu_);
+  if (!is_shutdown_) {
+    is_shutdown_ = true;
+    grpc_endpoint_shutdown(args_->endpoint, GRPC_ERROR_REF(why));
+    CleanupArgsForFailureLocked();
   }
-  gpr_mu_unlock(&handshaker->mu);
+  gpr_mu_unlock(&mu_);
   GRPC_ERROR_UNREF(why);
 }
 
-static void http_connect_handshaker_do_handshake(
-    grpc_handshaker* handshaker_in, grpc_tcp_server_acceptor* acceptor,
-    grpc_closure* on_handshake_done, grpc_handshaker_args* args) {
-  http_connect_handshaker* handshaker =
-      reinterpret_cast<http_connect_handshaker*>(handshaker_in);
+void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* acceptor,
+                                        grpc_closure* on_handshake_done,
+                                        HandshakerArgs* args) {
   // Check for HTTP CONNECT channel arg.
   // If not found, invoke on_handshake_done without doing anything.
   const grpc_arg* arg =
@@ -260,9 +258,9 @@ static void http_connect_handshaker_do_handshake(
   if (server_name == nullptr) {
     // Set shutdown to true so that subsequent calls to
     // http_connect_handshaker_shutdown() do nothing.
-    gpr_mu_lock(&handshaker->mu);
-    handshaker->shutdown = true;
-    gpr_mu_unlock(&handshaker->mu);
+    gpr_mu_lock(&mu_);
+    is_shutdown_ = true;
+    gpr_mu_unlock(&mu_);
     GRPC_CLOSURE_SCHED(on_handshake_done, GRPC_ERROR_NONE);
     return;
   }
@@ -280,6 +278,7 @@ static void http_connect_handshaker_do_handshake(
         gpr_malloc(sizeof(grpc_http_header) * num_header_strings));
     for (size_t i = 0; i < num_header_strings; ++i) {
       char* sep = strchr(header_strings[i], ':');
+
       if (sep == nullptr) {
         gpr_log(GPR_ERROR, "skipping unparseable HTTP CONNECT header: %s",
                 header_strings[i]);
@@ -292,9 +291,9 @@ static void http_connect_handshaker_do_handshake(
     }
   }
   // Save state in the handshaker object.
-  gpr_mu_lock(&handshaker->mu);
-  handshaker->args = args;
-  handshaker->on_handshake_done = on_handshake_done;
+  MutexLock lock(&mu_);
+  args_ = args;
+  on_handshake_done_ = on_handshake_done;
   // Log connection via proxy.
   char* proxy_name = grpc_endpoint_get_peer(args->endpoint);
   gpr_log(GPR_INFO, "Connecting to server %s via HTTP proxy %s", server_name,
@@ -302,15 +301,18 @@ static void http_connect_handshaker_do_handshake(
   gpr_free(proxy_name);
   // Construct HTTP CONNECT request.
   grpc_httpcli_request request;
-  memset(&request, 0, sizeof(request));
   request.host = server_name;
+  request.ssl_host_override = nullptr;
   request.http.method = (char*)"CONNECT";
   request.http.path = server_name;
+  request.http.version = GRPC_HTTP_HTTP10;  // Set by OnReadDone
   request.http.hdrs = headers;
   request.http.hdr_count = num_headers;
+  request.http.body_length = 0;
+  request.http.body = nullptr;
   request.handshaker = &grpc_httpcli_plaintext;
   grpc_slice request_slice = grpc_httpcli_format_connect_request(&request);
-  grpc_slice_buffer_add(&handshaker->write_buffer, request_slice);
+  grpc_slice_buffer_add(&write_buffer_, request_slice);
   // Clean up.
   gpr_free(headers);
   for (size_t i = 0; i < num_header_strings; ++i) {
@@ -318,54 +320,42 @@ static void http_connect_handshaker_do_handshake(
   }
   gpr_free(header_strings);
   // Take a new ref to be held by the write callback.
-  gpr_ref(&handshaker->refcount);
-  grpc_endpoint_write(args->endpoint, &handshaker->write_buffer,
-                      &handshaker->request_done_closure, nullptr);
-  gpr_mu_unlock(&handshaker->mu);
+  Ref().release();
+  grpc_endpoint_write(args->endpoint, &write_buffer_, &request_done_closure_,
+                      nullptr);
 }
 
-static const grpc_handshaker_vtable http_connect_handshaker_vtable = {
-    http_connect_handshaker_destroy, http_connect_handshaker_shutdown,
-    http_connect_handshaker_do_handshake, "http_connect"};
-
-static grpc_handshaker* grpc_http_connect_handshaker_create() {
-  http_connect_handshaker* handshaker =
-      static_cast<http_connect_handshaker*>(gpr_malloc(sizeof(*handshaker)));
-  memset(handshaker, 0, sizeof(*handshaker));
-  grpc_handshaker_init(&http_connect_handshaker_vtable, &handshaker->base);
-  gpr_mu_init(&handshaker->mu);
-  gpr_ref_init(&handshaker->refcount, 1);
-  grpc_slice_buffer_init(&handshaker->write_buffer);
-  GRPC_CLOSURE_INIT(&handshaker->request_done_closure, on_write_done,
-                    handshaker, grpc_schedule_on_exec_ctx);
-  GRPC_CLOSURE_INIT(&handshaker->response_read_closure, on_read_done,
-                    handshaker, grpc_schedule_on_exec_ctx);
-  grpc_http_parser_init(&handshaker->http_parser, GRPC_HTTP_RESPONSE,
-                        &handshaker->http_response);
-  return &handshaker->base;
+HttpConnectHandshaker::HttpConnectHandshaker() {
+  gpr_mu_init(&mu_);
+  grpc_slice_buffer_init(&write_buffer_);
+  GRPC_CLOSURE_INIT(&request_done_closure_, &HttpConnectHandshaker::OnWriteDone,
+                    this, grpc_schedule_on_exec_ctx);
+  GRPC_CLOSURE_INIT(&response_read_closure_, &HttpConnectHandshaker::OnReadDone,
+                    this, grpc_schedule_on_exec_ctx);
+  grpc_http_parser_init(&http_parser_, GRPC_HTTP_RESPONSE, &http_response_);
 }
 
 //
 // handshaker factory
 //
 
-static void handshaker_factory_add_handshakers(
-    grpc_handshaker_factory* factory, const grpc_channel_args* args,
-    grpc_pollset_set* interested_parties,
-    grpc_handshake_manager* handshake_mgr) {
-  grpc_handshake_manager_add(handshake_mgr,
-                             grpc_http_connect_handshaker_create());
-}
-
-static void handshaker_factory_destroy(grpc_handshaker_factory* factory) {}
+class HttpConnectHandshakerFactory : public HandshakerFactory {
+ public:
+  void AddHandshakers(const grpc_channel_args* args,
+                      grpc_pollset_set* interested_parties,
+                      HandshakeManager* handshake_mgr) override {
+    handshake_mgr->Add(MakeRefCounted<HttpConnectHandshaker>());
+  }
+  ~HttpConnectHandshakerFactory() override = default;
+};
 
-static const grpc_handshaker_factory_vtable handshaker_factory_vtable = {
-    handshaker_factory_add_handshakers, handshaker_factory_destroy};
+}  // namespace
 
-static grpc_handshaker_factory handshaker_factory = {
-    &handshaker_factory_vtable};
+}  // namespace grpc_core
 
 void grpc_http_connect_register_handshaker_factory() {
-  grpc_handshaker_factory_register(true /* at_start */, HANDSHAKER_CLIENT,
-                                   &handshaker_factory);
+  using namespace grpc_core;
+  HandshakerRegistry::RegisterHandshakerFactory(
+      true /* at_start */, HANDSHAKER_CLIENT,
+      UniquePtr<HandshakerFactory>(New<HttpConnectHandshakerFactory>()));
 }