grpc 1.50.0 → 1.52.0.pre2

data/src/core/lib/transport/transport_impl.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 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.
- *
- */
+//
+//
+// Copyright 2015 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_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
 #define GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H
@@ -34,62 +34,62 @@
 #include "src/core/lib/transport/transport_fwd.h"
 
 typedef struct grpc_transport_vtable {
-  /* Memory required for a single stream element - this is allocated by upper
-     layers and initialized by the transport */
-  size_t sizeof_stream; /* = sizeof(transport stream) */
+  // Memory required for a single stream element - this is allocated by upper
+  // layers and initialized by the transport
+  size_t sizeof_stream;  // = sizeof(transport stream)
 
-  /* name of this transport implementation */
+  // name of this transport implementation
   const char* name;
 
-  /* implementation of grpc_transport_init_stream */
+  // implementation of grpc_transport_init_stream
   int (*init_stream)(grpc_transport* self, grpc_stream* stream,
                      grpc_stream_refcount* refcount, const void* server_data,
                      grpc_core::Arena* arena);
 
-  /* Create a promise to execute one client call.
-     If this is non-null, it may be used in preference to
-     perform_stream_op.
-     If this is used in preference to perform_stream_op, the
-     following can be omitted also:
-       - calling init_stream, destroy_stream, set_pollset, set_pollset_set
-       - allocation of memory for call data (sizeof_stream may be ignored)
-     There is an on-going migration to move all filters to providing this, and
-     then to drop perform_stream_op. */
+  // Create a promise to execute one client call.
+  // If this is non-null, it may be used in preference to
+  // perform_stream_op.
+  // If this is used in preference to perform_stream_op, the
+  // following can be omitted also:
+  //   - calling init_stream, destroy_stream, set_pollset, set_pollset_set
+  //   - allocation of memory for call data (sizeof_stream may be ignored)
+  // There is an on-going migration to move all filters to providing this, and
+  // then to drop perform_stream_op.
   grpc_core::ArenaPromise<grpc_core::ServerMetadataHandle> (*make_call_promise)(
-      grpc_transport* self, grpc_core::ClientMetadataHandle initial_metadata);
+      grpc_transport* self, grpc_core::CallArgs call_args);
 
-  /* implementation of grpc_transport_set_pollset */
+  // implementation of grpc_transport_set_pollset
   void (*set_pollset)(grpc_transport* self, grpc_stream* stream,
                       grpc_pollset* pollset);
 
-  /* implementation of grpc_transport_set_pollset */
+  // implementation of grpc_transport_set_pollset
   void (*set_pollset_set)(grpc_transport* self, grpc_stream* stream,
                           grpc_pollset_set* pollset_set);
 
-  /* implementation of grpc_transport_perform_stream_op */
+  // implementation of grpc_transport_perform_stream_op
   void (*perform_stream_op)(grpc_transport* self, grpc_stream* stream,
                             grpc_transport_stream_op_batch* op);
 
-  /* implementation of grpc_transport_perform_op */
+  // implementation of grpc_transport_perform_op
   void (*perform_op)(grpc_transport* self, grpc_transport_op* op);
 
-  /* implementation of grpc_transport_destroy_stream */
+  // implementation of grpc_transport_destroy_stream
   void (*destroy_stream)(grpc_transport* self, grpc_stream* stream,
                          grpc_closure* then_schedule_closure);
 
-  /* implementation of grpc_transport_destroy */
+  // implementation of grpc_transport_destroy
   void (*destroy)(grpc_transport* self);
 
-  /* implementation of grpc_transport_get_endpoint */
+  // implementation of grpc_transport_get_endpoint
   grpc_endpoint* (*get_endpoint)(grpc_transport* self);
 } grpc_transport_vtable;
 
-/* an instance of a grpc transport */
+// an instance of a grpc transport
 struct grpc_transport {
   struct RawPointerChannelArgTag {};
   static absl::string_view ChannelArgName() { return GRPC_ARG_TRANSPORT; }
-  /* pointer to a vtable defining operations on this transport */
+  // pointer to a vtable defining operations on this transport
   const grpc_transport_vtable* vtable;
 };
 
-#endif /* GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H */
+#endif  // GRPC_CORE_LIB_TRANSPORT_TRANSPORT_IMPL_H

