diff options
| -rw-r--r-- | arm_compute/core/CL/OpenCL.h | 12 | ||||
| -rw-r--r-- | src/core/CL/OpenCL.cpp | 10 |
2 files changed, 21 insertions, 1 deletions
diff --git a/arm_compute/core/CL/OpenCL.h b/arm_compute/core/CL/OpenCL.h index fc7083d276..fbf603ea00 100644 --- a/arm_compute/core/CL/OpenCL.h +++ b/arm_compute/core/CL/OpenCL.h @@ -64,6 +64,17 @@ private: void load_symbols(void *handle); public: + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLSymbols(const CLSymbols &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLSymbols &operator=(const CLSymbols &) = delete; + /** Allow instances of this class to be move constructed */ + CLSymbols(CLSymbols &&) = default; + /** Allow instances of this class to be moved */ + CLSymbols &operator=(CLSymbols &&) = default; + /** Destructor */ + ~CLSymbols(); + /** Get the static instance of CLSymbols. * * @return The static instance of CLSymbols. @@ -138,6 +149,7 @@ public: private: std::pair<bool, bool> _loaded{ false, false }; + void *handle{ nullptr }; }; } // namespace arm_compute #endif /* __ARM_COMPUTE_OPENCL_H__ */ diff --git a/src/core/CL/OpenCL.cpp b/src/core/CL/OpenCL.cpp index ef03a5a302..0212774161 100644 --- a/src/core/CL/OpenCL.cpp +++ b/src/core/CL/OpenCL.cpp @@ -35,6 +35,14 @@ CLSymbols &CLSymbols::get() return symbols; } +CLSymbols::~CLSymbols() +{ + if(handle) + { + dlclose(handle); + } +} + bool CLSymbols::load_default() { static const std::vector<std::string> libraries{ "libOpenCL.so", "libGLES_mali.so", "libmali.so" }; @@ -61,7 +69,7 @@ bool CLSymbols::load_default() bool CLSymbols::load(const std::string &library) { - void *handle = dlopen(library.c_str(), RTLD_LAZY | RTLD_LOCAL); + handle = dlopen(library.c_str(), RTLD_LAZY | RTLD_LOCAL); if(handle == nullptr) { |