grpc 1.64.0 → 1.68.1

data/include/grpc/support/metrics.h

@@ -15,20 +15,26 @@
 #ifndef GRPC_SUPPORT_METRICS_H
 #define GRPC_SUPPORT_METRICS_H
 
-#include "absl/strings/string_view.h"
-
+#include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 namespace experimental {
 
 // Configuration (scope) for a specific client channel to be used for stats
-// plugins.
+// plugins. For some components like XdsClient where the same XdsClient instance
+// can be shared across multiple channels that share the same target name but
+// have different default authority and channel arguments, the component uses
+// the configuration from the first channel that uses this XdsClient instance to
+// determine StatsPluginChannelScope.
 class StatsPluginChannelScope {
  public:
-  StatsPluginChannelScope(absl::string_view target,
-                          absl::string_view default_authority)
-      : target_(target), default_authority_(default_authority) {}
+  StatsPluginChannelScope(
+      absl::string_view target, absl::string_view default_authority,
+      const grpc_event_engine::experimental::EndpointConfig& args)
+      : target_(target), default_authority_(default_authority), args_(args) {}
 
   /// Returns the target used for creating the channel in the canonical form.
   /// (Canonicalized target definition -
@@ -36,13 +42,22 @@ class StatsPluginChannelScope {
   absl::string_view target() const { return target_; }
   /// Returns the default authority for the channel.
   absl::string_view default_authority() const { return default_authority_; }
+  /// Returns channel arguments.  THIS METHOD IS EXPERIMENTAL.
+  // TODO(roth, ctiller, yashkt): Find a better representation for
+  // channel args before de-experimentalizing this API.
+  const grpc_event_engine::experimental::EndpointConfig& experimental_args()
+      const {
+    return args_;
+  }
 
  private:
   // Disable copy constructor and copy-assignment operator.
   StatsPluginChannelScope(const StatsPluginChannelScope&) = delete;
   StatsPluginChannelScope& operator=(const StatsPluginChannelScope&) = delete;
+
   absl::string_view target_;
   absl::string_view default_authority_;
+  const grpc_event_engine::experimental::EndpointConfig& args_;
 };
 
 }  // namespace experimental

data/include/grpc/support/port_platform.h

@@ -172,7 +172,6 @@
 #if __ANDROID_API__ < 21
 #error "Requires Android API v21 and above"
 #endif
-#define GPR_SUPPORT_BINDER_TRANSPORT 1
 // TODO(apolcyn): re-evaluate support for c-ares
 // on android after upgrading our c-ares dependency.
 // See https://github.com/grpc/grpc/issues/18038.
@@ -195,6 +194,12 @@
 #define GPR_HAS_PTHREAD_H 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
+#if defined(__has_include)
+#if __has_include(<android/ndk-version.h>)
+#include <android/ndk-version.h>
+#endif /* __has_include(<android/ndk-version.h>) */
+#endif /* defined(__has_include) */
+#include <linux/version.h>
 #elif defined(__linux__)
 #define GPR_PLATFORM_STRING "linux"
 #ifndef _BSD_SOURCE
@@ -272,6 +277,9 @@
 #define GPR_PLATFORM_STRING "ios"
 #define GPR_CPU_IPHONE 1
 #define GRPC_CFSTREAM 1
+#ifndef GRPC_IOS_EVENT_ENGINE_CLIENT
+#define GRPC_IOS_EVENT_ENGINE_CLIENT 1
+#endif /* GRPC_IOS_EVENT_ENGINE_CLIENT */
 /* the c-ares resolver isn't safe to enable on iOS */
 #define GRPC_ARES 0
 #else /* TARGET_OS_IPHONE */