data/src/core/lib/transport/transport_op_string.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 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.
- *
- */
+//
+//
+// Copyright 2015 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.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -32,14 +32,15 @@
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 
-/* These routines are here to facilitate debugging - they produce string
-   representations of various transport data structures */
+// These routines are here to facilitate debugging - they produce string
+// representations of various transport data structures
 
 std::string grpc_transport_stream_op_batch_string(
     grpc_transport_stream_op_batch* op) {
@@ -86,7 +87,7 @@ std::string grpc_transport_stream_op_batch_string(
   if (op->cancel_stream) {
     out.push_back(absl::StrCat(
         " CANCEL:",
-        grpc_error_std_string(op->payload->cancel_stream.cancel_error)));
+        grpc_core::StatusToString(op->payload->cancel_stream.cancel_error)));
   }
 
   return absl::StrJoin(out, "");
@@ -107,14 +108,14 @@ std::string grpc_transport_op_string(grpc_transport_op* op) {
                                   op->stop_connectivity_watch));
   }
 
-  if (!GRPC_ERROR_IS_NONE(op->disconnect_with_error)) {
+  if (!op->disconnect_with_error.ok()) {
     out.push_back(absl::StrCat(
-        " DISCONNECT:", grpc_error_std_string(op->disconnect_with_error)));
+        " DISCONNECT:", grpc_core::StatusToString(op->disconnect_with_error)));
   }
 
