Remove LazyInstance usage from media/

media/gpu/tegra_v4l2_device.cc

 // Copyright 2014 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 <dlfcn.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
 
-#include "base/lazy_instance.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/trace_event/trace_event.h"
 #include "media/gpu/tegra_v4l2_device.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace media {
 
 namespace {
 const char kDecoderDevice[] = "/dev/tegra_avpchannel";
 const char kEncoderDevice[] = "/dev/nvhost-msenc";
@@ skipping 25 matching lines @@
 TEGRAV4L2_SYM(Ioctl);
 TEGRAV4L2_SYM(Poll);
 TEGRAV4L2_SYM(SetDevicePollInterrupt);
 TEGRAV4L2_SYM(ClearDevicePollInterrupt);
 TEGRAV4L2_SYM(Mmap);
 TEGRAV4L2_SYM(Munmap);
 TEGRAV4L2_SYM(UseEglImage);
 
 #undef TEGRAV4L2_SYM
 
-class TegraFunctionSymbolFinder {
- public:
-  TegraFunctionSymbolFinder() : initialized_(false) {
-    if (!dlopen("/usr/lib/libtegrav4l2.so",
-                RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE))
-      return;
+bool InitializeTegraFunctionSymbolFinder() {

[Mark Mentovai, 2017/01/31 21:33:56]

This should be marked “static”, in an unnamed namespace, or…

[DaleCurtis, 2017/01/31 22:04:33]

Inlined.

+  if (!dlopen("/usr/lib/libtegrav4l2.so",
+              RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) {
+    return false;
+  }
 #define TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(name)          \
   do {                                                    \
     TegraV4L2_##name = reinterpret_cast<TegraV4L2##name>( \
         dlsym(RTLD_DEFAULT, "TegraV4L2_" #name));         \
     if (TegraV4L2_##name == NULL) {                       \
       LOG(ERROR) << "Failed to dlsym TegraV4L2_" #name;   \
-      return;                                             \
+      return false;                                       \
     }                                                     \
   } while (0)
 
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Open);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Close);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Ioctl);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Poll);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(SetDevicePollInterrupt);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(ClearDevicePollInterrupt);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Mmap);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Munmap);
-    TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(UseEglImage);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Open);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Close);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Ioctl);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Poll);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(SetDevicePollInterrupt);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(ClearDevicePollInterrupt);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Mmap);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(Munmap);
+  TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(UseEglImage);
 #undef TEGRAV4L2_DLSYM

[Mark Mentovai, 2017/01/31 21:33:56]

This was never #defined, I think it means TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR.

[DaleCurtis, 2017/01/31 22:04:33]

Good catch, fixed.

-    initialized_ = true;
-  }
-
-  bool initialized() { return initialized_; }
-
- private:
-  bool initialized_;
-};
-
-base::LazyInstance<TegraFunctionSymbolFinder> g_tegra_function_symbol_finder_ =
-    LAZY_INSTANCE_INITIALIZER;
+  return true;
+}
 
 TegraV4L2Device::TegraV4L2Device() {}
 
 TegraV4L2Device::~TegraV4L2Device() {
   Close();
 }
 
 int TegraV4L2Device::Ioctl(int flags, void* arg) {
   return HANDLE_EINTR(TegraV4L2_Ioctl(device_fd_, flags, arg));
 }
@@ skipping 29 matching lines @@
 
 bool TegraV4L2Device::ClearDevicePollInterrupt() {
   if (HANDLE_EINTR(TegraV4L2_ClearDevicePollInterrupt(device_fd_)) == -1) {
     LOG(ERROR) << "Error in calling TegraV4L2ClearDevicePollInterrupt";
     return false;
   }
   return true;
 }
 
 bool TegraV4L2Device::Initialize() {
-  return g_tegra_function_symbol_finder_.Get().initialized();
+  static bool initialized = InitializeTegraFunctionSymbolFinder();

[Mark Mentovai, 2017/01/31 21:33:56]

…written in-line here in a lambda.

[DaleCurtis, 2017/01/31 22:04:33]

:)

+  return initialized;
 }
 
 bool TegraV4L2Device::Open(Type type, uint32_t /* v4l2_pixfmt */) {
   return OpenInternal(type);
 }
 
 bool TegraV4L2Device::OpenInternal(Type type) {
   const char* device_path = nullptr;
 
   switch (type) {
@@ skipping 120 matching lines @@
 
 bool TegraV4L2Device::IsImageProcessingSupported() {
   return false;
 }
 
 bool TegraV4L2Device::IsJpegDecodingSupported() {
   return false;
 }
 
 }  //  namespace media