Use member variable to remain dlopen handle (#4534)

Use member variable to avoid warning by handle lost without dlclose()

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h b/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h
index dbda354..c0fc615 100644 (file)
--- a/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h
+++ b/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h
@@ -47,6 +47,10 @@ private:
   void load_symbols(void *handle);
 
 public:
+  /**
+   * @brief Destroy the CLSymbolsEx object
+   */
+  ~CLSymbolsEx();
   /** Get the static instance of CLSymbols.
    *
    * @return The static instance of CLSymbols.
@@ -74,6 +78,7 @@ public:
 
 private:
   std::pair<bool, bool> _loaded{false, false};
+  void *_handle{nullptr};
 };
 } // namespace arm_compute
 #endif /* __ARM_COMPUTE_OPENCLEX_H__ */

diff --git a/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp b/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp
index cbda169..24e96e7 100644 (file)
--- a/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp
+++ b/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp
@@ -30,6 +30,15 @@
 
 namespace arm_compute
 {
+
+CLSymbolsEx::~CLSymbolsEx()
+{
+  if (_handle != nullptr)
+  {
+    dlclose(_handle);
+  }
+}
+
 CLSymbolsEx &CLSymbolsEx::get()
 {
   static CLSymbolsEx symbols;
@@ -85,6 +94,9 @@ bool CLSymbolsEx::load(const std::string &library)
   // Disable default loading and set status to successful
   _loaded = std::make_pair(true, true);
 
+  // Workaround to avoid warning by handle lost without dlclose()
+  _handle = handle;
+
   return true;
 }