refactor

Author: brandon-b-miller

cuda_core/cuda/core/experimental/_event.pyx

@@ -108,22 +108,20 @@ cdef class Event:
         self._ctx_handle = ctx_handle
         return self
 
-    cpdef safe_close(self, is_shutting_down=sys.is_finalizing):
-        """Destroy the event."""
-        if self._handle is not None:
-            if not is_shutting_down():
-                err, = driver.cuEventDestroy(self._handle)
-                raise_if_driver_error(err)
-
-    cpdef close(self):
-        """Destroy the event."""
+    cdef _shutdown_safe_close(self, is_shutting_down=sys.is_finalizing):
+        if is_shutting_down and is_shutting_down():
+            return
         if self._handle is not None:
             err, = driver.cuEventDestroy(self._handle)
             self._handle = None
             raise_if_driver_error(err)
 
+    cpdef close(self):
+        """Destroy the event."""
+        self._shutdown_safe_close(is_shutting_down=None)
+
     def __del__(self):
-        self.safe_close()
+        self._shutdown_safe_close()
 
     def __isub__(self, other):
         return NotImplemented

cuda_core/cuda/core/experimental/_memory.pyx

@@ -70,12 +70,16 @@ cdef class Buffer:
         return self
 
     def __del__(self):
-        self.safe_close()
+        self._shutdown_safe_close()
 
-    cpdef safe_close(self, stream: Stream = None, is_shutting_down=sys.is_finalizing):
+    cdef _shutdown_safe_close(self, stream: Stream = None, is_shutting_down=sys.is_finalizing):
+        if is_shutting_down and is_shutting_down():
+            return
         if self._ptr and self._mr is not None:
-            if not is_shutting_down():
-                self._mr.deallocate(self._ptr, self._size, stream)
+            self._mr.deallocate(self._ptr, self._size, stream)
+            self._ptr = 0
+            self._mr = None
+            self._ptr_obj = None
 
     cpdef close(self, stream: Stream = None):
         """Deallocate this buffer asynchronously on the given stream.
@@ -89,11 +93,7 @@ cdef class Buffer:
             The stream object to use for asynchronous deallocation. If None,
             the behavior depends on the underlying memory resource.
         """
-        if self._ptr and self._mr is not None:
-            self._mr.deallocate(self._ptr, self._size, stream)
-            self._ptr = 0
-            self._mr = None
-            self._ptr_obj = None
+        self._shutdown_safe_close(stream, is_shutting_down=None)
 
     @property
     def handle(self) -> DevicePointerT:

cuda_core/cuda/core/experimental/_stream.pyx

@@ -187,13 +187,18 @@ cdef class Stream:
         return self
 
     def __del__(self):
-        self.safe_close()
+        self._shutdown_safe_close()
+
+    cdef _shutdown_safe_close(self, is_shutting_down=sys.is_finalizing):
+        if is_shutting_down and is_shutting_down():
+            return
 
-    cpdef safe_close(self, is_shutting_down=sys.is_finalizing):
         if self._owner is None:
             if self._handle and not self._builtin:
-                if not is_shutting_down():
-                    handle_return(driver.cuStreamDestroy(self._handle))
+                handle_return(driver.cuStreamDestroy(self._handle))
+        else:
+            self._owner = None
+        self._handle = None
 
     cpdef close(self):
         """Destroy the stream.
@@ -202,12 +207,7 @@ cdef class Stream:
         object will instead have their references released.
 
         """
-        if self._owner is None:
-            if self._handle and not self._builtin:
-                handle_return(driver.cuStreamDestroy(self._handle))
-        else:
-            self._owner = None
-        self._handle = None
+        self._shutdown_safe_close(is_shutting_down=None)
 
     def __cuda_stream__(self) -> tuple[int, int]:
         """Return an instance of a __cuda_stream__ protocol."""