command_buffer_gles2: Avoid creating multiple AtExitManagers

gpu/gles2_conform_support/egl/display.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 11 matching lines @@
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 
 namespace {
 const int32_t kCommandBufferSize = 1024 * 1024;
 const int32_t kTransferBufferSize = 512 * 1024;
 }
 
 namespace egl {
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+// elg::Display is used for comformance tests and command_buffer_gles.  We only

[piman, 2016/01/21 20:30:47]

nit: typo elg->egl

[Kimmo Kinnunen, 2016/01/22 06:53:30]

Done.

+// need the exit manager for the command_buffer_gles library.
+// TODO(hendrikw): Find a cleaner solution for this.
+namespace {
+base::Lock g_exit_manager_lock;

[piman, 2016/01/21 20:30:47]

We don't allow non-POD globals per style (causes global initializers).

A suggestion is to use LazyInstance<base::Lock>::Leaky
(the Leaky version doesn't need the AtExitManager, so it breaks the circular
dependency).

[Kimmo Kinnunen, 2016/01/22 06:53:30]

Done.

+int g_exit_manager_use_count;
+base::AtExitManager* g_exit_manager;
+void RefAtExitManager() {
+  base::AutoLock lock(g_exit_manager_lock);
+  if (g_exit_manager_use_count == 0) {
+    g_exit_manager = new base::AtExitManager;
+  }
+  ++g_exit_manager_use_count;
+}
+void ReleaseAtExitManager() {
+  base::AutoLock lock(g_exit_manager_lock);
+  --g_exit_manager_use_count;
+  if (g_exit_manager_use_count == 0) {
+    delete g_exit_manager;
+    g_exit_manager = nullptr;
+  }
+}
+}
+#endif
 
 Display::Display(EGLNativeDisplayType display_id)
     : display_id_(display_id),
       is_initialized_(false),
-#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
-      exit_manager_(new base::AtExitManager),
-#endif
       create_offscreen_(false),
       create_offscreen_width_(0),
       create_offscreen_height_(0),
       next_fence_sync_release_(1) {
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+  RefAtExitManager();
+#endif
 }
 
 Display::~Display() {
   gles2::Terminate();
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+  ReleaseAtExitManager();
+#endif
 }
 
 bool Display::Initialize() {
   gles2::Initialize();
   is_initialized_ = true;
   return true;
 }
 
 bool Display::IsValidConfig(EGLConfig config) {
   return (config != NULL) && (config == config_.get());
@@ skipping 318 matching lines @@
 void Display::SignalSyncToken(const gpu::SyncToken& sync_token,
                               const base::Closure& callback) {
   NOTIMPLEMENTED();
 }
 
 bool Display::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) {
   return false;
 }
 
 }  // namespace egl