grpc 1.46.3 → 1.47.0

data/src/core/lib/gprpp/construct_destruct.h

@@ -17,6 +17,7 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <new>
 #include <utility>
 
 namespace grpc_core {

data/src/core/lib/gprpp/dual_ref_counted.h

@@ -20,12 +20,9 @@
 #include <grpc/support/port_platform.h>
 
 #include <atomic>
-#include <cassert>
-#include <cinttypes>
+#include <cstdint>
 
-#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"

data/src/core/lib/gprpp/examine_stack.h

@@ -21,7 +21,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <functional>
 #include <string>
 
 #include "absl/types/optional.h"

data/src/core/lib/gprpp/fork.cc

@@ -20,15 +20,12 @@
 
 #include "src/core/lib/gprpp/fork.h"
 
-#include <string.h>
-
-#include <grpc/support/alloc.h>
+#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/global_config.h"
-#include "src/core/lib/gprpp/memory.h"
+#include "src/core/lib/gprpp/global_config_env.h"
 
 /*
  * NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK

data/src/core/lib/gprpp/global_config.h

@@ -21,8 +21,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
-
 // --------------------------------------------------------------------
 // How to use global configuration variables:
 //
@@ -89,7 +87,7 @@
 //   bool gpr_global_config_get_test();
 //   void gpr_global_config_set_test(bool value);
 
-#include "src/core/lib/gprpp/global_config_custom.h"
-#include "src/core/lib/gprpp/global_config_env.h"
+#include "src/core/lib/gprpp/global_config_custom.h"  // IWYU pragma: export
+#include "src/core/lib/gprpp/global_config_env.h"     // IWYU pragma: export
 
 #endif /* GRPC_CORE_LIB_GPRPP_GLOBAL_CONFIG_H */

data/src/core/lib/gprpp/global_config_env.cc

@@ -21,13 +21,14 @@
 #include "src/core/lib/gprpp/global_config_env.h"
 
 #include <ctype.h>
-#include <string.h>
+#include <stdlib.h>
 
+#include <memory>
 #include <string>
+#include <type_traits>
 
 #include "absl/strings/str_format.h"
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 

data/src/core/lib/gprpp/global_config_env.h

@@ -21,7 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/global_config_generic.h"
+#include <stdint.h>
+
+#include "src/core/lib/gprpp/global_config_generic.h"  // IWYU pragma: export
 #include "src/core/lib/gprpp/memory.h"
 
 namespace grpc_core {

data/src/core/lib/gprpp/global_config_generic.h

@@ -21,10 +21,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
-
-#include "src/core/lib/gprpp/memory.h"
-
 #define GPR_GLOBAL_CONFIG_GET(name) gpr_global_config_get_##name()
 
 #define GPR_GLOBAL_CONFIG_SET(name, value) gpr_global_config_set_##name(value)

data/src/core/lib/gprpp/host_port.cc

@@ -20,6 +20,8 @@
 
 #include "src/core/lib/gprpp/host_port.h"
 
+#include <stddef.h>
+
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 

data/src/core/lib/gprpp/manual_constructor.h

@@ -24,7 +24,6 @@
 #include <grpc/support/port_platform.h>
 
 #include <stddef.h>
-#include <stdlib.h>
 
 #include <new>
 #include <type_traits>

data/src/core/lib/gprpp/match.h

@@ -17,6 +17,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <type_traits>
+
 #include "absl/types/variant.h"
 
 #include "src/core/lib/gprpp/overload.h"

data/src/core/lib/gprpp/memory.h

@@ -21,14 +21,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <limits>
 #include <memory>
-#include <utility>
-
-#include "absl/memory/memory.h"
+#include <type_traits>
 
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/orphanable.h

@@ -23,12 +23,9 @@
 
 #include <cinttypes>
 #include <memory>
-
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
+#include <utility>
 
 #include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 

data/src/core/lib/gprpp/ref_counted.h

@@ -25,13 +25,10 @@
 #include <cassert>
 #include <cinttypes>
 
-#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/atomic_utils.h"
 #include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -234,6 +231,7 @@ enum UnrefBehavior {
 namespace internal {
 template <typename T, UnrefBehavior UnrefBehaviorArg>
 class Delete;
+
 template <typename T>
 class Delete<T, kUnrefDelete> {
  public:

data/src/core/lib/gprpp/ref_counted_ptr.h

@@ -21,11 +21,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <iosfwd>
 #include <type_traits>
 #include <utility>
 
 #include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/memory.h"
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/stat.h

@@ -19,11 +19,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdio.h>
 #include <time.h>
 
 #include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/stat_posix.cc

@@ -16,12 +16,17 @@
 
 #include <grpc/support/port_platform.h>
 
+// IWYU pragma: no_include <bits/struct_stat.h>
+
+#include <string.h>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+
 #ifdef GPR_POSIX_STAT
 
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include <grpc/support/log.h>
 

data/src/core/lib/gprpp/status_helper.cc

@@ -20,22 +20,26 @@
 
 #include "src/core/lib/gprpp/status_helper.h"
 
-#include <type_traits>
+#include <string.h>
+
+#include <algorithm>
+#include <new>
+#include <utility>
 
 #include "absl/strings/cord.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
-#include "absl/strings/str_format.h"
+#include "absl/strings/numbers.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/time/clock.h"
 #include "google/protobuf/any.upb.h"
 #include "google/rpc/status.upb.h"
+#include "upb/upb.h"
 #include "upb/upb.hpp"
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gprpp/time_util.h"
-
 namespace grpc_core {
 
 namespace {

data/src/core/lib/gprpp/status_helper.h

@@ -21,9 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
+
+#include <string>
 #include <vector>
 
 #include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 

data/src/core/lib/gprpp/sync.h

@@ -21,13 +21,15 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/synchronization/mutex.h"
 
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
-#include <grpc/support/time.h>
 
+#ifndef GPR_ABSEIL_SYNC
 #include "src/core/lib/gprpp/time_util.h"
+#endif
 
 // The core library is not accessible in C++ codegen headers, and vice versa.
 // Thus, we need to have duplicate headers with similar functionality.

data/src/core/lib/gprpp/table.h

@@ -17,8 +17,14 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
+#include <initializer_list>
+#include <new>
+#include <type_traits>
 #include <utility>
 
+#include "absl/meta/type_traits.h"
 #include "absl/utility/utility.h"
 
 #include "src/core/lib/gprpp/bitset.h"
@@ -31,6 +37,7 @@ namespace table_detail {
 // A tuple-like type that contains manually constructed elements.
 template <typename... Ts>
 struct Elements;
+
 template <typename T, typename... Ts>
 struct Elements<T, Ts...> : Elements<Ts...> {
   union U {
@@ -71,6 +78,7 @@ struct GetElem<I, T, Ts...> {
 // Sets a member constant N to the number of times Needle is in Haystack.
 template <typename Needle, typename... Haystack>
 struct CountIncludedStruct;
+
 template <typename Needle, typename Straw, typename... RestOfHaystack>
 struct CountIncludedStruct<Needle, Straw, RestOfHaystack...> {
   static constexpr size_t N =
@@ -92,6 +100,7 @@ constexpr size_t CountIncluded() {
 // Ignored should be void always, and is used for enable_if_t.
 template <typename Ignored, typename Needle, typename... Haystack>
 struct IndexOfStruct;
+
 template <typename Needle, typename Straw, typename... RestOfHaystack>
 struct IndexOfStruct<absl::enable_if_t<std::is_same<Needle, Straw>::value>,
                      Needle, Straw, RestOfHaystack...> {
@@ -123,6 +132,7 @@ IndexOf() {
 // Implemented as a simple type recursion.
 template <size_t I, typename... Ts>
 struct TypeIndexStruct;
+
 template <typename T, typename... Ts>
 struct TypeIndexStruct<0, T, Ts...> {
   using Type = T;

data/src/core/lib/gprpp/thd.h

@@ -23,12 +23,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/thd_id.h>
-#include <grpc/support/time.h>
+#include <stddef.h>
 
-#include "src/core/lib/gprpp/memory.h"
+#include <grpc/support/log.h>
 
 namespace grpc_core {
 namespace internal {

data/src/core/lib/gprpp/thd_posix.cc

@@ -20,6 +20,9 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/time.h>
+
 #ifdef GPR_POSIX_SYNC
 
 #include <pthread.h>
@@ -27,19 +30,18 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/fork.h"
-#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/thd.h"
 
 namespace grpc_core {
 namespace {
 class ThreadInternalsPosix;
+
 struct thd_arg {
   ThreadInternalsPosix* thread;
   void (*body)(void* arg); /* body of a thread */

data/src/core/lib/gprpp/thd_windows.cc

@@ -26,7 +26,9 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
+#include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/tls.h"
 #include "src/core/lib/gprpp/memory.h"

data/src/core/lib/gprpp/time.cc

@@ -20,6 +20,9 @@
 #include <cstdint>
 #include <limits>
 #include <string>
+#include <utility>
+
+#include "absl/strings/str_format.h"
 
 #include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/log.h>
@@ -182,6 +185,11 @@ std::string Duration::ToString() const {
   return std::to_string(millis_) + "ms";
 }
 
+std::string Duration::ToJsonString() const {
+  gpr_timespec ts = as_timespec();
+  return absl::StrFormat("%d.%09ds", ts.tv_sec, ts.tv_nsec);
+}
+
 void TestOnlySetProcessEpoch(gpr_timespec epoch) {
   g_process_epoch_seconds.store(
       gpr_convert_clock_type(epoch, GPR_CLOCK_MONOTONIC).tv_sec);

data/src/core/lib/gprpp/time.h

@@ -19,11 +19,11 @@
 
 #include <stdint.h>
 
-#include <cstdint>
 #include <limits>
 #include <ostream>
 #include <string>
 
+#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/time_precise.h"
@@ -211,6 +211,11 @@ class Duration {
 
   std::string ToString() const;
 
+  // Returns the duration in the JSON form corresponding to a
+  // google.protobuf.Duration proto, as defined here:
+  // https://developers.google.com/protocol-buffers/docs/proto3#json
+  std::string ToJsonString() const;
+
  private:
   explicit constexpr Duration(int64_t millis) : millis_(millis) {}
 

data/src/core/lib/gprpp/time_util.cc

@@ -18,7 +18,11 @@
 
 #include "src/core/lib/gprpp/time_util.h"
 
+#include <stdint.h>
+#include <time.h>
+
 #include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/time_util.h

@@ -21,7 +21,7 @@
 
 #include "absl/time/time.h"
 
-#include <grpc/support/time.h>
+#include <grpc/impl/codegen/gpr_types.h>
 
 namespace grpc_core {
 

data/src/core/lib/gprpp/unique_type_name.h

@@ -0,0 +1,104 @@
+//
+// Copyright 2022 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_LIB_GPRPP_UNIQUE_TYPE_NAME_H
+#define GRPC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H
+
+#include <grpc/support/port_platform.h>
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+
+#include "src/core/lib/gpr/useful.h"
+
+// Provides a type name that is unique by instance rather than by
+// string content.  This is useful in cases where there are different
+// implementations of a given interface that need to be differentiated from
+// each other for down-casting purposes, where it is undesirable to provide
+// a registry to avoid name collisions.
+//
+// Expected usage:
+/*
+// Interface has a virtual method that returns a UniqueTypeName.
+class Interface {
+ public:
+  virtual ~Interface() = default;
+  virtual UniqueTypeName type() const = 0;
+};
+
+// Implementation uses a static factory instance to return the same
+// UniqueTypeName for every instance.
+class FooImplementation : public Interface {
+ public:
+  UniqueTypeName type() const override {
+    static UniqueTypeName::Factory kFactory("Foo");
+    return kFactory.Create();
+  }
+};
+*/
+
+namespace grpc_core {
+
+class UniqueTypeName {
+ public:
+  // Factory class.  There should be a single static instance of this
+  // for each unique type name.
+  class Factory {
+   public:
+    explicit Factory(absl::string_view name) : name_(new std::string(name)) {}
+
+    Factory(const Factory&) = delete;
+    Factory& operator=(const Factory&) = delete;
+
+    UniqueTypeName Create() { return UniqueTypeName(*name_); }
+
+   private:
+    std::string* name_;
+  };
+
+  // Copyable.
+  UniqueTypeName(const UniqueTypeName& other) : name_(other.name_) {}
+  UniqueTypeName& operator=(const UniqueTypeName& other) {
+    name_ = other.name_;
+    return *this;
+  }
+
+  bool operator==(const UniqueTypeName& other) const {
+    return name_.data() == other.name_.data();
+  }
+  bool operator!=(const UniqueTypeName& other) const {
+    return name_.data() != other.name_.data();
+  }
+  bool operator<(const UniqueTypeName& other) const {
+    return name_.data() < other.name_.data();
+  }
+
+  int Compare(const UniqueTypeName& other) const {
+    return QsortCompare(name_.data(), other.name_.data());
+  }
+
+  absl::string_view name() const { return name_; }
+
+ private:
+  explicit UniqueTypeName(absl::string_view name) : name_(name) {}
+
+  absl::string_view name_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H

data/src/core/lib/http/format_request.cc

@@ -95,6 +95,35 @@ grpc_slice grpc_httpcli_format_post_request(const grpc_http_request* request,
   return grpc_slice_from_copied_buffer(req.data(), req.size());
 }
 
+grpc_slice grpc_httpcli_format_put_request(const grpc_http_request* request,
+                                           const char* host, const char* path) {
+  std::vector<std::string> out;
+  out.push_back("PUT ");
+  fill_common_header(request, host, path, true, &out);
+  if (request->body != nullptr) {
+    bool has_content_type = false;
+    for (size_t i = 0; i < request->hdr_count; i++) {
+      if (strcmp(request->hdrs[i].key, "Content-Type") == 0) {
+        has_content_type = true;
+        break;
+      }
+    }
+    if (!has_content_type) {
+      out.push_back("Content-Type: text/plain\r\n");
+    }
+    out.push_back(
+        absl::StrFormat("Content-Length: %lu\r\n",
+                        static_cast<unsigned long>(request->body_length)));
+  }
+  out.push_back("\r\n");
+  std::string req = absl::StrJoin(out, "");
+  if (request->body != nullptr) {
+    absl::StrAppend(&req,
+                    absl::string_view(request->body, request->body_length));
+  }
+  return grpc_slice_from_copied_buffer(req.data(), req.size());
+}
+
 grpc_slice grpc_httpcli_format_connect_request(const grpc_http_request* request,
                                                const char* host,
                                                const char* path) {

data/src/core/lib/http/format_request.h

@@ -29,6 +29,8 @@ grpc_slice grpc_httpcli_format_get_request(const grpc_http_request* request,
                                            const char* host, const char* path);
 grpc_slice grpc_httpcli_format_post_request(const grpc_http_request* request,
                                             const char* host, const char* path);
+grpc_slice grpc_httpcli_format_put_request(const grpc_http_request* request,
+                                           const char* host, const char* path);
 grpc_slice grpc_httpcli_format_connect_request(const grpc_http_request* request,
                                                const char* host,
                                                const char* path);