grpc 1.61.0.pre2 → 1.62.0.pre1

data/src/core/lib/transport/transport.h

@@ -42,7 +42,6 @@
 
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/iomgr/call_combiner.h"
@@ -53,16 +52,15 @@
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/context.h"
-#include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/latch.h"
-#include "src/core/lib/promise/party.h"
 #include "src/core/lib/promise/pipe.h"
-#include "src/core/lib/promise/race.h"
-#include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/call_final_info.h"
+#include "src/core/lib/transport/call_spine.h"
 #include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/lib/transport/message.h"
+#include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport_fwd.h"
 
@@ -74,94 +72,8 @@
 
 #define GRPC_ARG_TRANSPORT "grpc.internal.transport"
 
-/// Internal bit flag for grpc_begin_message's \a flags signaling the use of
-/// compression for the message. (Does not apply for stream compression.)
-#define GRPC_WRITE_INTERNAL_COMPRESS (0x80000000u)
-/// Internal bit flag for determining whether the message was compressed and had
-/// to be decompressed by the message_decompress filter. (Does not apply for
-/// stream compression.)
-#define GRPC_WRITE_INTERNAL_TEST_ONLY_WAS_COMPRESSED (0x40000000u)
-/// Mask of all valid internal flags.
-#define GRPC_WRITE_INTERNAL_USED_MASK \
-  (GRPC_WRITE_INTERNAL_COMPRESS | GRPC_WRITE_INTERNAL_TEST_ONLY_WAS_COMPRESSED)
-
 namespace grpc_core {
 
-// Server metadata type
-// TODO(ctiller): This should be a bespoke instance of MetadataMap<>
-using ServerMetadata = grpc_metadata_batch;
-using ServerMetadataHandle = Arena::PoolPtr<ServerMetadata>;
-
-// Client initial metadata type
-// TODO(ctiller): This should be a bespoke instance of MetadataMap<>
-using ClientMetadata = grpc_metadata_batch;
-using ClientMetadataHandle = Arena::PoolPtr<ClientMetadata>;
-
-class Message {
- public:
-  Message() = default;
-  ~Message() = default;
-  Message(SliceBuffer payload, uint32_t flags)
-      : payload_(std::move(payload)), flags_(flags) {}
-  Message(const Message&) = delete;
-  Message& operator=(const Message&) = delete;
-
-  uint32_t flags() const { return flags_; }
-  uint32_t& mutable_flags() { return flags_; }
-  SliceBuffer* payload() { return &payload_; }
-  const SliceBuffer* payload() const { return &payload_; }
-
-  std::string DebugString() const;
-
- private:
-  SliceBuffer payload_;
-  uint32_t flags_ = 0;
-};
-
-using MessageHandle = Arena::PoolPtr<Message>;
-
-// Ok/not-ok check for trailing metadata, so that it can be used as result types
-// for TrySeq.
-inline bool IsStatusOk(const ServerMetadataHandle& m) {
-  return m->get(GrpcStatusMetadata()).value_or(GRPC_STATUS_UNKNOWN) ==
-         GRPC_STATUS_OK;
-}
-
-ServerMetadataHandle ServerMetadataFromStatus(
-    const absl::Status& status, Arena* arena = GetContext<Arena>());
-
-template <>
-struct StatusCastImpl<ServerMetadataHandle, absl::Status> {
-  static ServerMetadataHandle Cast(const absl::Status& m) {
-    return ServerMetadataFromStatus(m);
-  }
-};
-
-template <>
-struct StatusCastImpl<ServerMetadataHandle, const absl::Status&> {
-  static ServerMetadataHandle Cast(const absl::Status& m) {
-    return ServerMetadataFromStatus(m);
-  }
-};
-
-template <>
-struct StatusCastImpl<ServerMetadataHandle, absl::Status&> {
-  static ServerMetadataHandle Cast(const absl::Status& m) {
-    return ServerMetadataFromStatus(m);
-  }
-};
-
-// Anything that can be first cast to absl::Status can then be cast to
-// ServerMetadataHandle.
-template <typename T>
-struct StatusCastImpl<
-    ServerMetadataHandle, T,
-    absl::void_t<decltype(StatusCast<absl::Status>(std::declval<T>()))>> {
-  static ServerMetadataHandle Cast(const T& m) {
-    return ServerMetadataFromStatus(StatusCast<absl::Status>(m));
-  }
-};
-
 // Move only type that tracks call startup.
 // Allows observation of when client_initial_metadata has been processed by the
 // end of the local call stack.
@@ -243,367 +155,6 @@ struct CallArgs {
 using NextPromiseFactory =
     std::function<ArenaPromise<ServerMetadataHandle>(CallArgs)>;
 
-// The common middle part of a call - a reference is held by each of
-// CallInitiator and CallHandler - which provide interfaces that are appropriate
-// for each side of a call.
-// The spine will ultimately host the pipes, filters, and context for one part
-// of a call: ie top-half client channel, sub channel call, server call.
-// TODO(ctiller): eventually drop this when we don't need to reference into
-// legacy promise calls anymore
-class CallSpineInterface {
- public:
-  virtual ~CallSpineInterface() = default;
-  virtual Pipe<ClientMetadataHandle>& client_initial_metadata() = 0;
-  virtual Pipe<ServerMetadataHandle>& server_initial_metadata() = 0;
-  virtual Pipe<MessageHandle>& client_to_server_messages() = 0;
-  virtual Pipe<MessageHandle>& server_to_client_messages() = 0;
-  virtual Pipe<ServerMetadataHandle>& server_trailing_metadata() = 0;
-  virtual Latch<ServerMetadataHandle>& cancel_latch() = 0;
-  // Add a callback to be called when server trailing metadata is received.
-  void OnDone(absl::AnyInvocable<void()> fn) {
-    if (on_done_ == nullptr) {
-      on_done_ = std::move(fn);
-      return;
-    }
-    on_done_ = [first = std::move(fn), next = std::move(on_done_)]() mutable {
-      first();
-      next();
-    };
-  }
-  void CallOnDone() {
-    if (on_done_ != nullptr) std::exchange(on_done_, nullptr)();
-  }
-  virtual Party& party() = 0;
-  virtual void IncrementRefCount() = 0;
-  virtual void Unref() = 0;
-
-  // Cancel the call with the given metadata.
-  // Regarding the `MUST_USE_RESULT absl::nullopt_t`:
-  // Most cancellation calls right now happen in pipe interceptors;
-  // there `nullopt` indicates terminate processing of this pipe and close with
-  // error.
-  // It's convenient then to have the Cancel operation (setting the latch to
-  // terminate the call) be the last thing that occurs in a pipe interceptor,
-  // and this construction supports that (and has helped the author not write
-  // some bugs).
-  GRPC_MUST_USE_RESULT absl::nullopt_t Cancel(ServerMetadataHandle metadata) {
-    GPR_DEBUG_ASSERT(Activity::current() == &party());
-    auto& c = cancel_latch();
-    if (c.is_set()) return absl::nullopt;
-    c.Set(std::move(metadata));
-    CallOnDone();
-    client_initial_metadata().sender.CloseWithError();
-    server_initial_metadata().sender.CloseWithError();
-    client_to_server_messages().sender.CloseWithError();
-    server_to_client_messages().sender.CloseWithError();
-    return absl::nullopt;
-  }
-
-  auto WaitForCancel() {
-    GPR_DEBUG_ASSERT(Activity::current() == &party());
-    return cancel_latch().Wait();
-  }
-
-  // Wrap a promise so that if it returns failure it automatically cancels
-  // the rest of the call.
-  // The resulting (returned) promise will resolve to Empty.
-  template <typename Promise>
-  auto CancelIfFails(Promise promise) {
-    GPR_DEBUG_ASSERT(Activity::current() == &party());
-    using P = promise_detail::PromiseLike<Promise>;
-    using ResultType = typename P::Result;
-    return Map(std::move(promise), [this](ResultType r) {
-      if (!IsStatusOk(r)) {
-        std::ignore = Cancel(StatusCast<ServerMetadataHandle>(r));
-      }
-      return r;
-    });
-  }
-
-  // Spawn a promise that returns Empty{} and save some boilerplate handling
-  // that detail.
-  template <typename PromiseFactory>
-  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
-    party().Spawn(name, std::move(promise_factory), [](Empty) {});
-  }
-
-  // Spawn a promise that returns some status-like type; if the status
-  // represents failure automatically cancel the rest of the call.
-  template <typename PromiseFactory>
-  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
-    using FactoryType =
-        promise_detail::OncePromiseFactory<void, PromiseFactory>;
-    using PromiseType = typename FactoryType::Promise;
-    using ResultType = typename PromiseType::Result;
-    static_assert(
-        std::is_same<bool,
-                     decltype(IsStatusOk(std::declval<ResultType>()))>::value,
-        "SpawnGuarded promise must return a status-like object");
-    party().Spawn(name, std::move(promise_factory), [this](ResultType r) {
-      if (!IsStatusOk(r)) {
-        std::ignore = Cancel(StatusCast<ServerMetadataHandle>(std::move(r)));
-      }
-    });
-  }
-
- private:
-  absl::AnyInvocable<void()> on_done_{nullptr};
-};
-
-class CallSpine final : public CallSpineInterface, public Party {
- public:
-  static RefCountedPtr<CallSpine> Create(
-      grpc_event_engine::experimental::EventEngine* event_engine,
-      Arena* arena) {
-    return RefCountedPtr<CallSpine>(arena->New<CallSpine>(event_engine, arena));
-  }
-
-  Pipe<ClientMetadataHandle>& client_initial_metadata() override {
-    return client_initial_metadata_;
-  }
-  Pipe<ServerMetadataHandle>& server_initial_metadata() override {
-    return server_initial_metadata_;
-  }
-  Pipe<MessageHandle>& client_to_server_messages() override {
-    return client_to_server_messages_;
-  }
-  Pipe<MessageHandle>& server_to_client_messages() override {
-    return server_to_client_messages_;
-  }
-  Pipe<ServerMetadataHandle>& server_trailing_metadata() override {
-    return server_trailing_metadata_;
-  }
-  Latch<ServerMetadataHandle>& cancel_latch() override { return cancel_latch_; }
-  Party& party() override { return *this; }
-  void IncrementRefCount() override { Party::IncrementRefCount(); }
-  void Unref() override { Party::Unref(); }
-
- private:
-  friend class Arena;
-  CallSpine(grpc_event_engine::experimental::EventEngine* event_engine,
-            Arena* arena)
-      : Party(arena, 1), event_engine_(event_engine) {}
-
-  class ScopedContext : public ScopedActivity,
-                        public promise_detail::Context<Arena> {
-   public:
-    explicit ScopedContext(CallSpine* spine)
-        : ScopedActivity(&spine->party()), Context<Arena>(spine->arena()) {}
-  };
-
-  bool RunParty() override {
-    ScopedContext context(this);
-    return Party::RunParty();
-  }
-
-  void PartyOver() override {
-    Arena* a = arena();
-    {
-      ScopedContext context(this);
-      CancelRemainingParticipants();
-      a->DestroyManagedNewObjects();
-    }
-    this->~CallSpine();
-    a->Destroy();
-  }
-
-  grpc_event_engine::experimental::EventEngine* event_engine() const override {
-    return event_engine_;
-  }
-
-  // Initial metadata from client to server
-  Pipe<ClientMetadataHandle> client_initial_metadata_{arena()};
-  // Initial metadata from server to client
-  Pipe<ServerMetadataHandle> server_initial_metadata_{arena()};
-  // Messages travelling from the application to the transport.
-  Pipe<MessageHandle> client_to_server_messages_{arena()};
-  // Messages travelling from the transport to the application.
-  Pipe<MessageHandle> server_to_client_messages_{arena()};
-  // Trailing metadata from server to client
-  Pipe<ServerMetadataHandle> server_trailing_metadata_{arena()};
-  // Latch that can be set to terminate the call
-  Latch<ServerMetadataHandle> cancel_latch_;
-  // Event engine associated with this call
-  grpc_event_engine::experimental::EventEngine* const event_engine_;
-};
-
-class CallInitiator {
- public:
-  explicit CallInitiator(RefCountedPtr<CallSpineInterface> spine)
-      : spine_(std::move(spine)) {}
-
-  auto PushClientInitialMetadata(ClientMetadataHandle md) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(spine_->client_initial_metadata().sender.Push(std::move(md)),
-               [](bool ok) { return StatusFlag(ok); });
-  }
-
-  auto PullServerInitialMetadata() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(spine_->server_initial_metadata().receiver.Next(),
-               [](NextResult<ClientMetadataHandle> md)
-                   -> ValueOrFailure<ClientMetadataHandle> {
-                 if (!md.has_value()) return Failure{};
-                 return std::move(*md);
-               });
-  }
-
-  auto PullServerTrailingMetadata() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Race(spine_->WaitForCancel(),
-                Map(spine_->server_trailing_metadata().receiver.Next(),
-                    [spine = spine_](NextResult<ServerMetadataHandle> md)
-                        -> ServerMetadataHandle {
-                      GPR_ASSERT(md.has_value());
-                      return std::move(*md);
-                    }));
-  }
-
-  auto PullMessage() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return spine_->server_to_client_messages().receiver.Next();
-  }
-
-  auto PushMessage(MessageHandle message) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(
-        spine_->client_to_server_messages().sender.Push(std::move(message)),
-        [](bool r) { return StatusFlag(r); });
-  }
-
-  void FinishSends() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    spine_->client_to_server_messages().sender.Close();
-  }
-
-  template <typename Promise>
-  auto CancelIfFails(Promise promise) {
-    return spine_->CancelIfFails(std::move(promise));
-  }
-
-  void Cancel() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    std::ignore =
-        spine_->Cancel(ServerMetadataFromStatus(absl::CancelledError()));
-  }
-
-  template <typename PromiseFactory>
-  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
-    spine_->SpawnGuarded(name, std::move(promise_factory));
-  }
-
-  template <typename PromiseFactory>
-  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
-    spine_->SpawnInfallible(name, std::move(promise_factory));
-  }
-
-  template <typename PromiseFactory>
-  auto SpawnWaitable(absl::string_view name, PromiseFactory promise_factory) {
-    return spine_->party().SpawnWaitable(name, std::move(promise_factory));
-  }
-
-  Arena* arena() { return spine_->party().arena(); }
-
- private:
-  RefCountedPtr<CallSpineInterface> spine_;
-};
-
-class CallHandler {
- public:
-  explicit CallHandler(RefCountedPtr<CallSpineInterface> spine)
-      : spine_(std::move(spine)) {}
-
-  auto PullClientInitialMetadata() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(spine_->client_initial_metadata().receiver.Next(),
-               [](NextResult<ClientMetadataHandle> md)
-                   -> ValueOrFailure<ClientMetadataHandle> {
-                 if (!md.has_value()) return Failure{};
-                 return std::move(*md);
-               });
-  }
-
-  auto PushServerInitialMetadata(ServerMetadataHandle md) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(spine_->server_initial_metadata().sender.Push(std::move(md)),
-               [](bool ok) { return StatusFlag(ok); });
-  }
-
-  auto PushServerTrailingMetadata(ServerMetadataHandle md) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    spine_->server_to_client_messages().sender.Close();
-    spine_->CallOnDone();
-    return Map(spine_->server_trailing_metadata().sender.Push(std::move(md)),
-               [](bool ok) { return StatusFlag(ok); });
-  }
-
-  auto PullMessage() {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return spine_->client_to_server_messages().receiver.Next();
-  }
-
-  auto PushMessage(MessageHandle message) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return Map(
-        spine_->server_to_client_messages().sender.Push(std::move(message)),
-        [](bool ok) { return StatusFlag(ok); });
-  }
-
-  void Cancel(ServerMetadataHandle status) {
-    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    std::ignore = spine_->Cancel(std::move(status));
-  }
-
-  void OnDone(absl::AnyInvocable<void()> fn) { spine_->OnDone(std::move(fn)); }
-
-  template <typename Promise>
-  auto CancelIfFails(Promise promise) {
-    return spine_->CancelIfFails(std::move(promise));
-  }
-
-  template <typename PromiseFactory>
-  void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
-    spine_->SpawnGuarded(name, std::move(promise_factory));
-  }
-
-  template <typename PromiseFactory>
-  void SpawnInfallible(absl::string_view name, PromiseFactory promise_factory) {
-    spine_->SpawnInfallible(name, std::move(promise_factory));
-  }
-
-  template <typename PromiseFactory>
-  auto SpawnWaitable(absl::string_view name, PromiseFactory promise_factory) {
-    return spine_->party().SpawnWaitable(name, std::move(promise_factory));
-  }
-
-  Arena* arena() { return spine_->party().arena(); }
-
- private:
-  RefCountedPtr<CallSpineInterface> spine_;
-};
-
-struct CallInitiatorAndHandler {
-  CallInitiator initiator;
-  CallHandler handler;
-};
-
-CallInitiatorAndHandler MakeCall(
-    grpc_event_engine::experimental::EventEngine* event_engine, Arena* arena);
-
-template <typename CallHalf>
-auto OutgoingMessages(CallHalf h) {
-  struct Wrapper {
-    CallHalf h;
-    auto Next() { return h.PullMessage(); }
-  };
-  return Wrapper{std::move(h)};
-}
-
-// Forward a call from `call_handler` to `call_initiator` (with initial metadata
-// `client_initial_metadata`)
-void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
-                 ClientMetadataHandle client_initial_metadata);
-
 }  // namespace grpc_core
 
 // forward declarations

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/address_filtering.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h"
+#include "src/core/load_balancing/address_filtering.h"
 
 #include <stddef.h>
 

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/address_filtering.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -29,7 +29,7 @@
 
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_string.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/resolver/endpoint_addresses.h"
 
 // The resolver returns a flat list of addresses.  When a hierarchy of
 // LB policies is in use, each leaf of the hierarchy will need a
