grpc 1.62.0 → 1.63.2

data/src/core/lib/experiments/experiments.h

@@ -60,8 +60,6 @@ namespace grpc_core {
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; }
 inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
-inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
@@ -77,17 +75,10 @@ inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
-inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
 inline bool IsChaoticGoodEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
-inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
-inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_ROUND_ROBIN_DELEGATE_TO_PICK_FIRST
-inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsServerPrivacyEnabled() { return false; }
@@ -95,26 +86,14 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-inline bool IsV3BackendMetricFilterEnabled() { return false; }
-inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
-inline bool IsV3CompressionFilterEnabled() { return false; }
-inline bool IsV3ServerAuthFilterEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
 inline bool IsWorkSerializerDispatchEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
-inline bool IsWriteSizePolicyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
-inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 
 #elif defined(GPR_WINDOWS)
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; }
 inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
-inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
@@ -131,17 +110,10 @@ inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
-inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
 inline bool IsChaoticGoodEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
-inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
-inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_ROUND_ROBIN_DELEGATE_TO_PICK_FIRST
-inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsServerPrivacyEnabled() { return false; }
@@ -149,29 +121,18 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-inline bool IsV3BackendMetricFilterEnabled() { return false; }
-inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
-inline bool IsV3CompressionFilterEnabled() { return false; }
-inline bool IsV3ServerAuthFilterEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
 inline bool IsWorkSerializerDispatchEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
-inline bool IsWriteSizePolicyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
-inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
 
 #else
 inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; }
 inline bool IsCallV3Enabled() { return false; }
 inline bool IsCanaryClientPrivacyEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
-inline bool IsClientIdlenessEnabled() { return true; }
 inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineClientEnabled() { return false; }
