grpc 1.64.0 → 1.68.1

data/src/core/{lib/gprpp → util}/ref_counted_ptr.h

@@ -16,9 +16,10 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H
-#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H
+#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H
+#define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <iosfwd>
@@ -26,11 +27,8 @@
 #include <utility>
 
 #include "absl/hash/hash.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/down_cast.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/down_cast.h"
 
 namespace grpc_core {
 
@@ -442,4 +440,4 @@ struct RefCountedPtrEq {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H
+#endif  // GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H

data/src/core/{lib/gprpp → util}/ref_counted_string.cc

@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include "src/core/lib/gprpp/ref_counted_string.h"
+#include "src/core/util/ref_counted_string.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <new>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 RefCountedPtr<RefCountedString> RefCountedString::Make(absl::string_view src) {

data/src/core/{lib/gprpp → util}/ref_counted_string.h

@@ -14,19 +14,17 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H
-#define GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H
+#ifndef GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H
+#define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
 
@@ -158,4 +156,4 @@ struct RefCountedStringValueLessThan {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_REF_COUNTED_STRING_H
+#endif  // GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H

data/src/core/util/ring_buffer.h

@@ -0,0 +1,123 @@
+// Copyright 2024 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_SRC_CORE_UTIL_RING_BUFFER_H
+#define GRPC_SRC_CORE_UTIL_RING_BUFFER_H
+
+#include <grpc/support/port_platform.h>
+
+#include <array>
+#include <cstddef>
+#include <iterator>
+
+#include "absl/types/optional.h"
+
+namespace grpc_core {
+
+template <typename T, int kCapacity>
+class RingBuffer {
+ public:
+  class RingBufferIterator {
+   public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = const T;
+    using pointer = void;
+    using reference = void;
+    using difference_type = std::ptrdiff_t;
+
+    RingBufferIterator& operator++() {
+      if (--size_ <= 0) {
+        head_ = 0;
+        size_ = 0;
+        buffer_ = nullptr;
+      } else {
+        head_ = (head_ + 1) % kCapacity;
+      }
+      return *this;
+    }
+
+    RingBufferIterator operator++(int) {
+      RingBufferIterator tmp(*this);
+      operator++();
+      return tmp;
+    }
+
+    bool operator==(const RingBufferIterator& rhs) const {
+      return (buffer_ == rhs.buffer_ && head_ == rhs.head_ &&
+              size_ == rhs.size_);
+    }
+
+    bool operator!=(const RingBufferIterator& rhs) const {
+      return !operator==(rhs);
+    }
+
+    T operator*() { return buffer_->data_[head_]; }
+
+    RingBufferIterator() : buffer_(nullptr), head_(0), size_(0) {};
+    RingBufferIterator(const RingBufferIterator& other) = default;
+    explicit RingBufferIterator(const RingBuffer<T, kCapacity>* buffer)
+        : buffer_(buffer), head_(buffer->head_), size_(buffer->size_) {
+      if (!size_) {
+        buffer_ = nullptr;
+      }
+    }
+
+   private:
+    friend class RingBuffer<T, kCapacity>;
+    const RingBuffer<T, kCapacity>* buffer_;
+    int head_ = 0;
+    int size_ = 0;
+  };
+
+  RingBuffer() = default;
+
+  void Append(T data) {
+    if (size_ < kCapacity) {
+      data_[size_] = std::move(data);
+      size_++;
+    } else {
+      data_[head_] = std::move(data);
+      head_ = (head_ + 1) % kCapacity;
+    }
+  }
+
+  // Returns the data of the first element in the buffer and removes it from
+  // the buffer. If the buffer is empty, returns absl::nullopt.
+  absl::optional<T> PopIfNotEmpty() {
+    if (!size_) return absl::nullopt;
+    T data = std::move(data_[head_]);
+    --size_;
+    head_ = (head_ + 1) % kCapacity;
+    return data;
+  }
+
+  void Clear() {
+    head_ = 0;
+    size_ = 0;
+  }
+
+  RingBufferIterator begin() const { return RingBufferIterator(this); }
+
+  RingBufferIterator end() const { return RingBufferIterator(); }
+
+ private:
+  friend class RingBufferIterator;
+  std::array<T, kCapacity> data_;
+  int head_ = 0;
+  int size_ = 0;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_UTIL_RING_BUFFER_H

data/src/core/{lib/gprpp → util}/single_set_ptr.h

@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H
-#define GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H
+#ifndef GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H
+#define GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H
+
+#include <grpc/support/port_platform.h>
 
 #include <atomic>
 #include <memory>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 template <class T, class Deleter = std::default_delete<T>>
@@ -63,17 +62,19 @@ class SingleSetPtr {
   void Reset() { Delete(p_.exchange(nullptr, std::memory_order_acq_rel)); }
 
   bool is_set() const {
-    T* p = p_.load(std::memory_order_acquire);
+    T* p = Get();
     return p != nullptr;
   }
 
+  T* Get() const { return p_.load(std::memory_order_acquire); }
+
   T* operator->() const {
-    T* p = p_.load(std::memory_order_acquire);
+    T* p = Get();
     DCHECK_NE(p, nullptr);
     return p;
   }
 
-  T& operator*() const { return *operator->(); }
+  T& operator*() const { return *Get(); }
 
  private:
   static void Delete(T* p) {
@@ -85,4 +86,4 @@ class SingleSetPtr {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_SINGLE_SET_PTR_H
+#endif  // GRPC_SRC_CORE_UTIL_SINGLE_SET_PTR_H

data/src/core/{lib/gprpp → util}/sorted_pack.h

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H
-#define GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H
-
-#include <type_traits>
+#ifndef GRPC_SRC_CORE_UTIL_SORTED_PACK_H
+#define GRPC_SRC_CORE_UTIL_SORTED_PACK_H
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gprpp/type_list.h"
+#include <type_traits>
+
+#include "src/core/util/type_list.h"
 
 namespace grpc_core {
 
@@ -86,4 +86,4 @@ struct WithSortedPack {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_SORTED_PACK_H
+#endif  // GRPC_SRC_CORE_UTIL_SORTED_PACK_H

data/src/core/{lib/gpr → util}/spinlock.h

@@ -16,12 +16,11 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
-#define GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_UTIL_SPINLOCK_H
+#define GRPC_SRC_CORE_UTIL_SPINLOCK_H
 
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 // Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always
 // a concurrency code smell. Code must _never_ block while holding a spinlock
@@ -34,8 +33,7 @@ struct gpr_spinlock {
 #else
 #define GPR_SPINLOCK_INITIALIZER ((gpr_spinlock){0})
 #endif
-#define GPR_SPINLOCK_STATIC_INITIALIZER \
-  { 0 }
+#define GPR_SPINLOCK_STATIC_INITIALIZER {0}
 
 #define gpr_spinlock_trylock(lock) (gpr_atm_acq_cas(&(lock)->atm, 0, 1))
 #define gpr_spinlock_unlock(lock) (gpr_atm_rel_store(&(lock)->atm, 0))
@@ -50,4 +48,4 @@ struct gpr_spinlock {
   do {                          \
   } while (!gpr_spinlock_trylock((lock)))
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_SPINLOCK_H
+#endif  // GRPC_SRC_CORE_UTIL_SPINLOCK_H

data/src/core/{lib/gprpp → util}/stat.h

@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_STAT_H
-#define GRPC_SRC_CORE_LIB_GPRPP_STAT_H
+#ifndef GRPC_SRC_CORE_UTIL_STAT_H
+#define GRPC_SRC_CORE_UTIL_STAT_H
 
+#include <grpc/support/port_platform.h>
 #include <time.h>
 
 #include "absl/status/status.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Gets the last-modified timestamp of a file or a directory.
@@ -33,4 +32,4 @@ absl::Status GetFileModificationTime(const char* filename, time_t* timestamp);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_STAT_H
+#endif  // GRPC_SRC_CORE_UTIL_STAT_H

data/src/core/{lib/gprpp → util}/status_helper.cc

@@ -16,8 +16,9 @@
 //
 //
 
-#include "src/core/lib/gprpp/status_helper.h"
+#include "src/core/util/status_helper.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <utility>
@@ -32,14 +33,10 @@
 #include "absl/time/clock.h"
 #include "google/protobuf/any.upb.h"
 #include "google/rpc/status.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
@@ -60,30 +57,16 @@ const absl::string_view kChildrenPropertyUrl = TYPE_URL(TYPE_CHILDREN_TAG);
 
 const char* GetStatusIntPropertyUrl(StatusIntProperty key) {
   switch (key) {
-    case StatusIntProperty::kErrorNo:
-      return TYPE_URL(TYPE_INT_TAG "errno");
     case StatusIntProperty::kFileLine:
       return TYPE_URL(TYPE_INT_TAG "file_line");
     case StatusIntProperty::kStreamId:
       return TYPE_URL(TYPE_INT_TAG "stream_id");
     case StatusIntProperty::kRpcStatus:
       return TYPE_URL(TYPE_INT_TAG "grpc_status");
-    case StatusIntProperty::kOffset:
-      return TYPE_URL(TYPE_INT_TAG "offset");
-    case StatusIntProperty::kIndex:
-      return TYPE_URL(TYPE_INT_TAG "index");
-    case StatusIntProperty::kSize:
-      return TYPE_URL(TYPE_INT_TAG "size");
     case StatusIntProperty::kHttp2Error:
       return TYPE_URL(TYPE_INT_TAG "http2_error");
-    case StatusIntProperty::kTsiCode:
-      return TYPE_URL(TYPE_INT_TAG "tsi_code");
-    case StatusIntProperty::kWsaError:
-      return TYPE_URL(TYPE_INT_TAG "wsa_error");
     case StatusIntProperty::kFd:
       return TYPE_URL(TYPE_INT_TAG "fd");
-    case StatusIntProperty::kHttpStatus:
-      return TYPE_URL(TYPE_INT_TAG "http_status");
     case StatusIntProperty::kOccurredDuringWrite:
       return TYPE_URL(TYPE_INT_TAG "occurred_during_write");
     case StatusIntProperty::ChannelConnectivityState:
@@ -100,24 +83,8 @@ const char* GetStatusStrPropertyUrl(StatusStrProperty key) {
       return TYPE_URL(TYPE_STR_TAG "description");
     case StatusStrProperty::kFile:
       return TYPE_URL(TYPE_STR_TAG "file");
-    case StatusStrProperty::kOsError:
-      return TYPE_URL(TYPE_STR_TAG "os_error");
-    case StatusStrProperty::kSyscall:
-      return TYPE_URL(TYPE_STR_TAG "syscall");
-    case StatusStrProperty::kTargetAddress:
-      return TYPE_URL(TYPE_STR_TAG "target_address");
     case StatusStrProperty::kGrpcMessage:
       return TYPE_URL(TYPE_STR_TAG "grpc_message");
-    case StatusStrProperty::kRawBytes:
-      return TYPE_URL(TYPE_STR_TAG "raw_bytes");
-    case StatusStrProperty::kTsiError:
-      return TYPE_URL(TYPE_STR_TAG "tsi_error");
-    case StatusStrProperty::kFilename:
-      return TYPE_URL(TYPE_STR_TAG "filename");
-    case StatusStrProperty::kKey:
-      return TYPE_URL(TYPE_STR_TAG "key");
-    case StatusStrProperty::kValue:
-      return TYPE_URL(TYPE_STR_TAG "value");
   }
   GPR_UNREACHABLE_CODE(return "unknown");
 }
@@ -348,6 +315,17 @@ std::string StatusToString(const absl::Status& status) {
                      : absl::StrCat(head, " {", absl::StrJoin(kvs, ", "), "}");
 }
 
+absl::Status AddMessagePrefix(absl::string_view prefix, absl::Status status) {
+  absl::Status new_status(status.code(),
+                          absl::StrCat(prefix, ": ", status.message()));
+  // TODO(roth): Remove this once we elimiate all status attributes.
+  status.ForEachPayload(
+      [&](absl::string_view type_url, const absl::Cord& payload) {
+        new_status.SetPayload(type_url, payload);
+      });
+  return new_status;
+}
+
 namespace internal {
 
 google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) {
@@ -361,7 +339,7 @@ google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) {
                          PercentEncodingType::Compatible);
   char* message_percent = reinterpret_cast<char*>(
       upb_Arena_Malloc(arena, message_percent_slice.length()));
-  if (message_percent_slice.length() > 0) {
+  if (!message_percent_slice.empty()) {
     memcpy(message_percent, message_percent_slice.data(),
            message_percent_slice.length());
   }

data/src/core/{lib/gprpp → util}/status_helper.h

@@ -16,9 +16,10 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H
-#define GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H
+#ifndef GRPC_SRC_CORE_UTIL_STATUS_HELPER_H
+#define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -28,10 +29,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/util/debug_location.h"
 
 extern "C" {
 struct google_rpc_Status;
@@ -48,8 +46,6 @@ namespace grpc_core {
 
 /// This enum should have the same value of grpc_error_ints
 enum class StatusIntProperty {
-  /// 'errno' from the operating system
-  kErrorNo,
   /// __LINE__ from the call site creating the error
   kFileLine,
   /// stream identifier: for errors that are associated with an individual
@@ -58,23 +54,10 @@ enum class StatusIntProperty {
   /// grpc status code representing this error
   // TODO(veblush): Remove this after grpc_error is replaced with absl::Status
   kRpcStatus,
-  /// offset into some binary blob (usually represented by
-  /// RAW_BYTES) where the error occurred
-  kOffset,
-  /// context sensitive index associated with the error
-  kIndex,
-  /// context sensitive size associated with the error
-  kSize,
   /// http2 error code associated with the error (see the HTTP2 RFC)
   kHttp2Error,
-  /// TSI status code associated with the error
-  kTsiCode,
-  /// WSAGetLastError() reported when this error occurred
-  kWsaError,
   /// File descriptor associated with this error
   kFd,
-  /// HTTP status (i.e. 404)
-  kHttpStatus,
   /// chttp2: did the error occur while a write was in progress
   kOccurredDuringWrite,
   /// channel connectivity state associated with the error
@@ -89,24 +72,8 @@ enum class StatusStrProperty {
   kDescription,
   /// source file in which this error occurred
   kFile,
-  /// operating system description of this error
-  kOsError,
-  /// syscall that generated this error
-  kSyscall,
   /// peer that we were trying to communicate when this error occurred
-  kTargetAddress,
-  /// grpc status message associated with this error
   kGrpcMessage,
-  /// hex dump (or similar) with the data that generated this error
-  kRawBytes,
-  /// tsi error string associated with this error
-  kTsiError,
-  /// filename that we were trying to read/write when this error occurred
-  kFilename,
-  /// key associated with the error
-  kKey,
-  /// value associated with the error
-  kValue,
 };
 
 /// This enum should have the same value of grpc_error_times
@@ -158,6 +125,9 @@ GRPC_MUST_USE_RESULT std::vector<absl::Status> StatusGetChildren(
 ///   CANCELLATION:SampleMessage {errno:'2021', line:'54', children:[ABORTED]}
 GRPC_MUST_USE_RESULT std::string StatusToString(const absl::Status& status);
 
+/// Adds prefix to the message of status.
+absl::Status AddMessagePrefix(absl::string_view prefix, absl::Status status);
+
 namespace internal {
 
 /// Builds a upb message, google_rpc_Status from a status
@@ -187,4 +157,4 @@ absl::Status StatusMoveFromHeapPtr(uintptr_t ptr);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_STATUS_HELPER_H
+#endif  // GRPC_SRC_CORE_UTIL_STATUS_HELPER_H

data/src/core/{lib/gprpp → util}/strerror.cc

@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/gprpp/strerror.h"
+#include "src/core/util/strerror.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/strings/str_format.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 #ifdef GPR_WINDOWS

data/src/core/{lib/gprpp → util}/strerror.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H
-#define GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H
-
-#include <string>
+#ifndef GRPC_SRC_CORE_UTIL_STRERROR_H
+#define GRPC_SRC_CORE_UTIL_STRERROR_H
 
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 namespace grpc_core {
 
 // Returns a string describing the posix error code.
@@ -26,4 +26,4 @@ std::string StrError(int err);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_GPRPP_STRERROR_H
+#endif  // GRPC_SRC_CORE_UTIL_STRERROR_H

data/src/core/{lib/gpr → util}/string.cc

@@ -16,11 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/gpr/string.h"
+#include "src/core/util/string.h"
 
 #include <ctype.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -29,13 +30,9 @@
 #include <time.h>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/crash.h"
+#include "absl/time/time.h"
+#include "src/core/util/crash.h"
+#include "src/core/util/useful.h"
 
 char* gpr_strdup(const char* src) {
   char* dst;
@@ -54,14 +51,14 @@ char* gpr_strdup(const char* src) {
 }
 
 std::string gpr_format_timespec(gpr_timespec tm) {
-  char time_buffer[35];
-  char ns_buffer[11];  // '.' + 9 digits of precision
-  struct tm* tm_info = localtime(reinterpret_cast<time_t*>(&tm.tv_sec));
-  strftime(time_buffer, sizeof(time_buffer), "%Y-%m-%dT%H:%M:%S", tm_info);
-  snprintf(ns_buffer, 11, ".%09d", tm.tv_nsec);
+  const std::string time_str =
+      absl::FormatTime("%Y-%m-%d%ET%H:%M:%S", absl::FromUnixSeconds(tm.tv_sec),
+                       absl::LocalTimeZone());
   // This loop trims off trailing zeros by inserting a null character that the
   // right point. We iterate in chunks of three because we want 0, 3, 6, or 9
   // fractional digits.
+  char ns_buffer[11];  // '.' + 9 digits of precision
+  snprintf(ns_buffer, 11, ".%09d", tm.tv_nsec);
   for (int i = 7; i >= 1; i -= 3) {
     if (ns_buffer[i] == '0' && ns_buffer[i + 1] == '0' &&
         ns_buffer[i + 2] == '0') {
@@ -74,7 +71,7 @@ std::string gpr_format_timespec(gpr_timespec tm) {
       break;
     }
   }
-  return absl::StrCat(time_buffer, ns_buffer, "Z");
+  return absl::StrCat(time_str, ns_buffer, "Z");
 }
 
 struct dump_out {

data/src/core/{lib/gpr → util}/string.h

@@ -16,18 +16,16 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_GPR_STRING_H
-#define GRPC_SRC_CORE_LIB_GPR_STRING_H
+#ifndef GRPC_SRC_CORE_UTIL_STRING_H
+#define GRPC_SRC_CORE_UTIL_STRING_H
 
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/support/time.h>
-
 // String utility functions
 
 // Flags for gpr_dump function.
@@ -109,4 +107,4 @@ void* gpr_memrchr(const void* s, int c, size_t n);
 // Otherwise, it returns false.
 bool gpr_parse_bool_value(const char* value, bool* dst);
 
-#endif  // GRPC_SRC_CORE_LIB_GPR_STRING_H
+#endif  // GRPC_SRC_CORE_UTIL_STRING_H