-  if (!GRPC_ERROR_IS_NONE(op->goaway_error)) {
-    out.push_back(
-        absl::StrCat(" SEND_GOAWAY:", grpc_error_std_string(op->goaway_error)));
+  if (!op->goaway_error.ok()) {
+    out.push_back(absl::StrCat(" SEND_GOAWAY:",
+                               grpc_core::StatusToString(op->goaway_error)));
   }
 
   if (op->set_accept_stream) {

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 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.
- *
- */
+//
+//
+// Copyright 2016 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.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -25,16 +25,12 @@
 #include "src/core/lib/transport/http_connect_handshaker.h"
 #include "src/core/lib/transport/tcp_connect_handshaker.h"
 
-extern void grpc_register_extra_plugins(void);
-
-void grpc_resolver_dns_ares_init(void);
-void grpc_resolver_dns_ares_shutdown(void);
-
-void grpc_register_built_in_plugins(void) {
-  grpc_register_plugin(grpc_resolver_dns_ares_init,
-                       grpc_resolver_dns_ares_shutdown);
-  grpc_register_extra_plugins();
-}
+namespace grpc_event_engine {
+namespace experimental {
+extern void RegisterEventEngineChannelArgPreconditioning(
+    grpc_core::CoreConfiguration::Builder* builder);
+}  // namespace experimental
+}  // namespace grpc_event_engine
 
 namespace grpc_core {
 
@@ -74,6 +70,8 @@ extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
 #endif
 
 void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
+  grpc_event_engine::experimental::RegisterEventEngineChannelArgPreconditioning(
+      builder);
   // The order of the handshaker registration is crucial here.
   // We want TCP connect handshaker to be registered last so that it is added to
   // the start of the handshaker list.

data/src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -21,23 +21,10 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/builtins.h"
 
-#ifndef GRPC_NO_XDS
-namespace grpc_core {
-void XdsClientGlobalInit();
-void XdsClientGlobalShutdown();
-}  // namespace grpc_core
-#endif
-
-void grpc_register_extra_plugins() {
-#ifndef GRPC_NO_XDS
-  grpc_register_plugin(grpc_core::XdsClientGlobalInit,
-                       grpc_core::XdsClientGlobalShutdown);
-#endif
-}
-
 namespace grpc_core {
 #ifndef GRPC_NO_XDS
 extern void RbacFilterRegister(CoreConfiguration::Builder* builder);
+extern void StatefulSessionFilterRegister(CoreConfiguration::Builder* builder);
 extern void RegisterXdsChannelStackModifier(
     CoreConfiguration::Builder* builder);
 extern void RegisterChannelDefaultCreds(CoreConfiguration::Builder* builder);
@@ -49,6 +36,9 @@ extern void RegisterXdsClusterImplLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterCdsLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterXdsClusterResolverLbPolicy(
     CoreConfiguration::Builder* builder);
+extern void RegisterXdsOverrideHostLbPolicy(
+    CoreConfiguration::Builder* builder);
+extern void RegisterXdsWrrLocalityLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterFileWatcherCertificateProvider(
     CoreConfiguration::Builder* builder);
 #endif
@@ -59,6 +49,7 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   // rbac_filter is being guarded with GRPC_NO_XDS to avoid a dependency on the
   // re2 library by default
   RbacFilterRegister(builder);
+  StatefulSessionFilterRegister(builder);
   RegisterXdsChannelStackModifier(builder);
   RegisterChannelDefaultCreds(builder);
   RegisterXdsResolver(builder);
@@ -67,6 +58,8 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   RegisterXdsClusterImplLbPolicy(builder);
   RegisterCdsLbPolicy(builder);
   RegisterXdsClusterResolverLbPolicy(builder);
+  RegisterXdsOverrideHostLbPolicy(builder);
+  RegisterXdsWrrLocalityLbPolicy(builder);
   RegisterFileWatcherCertificateProvider(builder);
 #endif
 }

data/src/core/tsi/alts/crypt/aes_gcm.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 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.
- *
- */
+//
+//
+// Copyright 2018 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.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -35,13 +35,13 @@ constexpr size_t kKdfCounterLen = 6;
 constexpr size_t kKdfCounterOffset = 2;
 constexpr size_t kRekeyAeadKeyLen = kAes128GcmKeyLength;
 
-/* Struct for additional data required if rekeying is enabled. */
+// Struct for additional data required if rekeying is enabled.
 struct gsec_aes_gcm_aead_rekey_data {
   uint8_t kdf_counter[kKdfCounterLen];
   uint8_t nonce_mask[kAesGcmNonceLength];
 };
 
-/* Main struct for AES_GCM crypter interface. */
+// Main struct for AES_GCM crypter interface.
 struct gsec_aes_gcm_aead_crypter {
   gsec_aead_crypter crypter;
   size_t key_length;
@@ -79,7 +79,7 @@ static void aes_gcm_format_errors(const char* error_msg, char** error_details) {
   }
   char* openssl_errors = aes_gcm_get_openssl_errors();
   if (openssl_errors != nullptr && error_msg != nullptr) {
-    size_t len = strlen(error_msg) + strlen(openssl_errors) + 2; /* ", " */
+    size_t len = strlen(error_msg) + strlen(openssl_errors) + 2;  // ", "
     *error_details = static_cast<char*>(gpr_malloc(len + 1));
     snprintf(*error_details, len + 1, "%s, %s", error_msg, openssl_errors);
     gpr_free(openssl_errors);

data/src/core/tsi/alts/crypt/gsec.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 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.
- *
- */
+//
+//
+// Copyright 2018 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.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -52,7 +52,7 @@ grpc_status_code gsec_aead_crypter_encrypt(
         crypter, nonce, nonce_length, &aad_vec, 1, &plaintext_vec, 1,
         ciphertext_vec, bytes_written, error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -70,7 +70,7 @@ grpc_status_code gsec_aead_crypter_encrypt_iovec(
         plaintext_vec_length, ciphertext_vec, ciphertext_bytes_written,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -90,7 +90,7 @@ grpc_status_code gsec_aead_crypter_decrypt(
         crypter, nonce, nonce_length, &aad_vec, 1, &ciphertext_vec, 1,
         plaintext_vec, bytes_written, error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -108,7 +108,7 @@ grpc_status_code gsec_aead_crypter_decrypt_iovec(
         ciphertext_vec_length, plaintext_vec, plaintext_bytes_written,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -122,7 +122,7 @@ grpc_status_code gsec_aead_crypter_max_ciphertext_and_tag_length(
         crypter, plaintext_length, max_ciphertext_and_tag_length_to_return,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -136,7 +136,7 @@ grpc_status_code gsec_aead_crypter_max_plaintext_length(
         crypter, ciphertext_and_tag_length, max_plaintext_length_to_return,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -149,7 +149,7 @@ grpc_status_code gsec_aead_crypter_nonce_length(
     return crypter->vtable->nonce_length(crypter, nonce_length_to_return,
                                          error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -162,7 +162,7 @@ grpc_status_code gsec_aead_crypter_key_length(const gsec_aead_crypter* crypter,
     return crypter->vtable->key_length(crypter, key_length_to_return,
                                        error_details);
   }
-  /* An error occurred */
+  // An error occurred
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -175,7 +175,7 @@ grpc_status_code gsec_aead_crypter_tag_length(const gsec_aead_crypter* crypter,
     return crypter->vtable->tag_length(crypter, tag_length_to_return,
                                        error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }