commit 8352b9e99741bc2eb92144cef2c5fc041d3dce5c
author Craig Tiller <ctiller@google.com> Wed Dec 02 11:43:40 2015 -0800
committer Craig Tiller <ctiller@google.com> Wed Dec 02 11:43:40 2015 -0800
tree a7ebeed74e9c903d731b1912bbbff0215dd7b9ba
parent 7221d999bb503acd733e75e374cbf7f6ac28e482

Review feedback

include/grpc++/server.h

diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index f5fc51e..7bb3cdf 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -91,9 +91,15 @@
   /// a server event occurs
   class GlobalCallbacks {
    public:
+    virtual ~GlobalCallbacks() {}
+    /// Called before application callback for each synchronous server request
     virtual void PreSynchronousRequest(ServerContext* context) = 0;
+    /// Called after application callback for each synchronous server request
     virtual void PostSynchronousRequest(ServerContext* context) = 0;
   };
+  /// Set the global callback object. Can only be called once. Does not take
+  /// ownership of callbacks, and expects the pointed to object to be alive
+  /// until all server objects in the process have been destroyed.
   static void SetGlobalCallbacks(GlobalCallbacks* callbacks);
 
  private:

src/cpp/server/server.cc

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 7b51c56..cc52c98 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -57,8 +57,17 @@
   void PostSynchronousRequest(ServerContext* context) GRPC_OVERRIDE {}
 };
 
-static DefaultGlobalCallbacks g_default_callbacks;
-static Server::GlobalCallbacks* g_callbacks = &g_default_callbacks;
+static Server::GlobalCallbacks* g_callbacks = nullptr;
+static gpr_once g_once_init_callbacks = GPR_ONCE_INIT;
+
+static void DeleteGlobalCallbacks() { delete g_callbacks; }
+
+static void InitGlobalCallbacks() {
+  if (g_callbacks == nullptr) {
+    g_callbacks = new DefaultGlobalCallbacks();
+    atexit(DeleteGlobalCallbacks);
+  }
+}
 
 class Server::UnimplementedAsyncRequestContext {
  protected:
@@ -294,6 +303,7 @@
       server_(CreateServer(max_message_size, compression_options)),
       thread_pool_(thread_pool),
       thread_pool_owned_(thread_pool_owned) {
+  gpr_once_init(&g_once_init_callbacks, InitGlobalCallbacks);
   grpc_server_register_completion_queue(server_, cq_.cq(), nullptr);
 }
 
@@ -316,9 +326,8 @@
 }
 
 void Server::SetGlobalCallbacks(GlobalCallbacks* callbacks) {
-  GPR_ASSERT(g_callbacks == &g_default_callbacks);
-  GPR_ASSERT(callbacks != NULL);
-  GPR_ASSERT(callbacks != &g_default_callbacks);
+  GPR_ASSERT(g_callbacks == nullptr);
+  GPR_ASSERT(callbacks != nullptr);
   g_callbacks = callbacks;
 }