grpc 1.58.0 → 1.59.0

data/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc

@@ -15,6 +15,8 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_APPLE
+#include <AvailabilityMacros.h>
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include "absl/strings/str_format.h"
 
@@ -144,17 +146,22 @@ void DNSServiceResolverImpl::ResolveCallback(
   grpc_core::ReleasableMutexLock lock(&that->request_mu_);
   auto request_it = that->requests_.find(sdRef);
   GPR_ASSERT(request_it != that->requests_.end());
-  auto& request = request_it->second;
 
   if (errorCode != kDNSServiceErr_NoError &&
       errorCode != kDNSServiceErr_NoSuchRecord) {
+    // extrace request and release lock before calling on_resolve
+    auto request_node = that->requests_.extract(request_it);
+    lock.Release();
+
+    auto& request = request_node.mapped();
     request.on_resolve(absl::UnknownError(absl::StrFormat(
         "address lookup failed for %s: errorCode: %d", hostname, errorCode)));
-    that->requests_.erase(request_it);
     DNSServiceRefDeallocate(sdRef);
     return;
   }
 
+  auto& request = request_it->second;
+
   // set received ipv4 or ipv6 response, even for kDNSServiceErr_NoSuchRecord to
   // mark that the response for the stack is received, it is possible that the
   // one stack receives some results and the other stack gets
@@ -192,13 +199,17 @@ void DNSServiceResolverImpl::ResolveCallback(
   // with the collected results.
   if (!(flags & kDNSServiceFlagsMoreComing) && request.has_ipv4_response &&
       request.has_ipv6_response) {
+    // extrace request and release lock before calling on_resolve
+    auto request_node = that->requests_.extract(request_it);
+    lock.Release();
+
+    auto& request = request_node.mapped();
     if (request.result.empty()) {
       request.on_resolve(absl::NotFoundError(absl::StrFormat(
           "address lookup failed for %s: Domain name not found", hostname)));
     } else {
       request.on_resolve(std::move(request.result));
     }
-    that->requests_.erase(request_it);
     DNSServiceRefDeallocate(sdRef);
   }
 }
@@ -226,4 +237,5 @@ void DNSServiceResolverImpl::Shutdown() {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
+#endif  // AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #endif  // GPR_APPLE

data/src/core/lib/event_engine/cf_engine/dns_service_resolver.h

@@ -16,6 +16,8 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_APPLE
+#include <AvailabilityMacros.h>
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <dns_sd.h>
@@ -112,6 +114,7 @@ class DNSServiceResolver : public EventEngine::DNSResolver {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
+#endif  // AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 #endif  // GPR_APPLE
 
 #endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_CF_ENGINE_DNS_SERVICE_RESOLVER_H

data/src/core/lib/event_engine/nameser.h

@@ -0,0 +1,102 @@
+// Copyright 2023 The 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_LIB_EVENT_ENGINE_NAMESER_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_NAMESER_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/lib/iomgr/port.h"
+
+#ifdef GRPC_HAVE_ARPA_NAMESER
+
+#include <arpa/nameser.h>  // IWYU pragma: keep
+
+#else  // GRPC_HAVE_ARPA_NAMESER
+
+typedef enum __ns_class {
+  ns_c_invalid = 0,  // Cookie.
+  ns_c_in = 1,       // Internet.
+  ns_c_2 = 2,        // unallocated/unsupported.
+  ns_c_chaos = 3,    // MIT Chaos-net.
+  ns_c_hs = 4,       // MIT Hesiod.
+  // Query class values which do not appear in resource records
+  ns_c_none = 254,  // for prereq. sections in update requests
+  ns_c_any = 255,   // Wildcard match.
+  ns_c_max = 65536
+} ns_class;
+
+typedef enum __ns_type {
+  ns_t_invalid = 0,    // Cookie.
+  ns_t_a = 1,          // Host address.
+  ns_t_ns = 2,         // Authoritative server.
+  ns_t_md = 3,         // Mail destination.
+  ns_t_mf = 4,         // Mail forwarder.
+  ns_t_cname = 5,      // Canonical name.
+  ns_t_soa = 6,        // Start of authority zone.
+  ns_t_mb = 7,         // Mailbox domain name.
+  ns_t_mg = 8,         // Mail group member.
+  ns_t_mr = 9,         // Mail rename name.
+  ns_t_null = 10,      // Null resource record.
+  ns_t_wks = 11,       // Well known service.
+  ns_t_ptr = 12,       // Domain name pointer.
+  ns_t_hinfo = 13,     // Host information.
+  ns_t_minfo = 14,     // Mailbox information.
+  ns_t_mx = 15,        // Mail routing information.
+  ns_t_txt = 16,       // Text strings.
+  ns_t_rp = 17,        // Responsible person.
+  ns_t_afsdb = 18,     // AFS cell database.
+  ns_t_x25 = 19,       // X_25 calling address.
+  ns_t_isdn = 20,      // ISDN calling address.
+  ns_t_rt = 21,        // Router.
+  ns_t_nsap = 22,      // NSAP address.
+  ns_t_nsap_ptr = 23,  // Reverse NSAP lookup (deprecated).
+  ns_t_sig = 24,       // Security signature.
+  ns_t_key = 25,       // Security key.
+  ns_t_px = 26,        // X.400 mail mapping.
+  ns_t_gpos = 27,      // Geographical position (withdrawn).
+  ns_t_aaaa = 28,      // Ip6 Address.
+  ns_t_loc = 29,       // Location Information.
+  ns_t_nxt = 30,       // Next domain (security).
+  ns_t_eid = 31,       // Endpoint identifier.
+  ns_t_nimloc = 32,    // Nimrod Locator.
+  ns_t_srv = 33,       // Server Selection.
+  ns_t_atma = 34,      // ATM Address
+  ns_t_naptr = 35,     // Naming Authority PoinTeR
+  ns_t_kx = 36,        // Key Exchange
+  ns_t_cert = 37,      // Certification record
+  ns_t_a6 = 38,        // IPv6 address (deprecates AAAA)
+  ns_t_dname = 39,     // Non-terminal DNAME (for IPv6)
+  ns_t_sink = 40,      // Kitchen sink (experimentatl)
+  ns_t_opt = 41,       // EDNS0 option (meta-RR)
+  ns_t_apl = 42,       // Address prefix list (RFC3123)
+  ns_t_ds = 43,        // Delegation Signer (RFC4034)
+  ns_t_sshfp = 44,     // SSH Key Fingerprint (RFC4255)
+  ns_t_rrsig = 46,     // Resource Record Signature (RFC4034)
+  ns_t_nsec = 47,      // Next Secure (RFC4034)
+  ns_t_dnskey = 48,    // DNS Public Key (RFC4034)
+  ns_t_tkey = 249,     // Transaction key
+  ns_t_tsig = 250,     // Transaction signature.
+  ns_t_ixfr = 251,     // Incremental zone transfer.
+  ns_t_axfr = 252,     // Transfer zone of authority.
+  ns_t_mailb = 253,    // Transfer mailbox records.
+  ns_t_maila = 254,    // Transfer mail agent records.
+  ns_t_any = 255,      // Wildcard match.
+  ns_t_zxfr = 256,     // BIND-specific, nonstandard.
+  ns_t_max = 65536
+} ns_type;
+
+#endif  // GRPC_HAVE_ARPA_NAMESER
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_NAMESER_H

data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc

@@ -749,7 +749,7 @@ absl::StatusOr<PosixSocketWrapper> PosixSocketWrapper::CreateDualStackSocket(
     }
     // If this isn't an IPv4 address, then return whatever we've got.
     if (!ResolvedAddressIsV4Mapped(addr, nullptr)) {
-      if (newfd <= 0) {
+      if (newfd < 0) {
         return ErrorForFd(newfd, addr);
       }
       dsmode = PosixSocketWrapper::DSMode::DSMODE_IPV6;

data/src/core/lib/event_engine/thread_pool/thread_count.h

@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <cstddef>
+#include <cstdint>
 #include <numeric>
 #include <utility>
 #include <vector>
@@ -88,9 +89,23 @@ class BusyThreadCount {
   size_t NextIndex() { return next_idx_.fetch_add(1) % shards_.size(); }
 
  private:
+// We want to ensure that this data structure lands on different cachelines per
+// cpu. With C++17 we can do so explicitly with an `alignas` specifier. Prior
+// versions we can at best approximate it by padding the structure. It'll
+// probably work out ok, but it's not guaranteed across allocators.
+// TODO(ctiller): When we move to C++17 delete the duplicate definition.
+#if __cplusplus >= 201703L
   struct ShardedData {
     std::atomic<size_t> busy_count{0};
   } GPR_ALIGN_STRUCT(GPR_CACHELINE_SIZE);
+#else
+  struct ShardedDataHeader {
+    std::atomic<size_t> busy_count{0};
+  };
+  struct ShardedData : public ShardedDataHeader {
+    uint8_t padding[GPR_CACHELINE_SIZE - sizeof(ShardedDataHeader)];
+  };
+#endif
 
   std::vector<ShardedData> shards_;
   std::atomic<size_t> next_idx_{0};

data/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc

@@ -19,28 +19,16 @@
 
 #include <grpc/support/cpu.h>
 
-#include "src/core/lib/event_engine/thread_pool/original_thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
-#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gpr/useful.h"
 
 namespace grpc_event_engine {
 namespace experimental {
 
-std::shared_ptr<ThreadPool> MakeThreadPool(size_t reserve_threads) {
-// TODO(hork): remove when the listener flake is identified
-#ifdef GPR_WINDOWS
-  if (grpc_core::IsEventEngineListenerEnabled()) {
-    return std::make_shared<WorkStealingThreadPool>(
-        grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
-  }
-#endif
-  if (grpc_core::IsWorkStealingEnabled()) {
-    return std::make_shared<WorkStealingThreadPool>(
-        grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
-  }
-  return std::make_shared<OriginalThreadPool>(reserve_threads);
+std::shared_ptr<ThreadPool> MakeThreadPool(size_t /* reserve_threads */) {
+  return std::make_shared<WorkStealingThreadPool>(
+      grpc_core::Clamp(gpr_cpu_num_cores(), 2u, 16u));
 }
 
 }  // namespace experimental

data/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -23,6 +23,7 @@
 #include <inttypes.h>
 
 #include <atomic>
+#include <chrono>
 #include <memory>
 #include <utility>
 
@@ -86,10 +87,15 @@ namespace grpc_event_engine {
 namespace experimental {
 
 namespace {
+// TODO(ctiller): grpc_core::Timestamp, Duration have very specific contracts
+// around time caching and around when the underlying gpr_now call can be
+// substituted out.
+// We should probably move all usage here to std::chrono to avoid weird bugs in
+// the future.
+
 // Maximum amount of time an extra thread is allowed to idle before being
 // reclaimed.
-constexpr grpc_core::Duration kIdleThreadLimit =
-    grpc_core::Duration::Seconds(20);
+constexpr auto kIdleThreadLimit = std::chrono::seconds(20);
 // Rate at which "Waiting for ..." logs should be printed while quiescing.
 constexpr size_t kBlockingQuiesceLogRateSeconds = 3;
 // Minumum time between thread creations.
@@ -424,7 +430,7 @@ bool WorkStealingThreadPool::ThreadState::Step() {
   // * the global queue is empty
   // * the steal pool returns nullptr
   bool should_run_again = false;
-  grpc_core::Timestamp start_time{grpc_core::Timestamp::Now()};
+  auto start_time = std::chrono::steady_clock::now();
   // Wait until work is available or until shut down.
   while (!pool_->IsForking()) {
     // Pull from the global queue next
@@ -452,7 +458,7 @@ bool WorkStealingThreadPool::ThreadState::Step() {
     // has been idle long enough.
     if (timed_out &&
         pool_->living_thread_count()->count() > pool_->reserve_threads() &&
-        grpc_core::Timestamp::Now() - start_time > kIdleThreadLimit) {
+        std::chrono::steady_clock::now() - start_time > kIdleThreadLimit) {
       return false;
     }
   }

data/src/core/lib/experiments/config.cc

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <map>
 #include <string>
 #include <utility>
 
@@ -166,11 +167,18 @@ bool IsTestExperimentEnabled(size_t experiment_id) {
 
 void PrintExperimentsList() {
   size_t max_experiment_length = 0;
+  // Populate visitation order into a std::map so that iteration results in a
+  // lexical ordering of experiment names.
+  // The lexical ordering makes it nice and easy to find the experiment you're
+  // looking for in the output spam that we generate.
+  std::map<absl::string_view, size_t> visitation_order;
   for (size_t i = 0; i < kNumExperiments; i++) {
     max_experiment_length =
         std::max(max_experiment_length, strlen(g_experiment_metadata[i].name));
+    visitation_order[g_experiment_metadata[i].name] = i;
   }
-  for (size_t i = 0; i < kNumExperiments; i++) {
+  for (auto name_index : visitation_order) {
+    const size_t i = name_index.second;
     gpr_log(
         GPR_DEBUG, "%s",
         absl::StrCat(