Changeset 9acbd37 in sasmodels

Timestamp:

Oct 5, 2016 4:28:54 PM (8 years ago)

Author:

wojciech

Children:

8b10fdf

Parents:

71f8bdb

Message:

Unloading lib from ctypes by triggering release function in kerneldll ref #576

Location:

sasmodels

Files:

• kerneldll.py (modified) (4 diffs)
• sasview_model.py (modified) (1 diff)

sasmodels/kerneldll.py

@@ -73 +73 @@
 import tempfile
 import ctypes as ct  # type: ignore
+import _ctypes as _ct
 from ctypes import c_void_p, c_int32, c_longdouble, c_double, c_float  # type: ignore
 import logging
@@ -259 +260 @@
         # Note: if there is a syntax error then compile raises an error
         # and the source file will not be deleted.
-        #os.unlink(filename)
-        print("saving compiled file in %r"%filename)
+        os.unlink(filename)
+        #print("saving compiled file in %r"%filename)
     return dll
 
@@ -301 +302 @@
     def _load_dll(self):
         # type: () -> None
-        print("dll", self.dllpath)
         try:
             self._dll = ct.CDLL(self.dllpath)
@@ -344 +344 @@
         Release any resources associated with the model.
         """
+        dll_handle = self._dll._handle
         if os.name == 'nt':
-            #dll = ct.cdll.LoadLibrary(self.dllpath)
-            dll = ct.CDLL(self.dllpath)
-            dll_handle = dll._handle
-            #dll_handle = ct.c_void_p(dll._handle)
-            del dll, self._dll
-            self._dll = None
             ct.windll.kernel32.FreeLibrary(dll_handle)
         else:
-            pass
-
+            _ct.dlclose(dll_handle)
+        del self._dll
+        self._dll = None
 
 class DllKernel(Kernel):

sasmodels/sasview_model.py

@@ -575 +575 @@
                             magnetic=is_magnetic)
         calculator.release()
+        self._model.release()
         return result