Remove g_glip and class GrpcLibraryInterface (grpc#30414)

* Remove `g_glip` and `class GrpcLibraryInterface`

* Update

* Update

* Update

* Automated change: Fix sanity tests (#20)

* Update

* Update

* Update

* Test

* Fix

* Revert "Test"

This reverts commit 2f5c77e.

* More fix

* More fix

* More fix

* Minor fix

* Revert "Minor fix"

This reverts commit 1ee3ae4.

* Revert "More fix"

This reverts commit 1fc2348.

* Revert "More fix"

This reverts commit 851393c.

* Revert "More fix"

This reverts commit ed342a5.

* Revert "Fix"

This reverts commit 286ad8e.

Author: ralphchung

BUILD

@@ -400,7 +400,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpc++/impl/codegen/config.h",
     "include/grpc++/impl/codegen/core_codegen_interface.h",
     "include/grpc++/impl/codegen/create_auth_context.h",
-    "include/grpc++/impl/codegen/grpc_library.h",
     "include/grpc++/impl/codegen/metadata_map.h",
     "include/grpc++/impl/codegen/method_handler_impl.h",
     "include/grpc++/impl/codegen/rpc_method.h",
@@ -437,7 +436,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/impl/codegen/core_codegen_interface.h",
     "include/grpcpp/impl/codegen/create_auth_context.h",
     "include/grpcpp/impl/codegen/delegating_channel.h",
-    "include/grpcpp/impl/codegen/grpc_library.h",
     "include/grpcpp/impl/codegen/intercepted_channel.h",
     "include/grpcpp/impl/codegen/interceptor_common.h",
     "include/grpcpp/impl/codegen/interceptor.h",

CMakeLists.txt

@@ -26,13 +26,12 @@
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/codegen/completion_queue_tag.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/time.h>
 
 namespace grpc {
 
-class Alarm : private grpc::GrpcLibraryCodegen {
+class Alarm : private grpc::internal::GrpcLibrary {
  public:
   /// Create an unset completion queue alarm
   Alarm();

build_autogenerated.yaml

@@ -25,8 +25,8 @@
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
 #include <grpcpp/impl/codegen/sync.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
@@ -54,7 +54,7 @@ void ChannelResetConnectionBackoff(Channel* channel);
 class Channel final : public grpc::ChannelInterface,
                       public grpc::internal::CallHook,
                       public std::enable_shared_from_this<Channel>,
-                      private grpc::GrpcLibraryCodegen {
+                      private grpc::internal::GrpcLibrary {
  public:
   ~Channel() override;
 

gRPC-C++.podspec

@@ -34,14 +34,14 @@
 
 #include <list>
 
-#include <grpc/support/atm.h>
+#include <grpc/impl/codegen/atm.h>
 #include <grpcpp/impl/codegen/completion_queue_tag.h>
 #include <grpcpp/impl/codegen/core_codegen_interface.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
+#include <grpcpp/impl/codegen/rpc_service_method.h>
+#include <grpcpp/impl/codegen/status.h>
 #include <grpcpp/impl/codegen/sync.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/time.h>
+#include <grpcpp/impl/codegen/time.h>
+#include <grpcpp/impl/grpc_library.h>
 
 struct grpc_completion_queue;
 
@@ -99,7 +99,7 @@ extern CoreCodegenInterface* g_core_codegen_interface;
 /// src/core/lib/surface/completion_queue.h).
 /// See \ref doc/cpp/perf_notes.md for notes on best practices for high
 /// performance servers.
-class CompletionQueue : private grpc::GrpcLibraryCodegen {
+class CompletionQueue : private grpc::internal::GrpcLibrary {
  public:
   /// Default constructor. Implicitly creates a \a grpc_completion_queue
   /// instance.

include/grpc++/impl/codegen/grpc_library.h

@@ -24,25 +24,34 @@
 #include <grpc/grpc.h>
 #include <grpcpp/impl/codegen/config.h>
 #include <grpcpp/impl/codegen/core_codegen.h>
-#include <grpcpp/impl/codegen/grpc_library.h>  // IWYU pragma: export
 
 namespace grpc {
 
 namespace internal {
-class GrpcLibrary final : public GrpcLibraryInterface {
+
+/// Classes that require gRPC to be initialized should inherit from this class.
+class GrpcLibrary {
  public:
-  void init() override { grpc_init(); }
-  void shutdown() override { grpc_shutdown(); }
+  explicit GrpcLibrary(bool call_grpc_init = true) : grpc_init_called_(false) {
+    if (call_grpc_init) {
+      grpc_init();
+      grpc_init_called_ = true;
+    }
+  }
+  virtual ~GrpcLibrary() {
+    if (grpc_init_called_) {
+      grpc_shutdown();
+    }
+  }
+
+ private:
+  bool grpc_init_called_;
 };
 
 /// Instantiating this class ensures the proper initialization of gRPC.
 class GrpcLibraryInitializer final {
  public:
   GrpcLibraryInitializer() {
-    if (grpc::g_glip == nullptr) {
-      static auto* const g_gli = new GrpcLibrary();
-      grpc::g_glip = g_gli;
-    }
     if (grpc::g_core_codegen_interface == nullptr) {
       static auto* const g_core_codegen = new CoreCodegen();
       grpc::g_core_codegen_interface = g_core_codegen;

include/grpcpp/alarm.h

@@ -21,7 +21,7 @@
 
 struct grpc_resource_quota;
 
-#include <grpcpp/impl/codegen/grpc_library.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/config.h>
 
 namespace grpc {
@@ -31,7 +31,7 @@ namespace grpc {
 /// or a client channel (via \a ChannelArguments).
 /// gRPC will attempt to keep memory and threads used by all attached entities
 /// below the ResourceQuota bound.
-class ResourceQuota final : private grpc::GrpcLibraryCodegen {
+class ResourceQuota final : private grpc::internal::GrpcLibrary {
  public:
   /// \param name - a unique name for this ResourceQuota.
   explicit ResourceQuota(const std::string& name);

include/grpcpp/channel.h

@@ -19,7 +19,7 @@
 
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
+#include <grpcpp/impl/codegen/status.h>
 
 namespace grpc {
 namespace experimental {

include/grpcpp/completion_queue.h

@@ -25,7 +25,7 @@
 
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/channel.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/channel_arguments.h>
@@ -66,7 +66,7 @@ std::shared_ptr<ChannelCredentials> XdsCredentials(
 /// for all the calls on that channel.
 ///
 /// \see https://grpc.io/docs/guides/auth.html
-class ChannelCredentials : private grpc::GrpcLibraryCodegen {
+class ChannelCredentials : private grpc::internal::GrpcLibrary {
  public:
   ChannelCredentials();
   ~ChannelCredentials() override;
@@ -123,7 +123,7 @@ class ChannelCredentials : private grpc::GrpcLibraryCodegen {
 /// authenticate with a server for a given call on a channel.
 ///
 /// \see https://grpc.io/docs/guides/auth.html
-class CallCredentials : private grpc::GrpcLibraryCodegen {
+class CallCredentials : private grpc::internal::GrpcLibrary {
  public:
   CallCredentials();
   ~CallCredentials() override;

include/grpcpp/impl/codegen/grpc_library.h

@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <grpc/grpc_security_constants.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/config.h>
@@ -65,7 +66,7 @@ std::shared_ptr<ServerCredentials> XdsServerCredentials(
     const std::shared_ptr<ServerCredentials>& fallback_credentials);
 
 /// Wrapper around \a grpc_server_credentials, a way to authenticate a server.
-class ServerCredentials : private grpc::GrpcLibraryCodegen {
+class ServerCredentials : private grpc::internal::GrpcLibrary {
  public:
   ServerCredentials();
   ~ServerCredentials() override;

include/grpcpp/impl/grpc_library.h

@@ -24,7 +24,6 @@
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
 #include <grpcpp/support/config.h>
 
 namespace grpc {

include/grpcpp/resource_quota.h

@@ -26,7 +26,6 @@
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
 #include <grpcpp/impl/codegen/sync.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/config.h>

include/grpcpp/security/authorization_policy_provider.h

@@ -31,8 +31,8 @@
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/call.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
 #include <grpcpp/impl/codegen/server_interface.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/support/channel_arguments.h>
@@ -55,7 +55,7 @@ class ExternalConnectionAcceptorImpl;
 ///
 /// Use a \a grpc::ServerBuilder to create, configure, and start
 /// \a Server instances.
-class Server : public ServerInterface, private GrpcLibraryCodegen {
+class Server : public ServerInterface, private internal::GrpcLibrary {
  public:
   ~Server() ABSL_LOCKS_EXCLUDED(mu_) override;