@@ -115,4 +115,4 @@ absl::StatusOr<HierarchicalAddressMap> MakeHierarchicalAddressMap(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ADDRESS_FILTERING_H
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/backend_metric_data.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -54,4 +54,4 @@ struct BackendMetricData {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_BACKEND_METRIC_DATA_H
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/child_policy_handler.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h"
+#include "src/core/load_balancing/child_policy_handler.h"
 
 #include <memory>
 #include <string>
@@ -33,9 +33,9 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/load_balancing/delegating_helper.h"
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/load_balancing/subchannel_interface.h"
+#include "src/core/load_balancing/delegating_helper.h"
+#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/lib/transport/connectivity_state.h"
 
 namespace grpc_core {

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/child_policy_handler.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
 #include <grpc/support/port_platform.h>
 
 #include <utility>
@@ -27,7 +27,7 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/lb_policy.h"
 
 namespace grpc_core {
 
@@ -85,4 +85,4 @@ class ChildPolicyHandler : public LoadBalancingPolicy {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_CHILD_POLICY_HANDLER_H
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H

data/src/core/{lib/load_balancing → load_balancing}/delegating_helper.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H
-#define GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -32,8 +32,8 @@
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/load_balancing/lb_policy.h"
-#include "src/core/lib/load_balancing/subchannel_interface.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/lib/security/credentials/credentials.h"
 
 namespace grpc_core {
@@ -113,4 +113,4 @@ class LoadBalancingPolicy::ParentOwningDelegatingChannelControlHelper
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_LOAD_BALANCING_DELEGATING_HELPER_H
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/endpoint_list.cc

@@ -16,7 +16,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/lb_policy/endpoint_list.h"
+#include "src/core/load_balancing/endpoint_list.h"
 
 #include <stdlib.h>
 
@@ -32,7 +32,7 @@
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
 
-#include "src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.h"
+#include "src/core/load_balancing/pick_first/pick_first.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/debug_location.h"
@@ -40,10 +40,10 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/json/json.h"
-#include "src/core/lib/load_balancing/delegating_helper.h"
-#include "src/core/lib/load_balancing/lb_policy.h"
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/load_balancing/delegating_helper.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/resolver/endpoint_addresses.h"
 
 namespace grpc_core {
 

data/src/core/{ext/filters/client_channel/lb_policy → load_balancing}/endpoint_list.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H
-#define GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 
 #include <grpc/support/port_platform.h>
 
@@ -37,9 +37,9 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/load_balancing/lb_policy.h"
-#include "src/core/lib/load_balancing/subchannel_interface.h"
-#include "src/core/lib/resolver/endpoint_addresses.h"
+#include "src/core/load_balancing/lb_policy.h"
+#include "src/core/load_balancing/subchannel_interface.h"
+#include "src/core/resolver/endpoint_addresses.h"
 
 namespace grpc_core {
 
@@ -217,4 +217,4 @@ class EndpointList : public InternallyRefCounted<EndpointList> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_ENDPOINT_LIST_H
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H