From f872194bed5895c51a8a1c9df352b843cbfb59dc Mon Sep 17 00:00:00 2001
From: Marko Bencun <mbencun@gmail.com>
Date: Fri, 6 Sep 2013 22:08:17 +0200
Subject: [PATCH] garbage collection

---
 pyopencl/cffi_cl.py          |  3 +++
 src/c_wrapper/wrap_cl.cpp    | 49 +++++++++++++++++++++++-------------
 src/c_wrapper/wrap_cl_core.h |  1 +
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index f7d24d46..d36c30a4 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -174,6 +174,9 @@ class _Common(object):
     @classmethod
     def _c_class_type(cls):
         return getattr(_lib, 'CLASS_%s' % cls._id.upper())
+
+    def __del__(self):
+        _lib._delete(self.ptr, self._c_class_type())
         
     def __eq__(self, other):
         return hash(self) == hash(other)
diff --git a/src/c_wrapper/wrap_cl.cpp b/src/c_wrapper/wrap_cl.cpp
index ad867f09..8af9c4b5 100644
--- a/src/c_wrapper/wrap_cl.cpp
+++ b/src/c_wrapper/wrap_cl.cpp
@@ -52,6 +52,20 @@
       throw pyopencl::error(#NAME, status_code);	\
   }
 
+#define PYOPENCL_CALL_GUARDED_CLEANUP(NAME, ARGLIST) \
+  { \
+    PYOPENCL_PRINT_CALL_TRACE(#NAME); \
+    cl_int status_code; \
+    status_code = NAME ARGLIST; \
+    if (status_code != CL_SUCCESS) \
+      std::cerr \
+        << "PyOpenCL WARNING: a clean-up operation failed (dead context maybe?)" \
+        << std::endl \
+        << #NAME " failed with code " << status_code \
+        << std::endl; \
+  }
+
+
 // }}}
 
 
@@ -761,9 +775,8 @@ namespace pyopencl
 
     ~context()
     {
-      // TODO
-      // PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseContext,
-      // 			      (m_context));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseContext,
+      			      (m_context));
     }
 
     cl_context data() const
@@ -903,9 +916,8 @@ namespace pyopencl
 
     ~command_queue()
     {
-      // TODO
-      // PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseCommandQueue,
-      //     (m_queue));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseCommandQueue,
+          (m_queue));
     }
 
     const cl_command_queue data() const
@@ -987,9 +999,8 @@ namespace pyopencl
 
     virtual ~event()
     {
-      // todo
-      // PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseEvent,
-      //     (m_event));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseEvent,
+				    (m_event));
     }
 
     const cl_event data() const
@@ -1151,8 +1162,7 @@ namespace pyopencl
       if (!m_valid)
 	throw error("MemoryObject.free", CL_INVALID_VALUE,
 		    "trying to double-unref mem object");
-      // TODO
-      //PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseMemObject, (m_mem));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseMemObject, (m_mem));
       m_valid = false;
     }
 
@@ -1414,8 +1424,7 @@ namespace pyopencl
 
     ~program()
     {
-      // TODO
-      //PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseProgram, (m_program));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseProgram, (m_program));
     }
 
     cl_program data() const
@@ -1622,8 +1631,7 @@ namespace pyopencl
 
     ~kernel()
     {
-      // todo
-      //PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseKernel, (m_kernel));
+      PYOPENCL_CALL_GUARDED_CLEANUP(clReleaseKernel, (m_kernel));
     }
 
     cl_kernel data() const
@@ -2215,10 +2223,15 @@ long _hash(void *ptr, class_t class_) {
   
 ::error *_get_info(void *ptr, class_t class_, cl_uint param, generic_info *out) {
 #define GET_INFO(CLSU, CLS) C_HANDLE_ERROR(*out = static_cast<pyopencl::CLS*>(ptr)->get_info(param);)
-  SWITCHCLASS(GET_INFO)
-    return 0;
+  SWITCHCLASS(GET_INFO);
+  return 0;
 }
- 
+
+void _delete(void *ptr, class_t class_) {
+#define DELETE(CLSU, CLS) delete static_cast<pyopencl::CLS*>(ptr);
+  SWITCHCLASS(DELETE);
+}
+
 
 int get_cl_version(void) {
   return PYOPENCL_CL_VERSION;
diff --git a/src/c_wrapper/wrap_cl_core.h b/src/c_wrapper/wrap_cl_core.h
index 6e8e5a83..efac2d69 100644
--- a/src/c_wrapper/wrap_cl_core.h
+++ b/src/c_wrapper/wrap_cl_core.h
@@ -55,6 +55,7 @@ void populate_constants(void(*add)(const char*, const char*, long value));
 intptr_t _int_ptr(void*, class_t);
 void* _from_int_ptr(void **ptr_out, intptr_t int_ptr_value, class_t);
 error *_get_info(void *ptr, class_t class_, cl_uint param, generic_info *out);
+void _delete(void *ptr, class_t class_);
 void _free(void*);
 void _free2(void**, uint32_t size);
 
-- 
GitLab