-inline bool IsEventEngineDnsEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
+inline bool IsEventEngineDnsEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
@@ -185,17 +146,10 @@ inline bool IsMultipingEnabled() { return false; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
-inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
 inline bool IsChaoticGoodEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
-inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
-inline bool IsRfcMaxConcurrentStreamsEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_ROUND_ROBIN_DELEGATE_TO_PICK_FIRST
-inline bool IsRoundRobinDelegateToPickFirstEnabled() { return true; }
 inline bool IsRstpitEnabled() { return false; }
 inline bool IsScheduleCancellationOverWriteEnabled() { return false; }
 inline bool IsServerPrivacyEnabled() { return false; }
@@ -203,19 +157,10 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-inline bool IsV3BackendMetricFilterEnabled() { return false; }
-inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
-inline bool IsV3CompressionFilterEnabled() { return false; }
-inline bool IsV3ServerAuthFilterEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
-inline bool IsWorkSerializerDispatchEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
-inline bool IsWriteSizePolicyEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() { return true; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
-inline bool IsWrrDelegateToPickFirstEnabled() { return true; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
+inline bool IsWorkSerializerDispatchEnabled() { return true; }
 #endif
 
 #else
@@ -223,7 +168,6 @@ enum ExperimentIds {
   kExperimentIdCallStatusOverrideOnCancellation,
   kExperimentIdCallV3,
   kExperimentIdCanaryClientPrivacy,
-  kExperimentIdClientIdleness,
   kExperimentIdClientPrivacy,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
@@ -236,14 +180,10 @@ enum ExperimentIds {
   kExperimentIdMultiping,
   kExperimentIdPeerStateBasedFraming,
   kExperimentIdPendingQueueCap,
-  kExperimentIdPickFirstHappyEyeballs,
   kExperimentIdPromiseBasedClientCall,
   kExperimentIdPromiseBasedServerCall,
   kExperimentIdChaoticGood,
-  kExperimentIdRegisteredMethodLookupInTransport,
   kExperimentIdPromiseBasedInprocTransport,
-  kExperimentIdRfcMaxConcurrentStreams,
-  kExperimentIdRoundRobinDelegateToPickFirst,
   kExperimentIdRstpit,
   kExperimentIdScheduleCancellationOverWrite,
   kExperimentIdServerPrivacy,
@@ -251,15 +191,8 @@ enum ExperimentIds {
   kExperimentIdTcpRcvLowat,
   kExperimentIdTraceRecordCallops,
   kExperimentIdUnconstrainedMaxQuotaBufferSize,
-  kExperimentIdV3BackendMetricFilter,
-  kExperimentIdV3ChannelIdleFilters,
-  kExperimentIdV3CompressionFilter,
-  kExperimentIdV3ServerAuthFilter,
   kExperimentIdWorkSerializerClearsTimeCache,
   kExperimentIdWorkSerializerDispatch,
-  kExperimentIdWriteSizePolicy,
-  kExperimentIdWriteSizeCap,
-  kExperimentIdWrrDelegateToPickFirst,
   kNumExperiments
 };
 #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION
@@ -274,10 +207,6 @@ inline bool IsCallV3Enabled() {
 inline bool IsCanaryClientPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS
-inline bool IsClientIdlenessEnabled() {
-  return IsExperimentEnabled(kExperimentIdClientIdleness);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY
 inline bool IsClientPrivacyEnabled() {
   return IsExperimentEnabled(kExperimentIdClientPrivacy);
@@ -326,10 +255,6 @@ inline bool IsPeerStateBasedFramingEnabled() {
 inline bool IsPendingQueueCapEnabled() {
   return IsExperimentEnabled(kExperimentIdPendingQueueCap);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_HAPPY_EYEBALLS
-inline bool IsPickFirstHappyEyeballsEnabled() {
-  return IsExperimentEnabled(kExperimentIdPickFirstHappyEyeballs);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_CLIENT_CALL
 inline bool IsPromiseBasedClientCallEnabled() {
   return IsExperimentEnabled(kExperimentIdPromiseBasedClientCall);
@@ -342,22 +267,10 @@ inline bool IsPromiseBasedServerCallEnabled() {
 inline bool IsChaoticGoodEnabled() {
   return IsExperimentEnabled(kExperimentIdChaoticGood);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
-inline bool IsRegisteredMethodLookupInTransportEnabled() {
-  return IsExperimentEnabled(kExperimentIdRegisteredMethodLookupInTransport);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_INPROC_TRANSPORT
 inline bool IsPromiseBasedInprocTransportEnabled() {
   return IsExperimentEnabled(kExperimentIdPromiseBasedInprocTransport);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_RFC_MAX_CONCURRENT_STREAMS
-inline bool IsRfcMaxConcurrentStreamsEnabled() {
-  return IsExperimentEnabled(kExperimentIdRfcMaxConcurrentStreams);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_ROUND_ROBIN_DELEGATE_TO_PICK_FIRST
-inline bool IsRoundRobinDelegateToPickFirstEnabled() {
-  return IsExperimentEnabled(kExperimentIdRoundRobinDelegateToPickFirst);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_RSTPIT
 inline bool IsRstpitEnabled() {
   return IsExperimentEnabled(kExperimentIdRstpit);
@@ -386,22 +299,6 @@ inline bool IsTraceRecordCallopsEnabled() {
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
   return IsExperimentEnabled(kExperimentIdUnconstrainedMaxQuotaBufferSize);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_V3_BACKEND_METRIC_FILTER
-inline bool IsV3BackendMetricFilterEnabled() {
-  return IsExperimentEnabled(kExperimentIdV3BackendMetricFilter);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_V3_CHANNEL_IDLE_FILTERS
-inline bool IsV3ChannelIdleFiltersEnabled() {
-  return IsExperimentEnabled(kExperimentIdV3ChannelIdleFilters);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_V3_COMPRESSION_FILTER
-inline bool IsV3CompressionFilterEnabled() {
-  return IsExperimentEnabled(kExperimentIdV3CompressionFilter);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_V3_SERVER_AUTH_FILTER
-inline bool IsV3ServerAuthFilterEnabled() {
-  return IsExperimentEnabled(kExperimentIdV3ServerAuthFilter);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() {
   return IsExperimentEnabled(kExperimentIdWorkSerializerClearsTimeCache);
@@ -410,18 +307,6 @@ inline bool IsWorkSerializerClearsTimeCacheEnabled() {
 inline bool IsWorkSerializerDispatchEnabled() {
   return IsExperimentEnabled(kExperimentIdWorkSerializerDispatch);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_POLICY
-inline bool IsWriteSizePolicyEnabled() {
-  return IsExperimentEnabled(kExperimentIdWriteSizePolicy);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRITE_SIZE_CAP
-inline bool IsWriteSizeCapEnabled() {
-  return IsExperimentEnabled(kExperimentIdWriteSizeCap);
-}
-#define GRPC_EXPERIMENT_IS_INCLUDED_WRR_DELEGATE_TO_PICK_FIRST
-inline bool IsWrrDelegateToPickFirstEnabled() {
-  return IsExperimentEnabled(kExperimentIdWrrDelegateToPickFirst);
-}
 
 extern const ExperimentMetadata g_experiment_metadata[kNumExperiments];
 

data/src/core/lib/gpr/android/log.cc

@@ -57,7 +57,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   free(message);
 }
 
-void gpr_default_log(gpr_log_func_args* args) {
+void gpr_platform_log(gpr_log_func_args* args) {
   const char* final_slash;
   const char* display_file;
   char* output = NULL;

data/src/core/lib/gpr/linux/log.cc

@@ -70,7 +70,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   free(message);
 }
 
-void gpr_default_log(gpr_log_func_args* args) {
+void gpr_platform_log(gpr_log_func_args* args) {
   const char* final_slash;
   const char* display_file;
   char time_buffer[64];

data/src/core/lib/gpr/log.cc

@@ -18,6 +18,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+
 #include <stdio.h>
 #include <string.h>
 
@@ -40,6 +42,7 @@ static constexpr gpr_atm GPR_LOG_SEVERITY_UNSET = GPR_LOG_SEVERITY_ERROR + 10;
 static constexpr gpr_atm GPR_LOG_SEVERITY_NONE = GPR_LOG_SEVERITY_ERROR + 11;
 
 void gpr_default_log(gpr_log_func_args* args);
+void gpr_platform_log(gpr_log_func_args* args);
 static gpr_atm g_log_func = reinterpret_cast<gpr_atm>(gpr_default_log);
 static gpr_atm g_min_severity_to_print = GPR_LOG_SEVERITY_UNSET;
 static gpr_atm g_min_severity_to_print_stacktrace = GPR_LOG_SEVERITY_UNSET;
@@ -73,6 +76,29 @@ int gpr_should_log(gpr_log_severity severity) {
              : 0;
 }
 
+void gpr_default_log(gpr_log_func_args* args) {
+  if (!grpc_core::ConfigVars::Get().AbslLogging()) {
+    gpr_platform_log(args);
+    return;
+  }
+  switch (args->severity) {
+    case GPR_LOG_SEVERITY_DEBUG:
+      //  Log DEBUG messages as VLOG(2).
+      VLOG(2).AtLocation(args->file, args->line) << args->message;
+      return;
+    case GPR_LOG_SEVERITY_INFO:
+      LOG(INFO).AtLocation(args->file, args->line) << args->message;
+      return;
+    case GPR_LOG_SEVERITY_ERROR:
+      LOG(ERROR).AtLocation(args->file, args->line) << args->message;
+      return;
+    default:
+      LOG(ERROR) << __func__ << ": unknown gpr log severity(" << args->severity
+                 << "), using ERROR";
+      LOG(ERROR).AtLocation(args->file, args->line) << args->message;
+  }
+}
+
 int gpr_should_log_stacktrace(gpr_log_severity severity) {
   return static_cast<gpr_atm>(severity) >=
                  gpr_atm_no_barrier_load(&g_min_severity_to_print_stacktrace)

data/src/core/lib/gpr/posix/log.cc

@@ -70,7 +70,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   gpr_free(allocated);
 }
 
-void gpr_default_log(gpr_log_func_args* args) {
+void gpr_platform_log(gpr_log_func_args* args) {
   const char* final_slash;
   const char* display_file;
   char time_buffer[64];

data/src/core/lib/gpr/posix/time.cc

@@ -45,7 +45,6 @@ static struct timespec timespec_from_gpr(gpr_timespec gts) {
   return rv;
 }
 
-#if _POSIX_TIMERS > 0 || defined(__OpenBSD__)
 static gpr_timespec gpr_from_timespec(struct timespec ts,
                                       gpr_clock_type clock_type) {
   //
@@ -83,65 +82,6 @@ static gpr_timespec now_impl(gpr_clock_type clock_type) {
     return gpr_from_timespec(now, clock_type);
   }
 }
-#else
-// For some reason Apple's OSes haven't implemented clock_gettime.
-
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#include <sys/time.h>
-
-static double g_time_scale = []() {
-  mach_timebase_info_data_t tb = {0, 1};
-  mach_timebase_info(&tb);
-  return static_cast<double>(tb.numer) / static_cast<double>(tb.denom);
-}();
-static uint64_t g_time_start = mach_absolute_time();
-
-void gpr_time_init(void) { gpr_precise_clock_init(); }
-
-static gpr_timespec now_impl(gpr_clock_type clock) {
-  gpr_timespec now;
-  struct timeval now_tv;
-  double now_dbl;
-
-  now.clock_type = clock;
-  switch (clock) {
-    case GPR_CLOCK_REALTIME:
-      // gettimeofday(...) function may return with a value whose tv_usec is
-      // greater than 1e6 on iOS The case is resolved with the guard at end of
-      // this function.
-      gettimeofday(&now_tv, nullptr);
-      now.tv_sec = now_tv.tv_sec;
-      now.tv_nsec = now_tv.tv_usec * 1000;
-      break;
-    case GPR_CLOCK_MONOTONIC:
-      // Add 5 seconds arbitrarily: avoids weird conditions in gprpp/time.cc
-      // when there's a small number of seconds returned.
-      now_dbl = 5.0e9 +
-                ((double)(mach_absolute_time() - g_time_start)) * g_time_scale;
-      now.tv_sec = (int64_t)(now_dbl * 1e-9);
-      now.tv_nsec = (int32_t)(now_dbl - ((double)now.tv_sec) * 1e9);
-      break;
-    case GPR_CLOCK_PRECISE:
-      gpr_precise_clock_now(&now);
-      break;
-    case GPR_TIMESPAN:
-      abort();
-  }
-
-  // Guard the tv_nsec field in valid range for all clock types
-  while (GPR_UNLIKELY(now.tv_nsec >= 1e9)) {
-    now.tv_sec++;
-    now.tv_nsec -= 1e9;
-  }
-  while (GPR_UNLIKELY(now.tv_nsec < 0)) {
-    now.tv_sec--;
-    now.tv_nsec += 1e9;
-  }
-
-  return now;
-}
-#endif
 
 gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type) = now_impl;
 

data/src/core/lib/gpr/windows/log.cc

@@ -73,7 +73,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
 }
 
 // Simple starter implementation
-void gpr_default_log(gpr_log_func_args* args) {
+void gpr_platform_log(gpr_log_func_args* args) {
   const char* final_slash;
   const char* display_file;
   char time_buffer[64];

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

@@ -26,10 +26,10 @@
 namespace grpc_core {
 
 template <typename To, typename From>
-inline To down_cast(From* f) {
+inline To DownCast(From* f) {
   static_assert(
       std::is_base_of<From, typename std::remove_pointer<To>::type>::value,
-      "down_cast requires a base-to-derived relationship");
+      "DownCast requires a base-to-derived relationship");
 // If we have RTTI & we're in debug, assert that the cast is legal.
 #if ABSL_INTERNAL_HAS_RTTI
 #ifndef NDEBUG
@@ -40,8 +40,8 @@ inline To down_cast(From* f) {
 }
 
 template <typename To, typename From>
-inline To down_cast(From& f) {
-  return *down_cast<typename std::remove_reference<To>::type*>(&f);
+inline To DownCast(From& f) {
+  return *DownCast<typename std::remove_reference<To>::type*>(&f);
 }
 
 }  // namespace grpc_core

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

@@ -25,6 +25,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/down_cast.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 
@@ -39,19 +40,19 @@ namespace grpc_core {
 //
 // Each class of refs can be incremented and decremented independently.
 // Objects start with 1 strong ref and 0 weak refs at instantiation.
-// When the strong refcount reaches 0, the object's Orphan() method is called.
+// When the strong refcount reaches 0, the object's Orphaned() method is called.
 // When the weak refcount reaches 0, the object is destroyed.
 //
 // This will be used by CRTP (curiously-recurring template pattern), e.g.:
 //   class MyClass : public RefCounted<MyClass> { ... };
 template <typename Child>
-class DualRefCounted : public Orphanable {
+class DualRefCounted {
  public:
   // Not copyable nor movable.
   DualRefCounted(const DualRefCounted&) = delete;
   DualRefCounted& operator=(const DualRefCounted&) = delete;
 
-  ~DualRefCounted() override = default;
+  virtual ~DualRefCounted() = default;
 
   GRPC_MUST_USE_RESULT RefCountedPtr<Child> Ref() {
     IncrementRefCount();
@@ -68,7 +69,8 @@ class DualRefCounted : public Orphanable {
       std::enable_if_t<std::is_base_of<Child, Subclass>::value, bool> = true>
   RefCountedPtr<Subclass> RefAsSubclass() {
     IncrementRefCount();
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
   template <
       typename Subclass,
@@ -76,7 +78,8 @@ class DualRefCounted : public Orphanable {
   RefCountedPtr<Subclass> RefAsSubclass(const DebugLocation& location,
                                         const char* reason) {
     IncrementRefCount(location, reason);
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
 
   void Unref() {
@@ -93,7 +96,7 @@ class DualRefCounted : public Orphanable {
     GPR_ASSERT(strong_refs > 0);
 #endif
     if (GPR_UNLIKELY(strong_refs == 1)) {
-      Orphan();
+      Orphaned();
     }
     // Now drop the weak ref.
     WeakUnref();
@@ -116,7 +119,7 @@ class DualRefCounted : public Orphanable {
     (void)reason;
 #endif
     if (GPR_UNLIKELY(strong_refs == 1)) {
-      Orphan();
+      Orphaned();
     }
     // Now drop the weak ref.
     WeakUnref(location, reason);
@@ -179,7 +182,8 @@ class DualRefCounted : public Orphanable {
       std::enable_if_t<std::is_base_of<Child, Subclass>::value, bool> = true>
   WeakRefCountedPtr<Subclass> WeakRefAsSubclass() {
     IncrementWeakRefCount();
-    return WeakRefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return WeakRefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
   template <
       typename Subclass,
@@ -187,7 +191,8 @@ class DualRefCounted : public Orphanable {
   WeakRefCountedPtr<Subclass> WeakRefAsSubclass(const DebugLocation& location,
                                                 const char* reason) {
     IncrementWeakRefCount(location, reason);
-    return WeakRefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return WeakRefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
 
   void WeakUnref() {
@@ -257,6 +262,9 @@ class DualRefCounted : public Orphanable {
         refs_(MakeRefPair(initial_refcount, 0)) {
   }
 
+  // Ref count has dropped to zero, so the object is now orphaned.
+  virtual void Orphaned() = 0;
+
  private:
   // Allow RefCountedPtr<> to access IncrementRefCount().
   template <typename T>

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

@@ -32,6 +32,9 @@ namespace grpc_core {
 
 // Loads the content of a file into a slice. add_null_terminator will add a NULL
 // terminator if true.
+// This API is NOT thread-safe and requires proper synchronization when used by
+// multiple threads, especially when they can happen to be reading from the same
+// file.
 absl::StatusOr<Slice> LoadFile(const std::string& filename,
                                bool add_null_terminator) {
   unsigned char* contents = nullptr;
@@ -61,7 +64,6 @@ absl::StatusOr<Slice> LoadFile(const std::string& filename,
   bytes_read = fread(contents, 1, contents_size, file);
   if (bytes_read < contents_size) {
     gpr_free(contents);
-    GPR_ASSERT(ferror(file));
     error = absl::InternalError(
         absl::StrCat("Failed to load file: ", filename,
                      " due to error(fread): ", strerror(errno)));

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

@@ -26,6 +26,7 @@
 #include <utility>
 
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/down_cast.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 
@@ -102,7 +103,8 @@ class InternallyRefCounted : public Orphanable {
       std::enable_if_t<std::is_base_of<Child, Subclass>::value, bool> = true>
   RefCountedPtr<Subclass> RefAsSubclass() {
     IncrementRefCount();
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
   template <
       typename Subclass,
@@ -110,7 +112,8 @@ class InternallyRefCounted : public Orphanable {
   RefCountedPtr<Subclass> RefAsSubclass(const DebugLocation& location,
                                         const char* reason) {
     IncrementRefCount(location, reason);
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
 
   GRPC_MUST_USE_RESULT RefCountedPtr<Child> RefIfNonZero() {

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

@@ -29,6 +29,7 @@
 
 #include "src/core/lib/gprpp/atomic_utils.h"
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/down_cast.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -310,7 +311,8 @@ class RefCounted : public Impl {
       std::enable_if_t<std::is_base_of<Child, Subclass>::value, bool> = true>
   RefCountedPtr<Subclass> RefAsSubclass() {
     IncrementRefCount();
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
   template <
       typename Subclass,
@@ -318,7 +320,8 @@ class RefCounted : public Impl {
   RefCountedPtr<Subclass> RefAsSubclass(const DebugLocation& location,
                                         const char* reason) {
     IncrementRefCount(location, reason);
-    return RefCountedPtr<Subclass>(static_cast<Subclass*>(this));
+    return RefCountedPtr<Subclass>(
+        DownCast<Subclass*>(static_cast<Child*>(this)));
   }
 
   // RefIfNonZero() for mutable types.

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

@@ -30,6 +30,7 @@
 #include "absl/hash/hash.h"
 
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/down_cast.h"
 
 namespace grpc_core {
 
@@ -159,7 +160,7 @@ class RefCountedPtr {
   template <typename Y,
             std::enable_if_t<std::is_base_of<T, Y>::value, bool> = true>
   RefCountedPtr<Y> TakeAsSubclass() {
-    return RefCountedPtr<Y>(static_cast<Y*>(release()));
+    return RefCountedPtr<Y>(DownCast<Y*>(release()));
   }
 
   template <typename Y,

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

@@ -322,6 +322,12 @@ inline Timestamp operator-(Timestamp lhs, Duration rhs) {
 inline Timestamp operator+(Duration lhs, Timestamp rhs) { return rhs + lhs; }
 
 inline Duration operator-(Timestamp lhs, Timestamp rhs) {
+  if (rhs == Timestamp::InfPast() && lhs != Timestamp::InfPast()) {
+    return Duration::Infinity();
+  }
+  if (rhs == Timestamp::InfFuture() && lhs != Timestamp::InfFuture()) {
+    return Duration::NegativeInfinity();
+  }
   return Duration::Milliseconds(
       time_detail::MillisAdd(lhs.milliseconds_after_process_epoch(),
                              -rhs.milliseconds_after_process_epoch()));