Close used OpenCL library

When we finalize the OpenCL system we would want to close the library again.

Author: jenshannoschwalm

src/common/dlopencl.c

@@ -22,6 +22,10 @@
 #include "common/dynload.h"
 #include "common/dlopencl.h"
 
+#ifdef __APPLE__
+#include <dlfcn.h>
+#endif
+
 #include <assert.h>
 #include <signal.h>
 #include <stdio.h>
@@ -36,6 +40,19 @@ static const char *ocllib[] = { "/System/Library/Frameworks/OpenCL.framework/Ver
 static const char *ocllib[] = { "libOpenCL", "libOpenCL.so", "libOpenCL.so.1", NULL };
 #endif
 
+void dt_dlopencl_close(dt_dlopencl_t *ocl)
+{
+  free(ocl->symbols);
+  g_free(ocl->library);
+#ifndef __APPLE__
+  if(!g_module_close(ocl->gmodule))
+    dt_print(DT_DEBUG_OPENCL, "Couldn't close OpenCL library");
+#else
+  if(dlclose(ocl->gmodule))
+    dt_print(DT_DEBUG_OPENCL, "Couldn't close OpenCL library");
+#endif
+  free(ocl);
+}
 
 /* only for debugging: default noop function for all unassigned function pointers */
 void dt_dlopencl_noop(void)
@@ -210,6 +227,8 @@ dt_dlopencl_t *dt_dlopencl_init(const char *name)
 
   if(!success)
     dt_print(DT_DEBUG_OPENCL, "[opencl_init] could not load all required symbols from library");
+  else
+    ocl->gmodule = module->gmodule;
 
   free(module);
 

src/common/dlopencl.h

@@ -208,13 +208,16 @@ typedef struct dt_dlopencl_symbols_t
   dt_clEnqueueWaitForEvents_t dt_clEnqueueWaitForEvents;
 } dt_dlopencl_symbols_t;
 
-
-
 typedef struct dt_dlopencl_t
 {
   gboolean have_opencl;
   dt_dlopencl_symbols_t *symbols;
   char *library;
+#ifndef __APPLE__
+  GModule *gmodule;
+#else
+  void *gmodule;
+#endif
 } dt_dlopencl_t;
 
 /* default noop function for all unassigned function pointers */
@@ -223,6 +226,9 @@ void dt_dlopencl_noop(void);
 /* dynamically load OpenCL library and bind needed functions */
 dt_dlopencl_t *dt_dlopencl_init(const char *);
 
+/* dynamically close OpenCL library opened by dt_dlopencl_init() */
+void dt_dlopencl_close(dt_dlopencl_t *ocl);
+
 #endif // HAVE_OPENCL
 
 // clang-format off

src/common/opencl.c

@@ -1649,9 +1649,7 @@ void dt_opencl_cleanup(dt_opencl_t *cl)
 
   if(cl->dlocl)
   {
-    free(cl->dlocl->symbols);
-    g_free(cl->dlocl->library);
-    free(cl->dlocl);
+    dt_dlopencl_close(cl->dlocl);
   }
 
   free(cl->dev);