@@ -743,6 +751,22 @@ extern void gpr_unreachable_code(const char* reason, const char* file,
 #endif
 #endif /* GPR_ATTRIBUTE_NOINLINE */
 
+#ifndef GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION
+#ifdef __cplusplus
+#if GPR_HAS_CPP_ATTRIBUTE(clang::always_inline)
+#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION [[clang::always_inline]]
+#elif GPR_HAS_ATTRIBUTE(always_inline)
+#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION __attribute__((always_inline))
+#else
+// TODO(ctiller): add __forceinline for MSVC
+#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION
+#endif
+#else
+// Disable for C code
+#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION
+#endif
+#endif /* GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION */
+
 #ifndef GPR_NO_UNIQUE_ADDRESS
 #if GPR_HAS_CPP_ATTRIBUTE(no_unique_address)
 #define GPR_NO_UNIQUE_ADDRESS [[no_unique_address]]
@@ -817,6 +841,12 @@ extern void gpr_unreachable_code(const char* reason, const char* file,
 #endif /* __GPR_WINDOWS */
 #endif /* GRPC_ALLOW_EXCEPTIONS */
 
+#ifdef __has_builtin
+#define GRPC_HAS_BUILTIN(a) __has_builtin(a)
+#else
+#define GRPC_HAS_BUILTIN(a) 0
+#endif
+
 /* Use GPR_LIKELY only in cases where you are sure that a certain outcome is the
  * most likely. Ideally, also collect performance numbers to justify the claim.
  */

data/include/grpc/support/sync_generic.h

@@ -29,8 +29,7 @@ typedef struct {
   gpr_atm state;
 } gpr_event;
 
-#define GPR_EVENT_INIT \
-  { 0 }
+#define GPR_EVENT_INIT {0}
 
 /* gpr_refcount */
 typedef struct {
@@ -42,7 +41,6 @@ typedef struct {
   gpr_atm value;
 } gpr_stats_counter;
 
-#define GPR_STATS_INIT \
-  { 0 }
+#define GPR_STATS_INIT {0}
 
 #endif /* GRPC_SUPPORT_SYNC_GENERIC_H */

data/include/grpc/support/sync_posix.h

@@ -19,10 +19,9 @@
 #ifndef GRPC_SUPPORT_SYNC_POSIX_H
 #define GRPC_SUPPORT_SYNC_POSIX_H
 
-#include <pthread.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync_generic.h>
+#include <pthread.h>
 
 #ifdef GRPC_ASAN_ENABLED
 /* The member |leak_checker| is used to check whether there is a memory leak

data/include/grpc/support/time.h

@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_TIME_H
 #define GRPC_SUPPORT_TIME_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <time.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

data/src/core/channelz/channel_trace.cc

@@ -18,20 +18,19 @@
 
 #include "src/core/channelz/channel_trace.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/strings/str_cat.h"
 #include "src/core/channelz/channelz.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
+#include "src/core/util/string.h"
+#include "src/core/util/time.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/channelz/channel_trace.h

@@ -19,18 +19,16 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/json/json.h"
+#include "absl/base/thread_annotations.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/channelz/channelz.cc

@@ -18,6 +18,10 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
@@ -27,22 +31,16 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/transport/connectivity_state.h"
-#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/util/json/json_writer.h"
+#include "src/core/util/string.h"
+#include "src/core/util/uri.h"
+#include "src/core/util/useful.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/channelz/channelz.h

@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -31,20 +35,14 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channel_trace.h"
-#include "src/core/lib/gpr/time_precise.h"
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/per_cpu.h"
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/json/json.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/per_cpu.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
+#include "src/core/util/time_precise.h"
+#include "src/core/util/useful.h"
 
 // Channel arg key for channelz node.
 #define GRPC_ARG_CHANNELZ_CHANNEL_NODE "grpc.internal.channelz_channel_node"
@@ -72,7 +70,7 @@ class ListenSocketNode;
 
 namespace testing {
 class CallCountingHelperPeer;
-class ChannelNodePeer;
+class SubchannelNodePeer;
 }  // namespace testing
 
 // base class for all channelz entities
@@ -228,9 +226,6 @@ class ChannelNode final : public BaseNode {
   void RemoveChildSubchannel(intptr_t child_uuid);
 
  private:
-  // Allows the channel trace test to access trace_.
-  friend class testing::ChannelNodePeer;
-
   void PopulateChildRefs(Json::Object* json);
 
   std::string target_;
@@ -277,6 +272,9 @@ class SubchannelNode final : public BaseNode {
   void RecordCallSucceeded() { call_counter_.RecordCallSucceeded(); }
 
  private:
+  // Allows the channel trace test to access trace_.
+  friend class testing::SubchannelNodePeer;
+
   std::atomic<grpc_connectivity_state> connectivity_state_{GRPC_CHANNEL_IDLE};
   Mutex socket_mu_;
   RefCountedPtr<SocketNode> child_socket_ ABSL_GUARDED_BY(socket_mu_);

data/src/core/channelz/channelz_registry.cc

@@ -18,6 +18,11 @@
 
 #include "src/core/channelz/channelz_registry.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -25,18 +30,12 @@
 #include <vector>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
+#include "absl/log/log.h"
 #include "src/core/channelz/channelz.h"
-#include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_writer.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/json/json_writer.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_core {
 namespace channelz {
@@ -171,7 +170,7 @@ void ChannelzRegistry::InternalLogAllEntities() {
   }
   for (size_t i = 0; i < nodes.size(); ++i) {
     std::string json = nodes[i]->RenderJsonString();
-    gpr_log(GPR_INFO, "%s", json.c_str());
+    LOG(INFO) << json;
   }
 }
 

data/src/core/channelz/channelz_registry.h

@@ -19,17 +19,16 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/gprpp/sync.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/sync.h"
 
 namespace grpc_core {
 namespace channelz {

data/src/core/client_channel/backup_poller.cc

@@ -16,27 +16,24 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/backup_poller.h"
 
-#include <inttypes.h>
-
-#include "absl/status/status.h"
-
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <inttypes.h>
 
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/config/config_vars.h"
-#include "src/core/lib/gprpp/memory.h"
-#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/timer.h"
+#include "src/core/util/memory.h"
+#include "src/core/util/time.h"
 
 #define DEFAULT_POLL_INTERVAL_MS 5000
 
@@ -60,16 +57,26 @@ static backup_poller* g_poller = nullptr;  // guarded by g_poller_mu
 // treated as const.
 static grpc_core::Duration g_poll_interval =
     grpc_core::Duration::Milliseconds(DEFAULT_POLL_INTERVAL_MS);
+// TODO(hork): delete the backup poller when EventEngine is rolled out
+// everywhere.
+static bool g_backup_polling_disabled;
 
 void grpc_client_channel_global_init_backup_polling() {
+  // Disable backup polling if EventEngine is used everywhere.
+  g_backup_polling_disabled = grpc_core::IsEventEngineClientEnabled() &&
+                              grpc_core::IsEventEngineListenerEnabled() &&
+                              grpc_core::IsEventEngineDnsEnabled();
+  if (g_backup_polling_disabled) {
+    return;
+  }
+
   gpr_mu_init(&g_poller_mu);
   int32_t poll_interval_ms =
       grpc_core::ConfigVars::Get().ClientChannelBackupPollIntervalMs();
   if (poll_interval_ms < 0) {
-    gpr_log(GPR_ERROR,
-            "Invalid GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS: %d, "
-            "default value %" PRId64 " will be used.",
-            poll_interval_ms, g_poll_interval.millis());
+    LOG(ERROR) << "Invalid GRPC_CLIENT_CHANNEL_BACKUP_POLL_INTERVAL_MS: "
+               << poll_interval_ms << ", default value "
+               << g_poll_interval.millis() << " will be used.";
   } else {
     g_poll_interval = grpc_core::Duration::Milliseconds(poll_interval_ms);
   }
@@ -150,7 +157,8 @@ static void g_poller_init_locked() {
 
 void grpc_client_channel_start_backup_polling(
     grpc_pollset_set* interested_parties) {
-  if (g_poll_interval == grpc_core::Duration::Zero() ||
+  if (g_backup_polling_disabled ||
+      g_poll_interval == grpc_core::Duration::Zero() ||
       grpc_iomgr_run_in_background()) {
     return;
   }
@@ -169,7 +177,8 @@ void grpc_client_channel_start_backup_polling(
 
 void grpc_client_channel_stop_backup_polling(
     grpc_pollset_set* interested_parties) {
-  if (g_poll_interval == grpc_core::Duration::Zero() ||
+  if (g_backup_polling_disabled ||
+      g_poll_interval == grpc_core::Duration::Zero() ||
       grpc_iomgr_run_in_background()) {
     return;
   }