grpc 1.75.0.pre1 → 1.76.0.pre1

data/src/core/ext/transport/chttp2/alpn/alpn.cc

@@ -20,7 +20,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/check.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/useful.h"
 
 // in order of preference
@@ -42,6 +42,6 @@ size_t grpc_chttp2_num_alpn_versions(void) {
 }
 
 const char* grpc_chttp2_get_alpn_version_index(size_t i) {
-  CHECK_LT(i, GPR_ARRAY_SIZE(supported_versions));
+  GRPC_CHECK_LT(i, GPR_ARRAY_SIZE(supported_versions));
   return supported_versions[i];
 }

data/src/core/ext/transport/chttp2/client/chttp2_connector.cc

@@ -34,7 +34,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -77,6 +76,7 @@
 #include "src/core/resolver/resolver_registry.h"
 #include "src/core/transport/endpoint_transport_client_channel_factory.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/time.h"
@@ -108,7 +108,7 @@ void Chttp2Connector::Connect(const Args& args, Result* result,
                               grpc_closure* notify) {
   {
     MutexLock lock(&mu_);
-    CHECK_EQ(notify_, nullptr);
+    GRPC_CHECK_EQ(notify_, nullptr);
     args_ = args;
     result_ = result;
     notify_ = notify;
@@ -174,7 +174,7 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
     if (is_callv1) {
       result_->transport = grpc_create_chttp2_transport(
           (*result)->args, std::move((*result)->endpoint), true);
-      CHECK_NE(result_->transport, nullptr);
+      GRPC_CHECK_NE(result_->transport, nullptr);
       result_->channel_args = std::move((*result)->args);
       Ref().release();  // Ref held by OnReceiveSettings()
       GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this,
@@ -220,11 +220,12 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
       Ref().release();  // Ref held by OnReceiveSettings()
       GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this,
                         grpc_schedule_on_exec_ctx);
-      result_->channel_args = std::move((*result)->args);
+      // Http2ClientTransport does not take ownership of the channel args.
       result_->transport = new http2::Http2ClientTransport(
           std::move(promise_endpoint), (*result)->args, event_engine_ptr,
           &on_receive_settings_);
-      DCHECK_NE(result_->transport, nullptr);
+      result_->channel_args = std::move((*result)->args);
+      GRPC_DCHECK_NE(result_->transport, nullptr);
       timer_handle_ = event_engine_->RunAfter(
           args_.deadline - Timestamp::Now(),
           [self = RefAsSubclass<Chttp2Connector>()]() mutable {
@@ -239,7 +240,7 @@ void Chttp2Connector::OnHandshakeDone(absl::StatusOr<HandshakerArgs*> result) {
     // If the handshaking succeeded but there is no endpoint, then the
     // handshaker may have handed off the connection to some external
     // code. Just verify that exit_early flag is set.
-    DCHECK((*result)->exit_early);
+    GRPC_DCHECK((*result)->exit_early);
     NullThenSchedClosure(DEBUG_LOCATION, &notify_, result.status());
   }
   handshake_mgr_.reset();
@@ -347,14 +348,14 @@ grpc_channel* grpc_channel_create_from_fd(const char* target, int fd,
           .SetObject(creds->Ref());
 
   int flags = fcntl(fd, F_GETFL, 0);
-  CHECK_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0);
+  GRPC_CHECK_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0);
   grpc_core::OrphanablePtr<grpc_endpoint> client(grpc_tcp_create_from_fd(
       grpc_fd_create(fd, "client", true),
       grpc_event_engine::experimental::ChannelArgsEndpointConfig(final_args),
       "fd-client"));
   grpc_core::Transport* transport =
       grpc_create_chttp2_transport(final_args, std::move(client), true);
-  CHECK(transport);
+  GRPC_CHECK(transport);
   auto channel = grpc_core::ChannelCreate(
       target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport);
   if (channel.ok()) {
@@ -376,7 +377,7 @@ grpc_channel* grpc_channel_create_from_fd(const char* /* target */,
                                           int /* fd */,
                                           grpc_channel_credentials* /* creds*/,
                                           const grpc_channel_args* /* args */) {
-  CHECK(0);
+  GRPC_CHECK(0);
   return nullptr;
 }
 

data/src/core/ext/transport/chttp2/server/chttp2_server.cc

@@ -38,7 +38,6 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -83,6 +82,7 @@
 #include "src/core/lib/transport/transport.h"
 #include "src/core/server/server.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/match.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -521,7 +521,7 @@ void NewChttp2ServerListener::Start() {
       LOG(ERROR) << "Error adding port to server: " << StatusToString(error);
       // TODO(yashykt): We wouldn't need to assert here if we bound to the
       // port earlier during AddPort.
-      CHECK(0);
+      GRPC_CHECK(0);
     }
   }
   if (tcp_server != nullptr) {
@@ -692,7 +692,7 @@ absl::StatusOr<int> Chttp2ServerAddPort(Server* server, const char* addr,
         if (port_num == -1) {
           port_num = port_temp;
         } else {
-          CHECK(port_num == port_temp);
+          GRPC_CHECK(port_num == port_temp);
         }
       }
     }
@@ -722,7 +722,7 @@ namespace experimental {
 
 absl::Status PassiveListenerImpl::AcceptConnectedEndpoint(
     std::unique_ptr<EventEngine::Endpoint> endpoint) {
-  CHECK_NE(server_.get(), nullptr);
+  GRPC_CHECK_NE(server_.get(), nullptr);
   RefCountedPtr<NewChttp2ServerListener> new_listener;
   {
     MutexLock lock(&mu_);
@@ -742,7 +742,7 @@ absl::Status PassiveListenerImpl::AcceptConnectedEndpoint(
 }
 
 absl::Status PassiveListenerImpl::AcceptConnectedFd(int fd) {
-  CHECK_NE(server_.get(), nullptr);
+  GRPC_CHECK_NE(server_.get(), nullptr);
   ExecCtx exec_ctx;
   auto& args = server_->channel_args();
   auto* supports_fd = QueryExtension<EventEngineSupportsFdExtension>(
@@ -754,7 +754,10 @@ absl::Status PassiveListenerImpl::AcceptConnectedFd(int fd) {
   }
   auto endpoint =
       supports_fd->CreateEndpointFromFd(fd, ChannelArgsEndpointConfig(args));
-  return AcceptConnectedEndpoint(std::move(endpoint));
+  if (!endpoint.ok()) {
+    return std::move(endpoint).status();
+  }
+  return AcceptConnectedEndpoint(std::move(endpoint).value());
 }
 
 void PassiveListenerImpl::ListenerDestroyed() {
@@ -809,7 +812,7 @@ void grpc_server_add_channel_from_fd(grpc_server* server, int fd,
 
 void grpc_server_add_channel_from_fd(grpc_server* /* server */, int /* fd */,
                                      grpc_server_credentials* /* creds */) {
-  CHECK(0);
+  GRPC_CHECK(0);
 }
 
 #endif  // GPR_SUPPORT_CHANNELS_FROM_FD

data/src/core/ext/transport/chttp2/transport/bin_decoder.cc

@@ -22,9 +22,9 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/base/attributes.h"
-#include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
+#include "src/core/util/grpc_check.h"
 
 static uint8_t decode_table[] = {
     0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
@@ -191,8 +191,8 @@ grpc_slice grpc_chttp2_base64_decode(const grpc_slice& input) {
     grpc_core::CSliceUnref(output);
     return grpc_empty_slice();
   }
-  CHECK(ctx.output_cur == GRPC_SLICE_END_PTR(output));
-  CHECK(ctx.input_cur == GRPC_SLICE_END_PTR(input));
+  GRPC_CHECK(ctx.output_cur == GRPC_SLICE_END_PTR(output));
+  GRPC_CHECK(ctx.input_cur == GRPC_SLICE_END_PTR(input));
   return output;
 }
 
@@ -234,7 +234,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input,
     grpc_core::CSliceUnref(output);
     return grpc_empty_slice();
   }
-  CHECK(ctx.output_cur == GRPC_SLICE_END_PTR(output));
-  CHECK(ctx.input_cur <= GRPC_SLICE_END_PTR(input));
+  GRPC_CHECK(ctx.output_cur == GRPC_SLICE_END_PTR(output));
+  GRPC_CHECK(ctx.input_cur <= GRPC_SLICE_END_PTR(input));
   return output;
 }

data/src/core/ext/transport/chttp2/transport/bin_encoder.cc

@@ -22,8 +22,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "absl/log/check.h"
 #include "src/core/ext/transport/chttp2/transport/huffsyms.h"
+#include "src/core/util/grpc_check.h"
 
 static const char alphabet[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -86,8 +86,8 @@ grpc_slice grpc_chttp2_base64_encode(const grpc_slice& input) {
       break;
   }
 
-  CHECK(out == (char*)GRPC_SLICE_END_PTR(output));
-  CHECK(in == GRPC_SLICE_END_PTR(input));
+  GRPC_CHECK(out == (char*)GRPC_SLICE_END_PTR(output));
+  GRPC_CHECK(in == GRPC_SLICE_END_PTR(input));
   return output;
 }
 
@@ -130,7 +130,7 @@ grpc_slice grpc_chttp2_huffman_compress(const grpc_slice& input) {
                              static_cast<uint8_t>(0xffu >> temp_length));
   }
 
-  CHECK(out == GRPC_SLICE_END_PTR(output));
+  GRPC_CHECK(out == GRPC_SLICE_END_PTR(output));
 
   return output;
 }
@@ -226,9 +226,9 @@ grpc_slice grpc_chttp2_base64_encode_and_huffman_compress(
         static_cast<uint8_t>(0xffu >> out.temp_length));
   }
 
-  CHECK(out.out <= GRPC_SLICE_END_PTR(output));
+  GRPC_CHECK(out.out <= GRPC_SLICE_END_PTR(output));
   GRPC_SLICE_SET_LENGTH(output, out.out - start_out);
 
-  CHECK(in == GRPC_SLICE_END_PTR(input));
+  GRPC_CHECK(in == GRPC_SLICE_END_PTR(input));
   return output;
 }