Merge pull request #1109 from makermelissa-piclaw/fix-libgpiod-cleanup

Ensure libgpiod resources are cleaned up on exit

Author: makermelissa

src/adafruit_blinka/microcontroller/amlogic/a311d/pulseio/PulseIn.py

@@ -7,6 +7,7 @@
 import os
 import atexit
 import random
+import signal
 import struct
 import sysv_ipc
 
@@ -31,6 +32,18 @@ def final():
 atexit.register(final)
 
 
+def _signal_handler(signum, frame):  # pylint: disable=unused-argument
+    """Handle SIGTERM/SIGINT to ensure cleanup runs"""
+    final()
+    raise SystemExit(1)
+
+
+try:
+    signal.signal(signal.SIGTERM, _signal_handler)
+except (OSError, ValueError):
+    pass  # Not all environments allow signal handling
+
+
 # pylint: disable=c-extension-no-member
 class PulseIn:
     """PulseIn Class to read PWM signals"""
@@ -108,14 +121,26 @@ def _wait_receive_msg(self, timeout=0, type=2):
 
     # pylint: enable=redefined-builtin
 
+    def __del__(self):
+        self.deinit()
+
     def deinit(self):
         """Deinitialises the PulseIn and releases any hardware and software
         resources for reuse."""
         # Clean up after ourselves
-        self._process.terminate()
-        procs.remove(self._process)
-        self._mq.remove()
-        queues.remove(self._mq)
+        if self._process is not None:
+            self._process.terminate()
+            if self._process in procs:
+                procs.remove(self._process)
+            self._process = None
+        if self._mq is not None:
+            try:
+                self._mq.remove()
+            except sysv_ipc.ExistentialError:
+                pass  # Already removed
+            if self._mq in queues:
+                queues.remove(self._mq)
+            self._mq = None
 
     def __enter__(self):
         """No-op used by Context Managers."""

src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pulseio/PulseIn.py

@@ -7,6 +7,7 @@
 import os
 import atexit
 import random
+import signal
 import sysv_ipc
 
 DEBUG = False
@@ -30,6 +31,18 @@ def final():
 atexit.register(final)
 
 
+def _signal_handler(signum, frame):  # pylint: disable=unused-argument
+    """Handle SIGTERM/SIGINT to ensure cleanup runs"""
+    final()
+    raise SystemExit(1)
+
+
+try:
+    signal.signal(signal.SIGTERM, _signal_handler)
+except (OSError, ValueError):
+    pass  # Not all environments allow signal handling
+
+
 # pylint: disable=c-extension-no-member
 class PulseIn:
     """PulseIn Class to read PWM signals"""
@@ -110,14 +123,26 @@ def _wait_receive_msg(self, timeout=0, type=2):
 
     # pylint: enable=redefined-builtin
 
+    def __del__(self):
+        self.deinit()
+
     def deinit(self):
         """Deinitialises the PulseIn and releases any hardware and software
         resources for reuse."""
         # Clean up after ourselves
-        self._process.terminate()
-        procs.remove(self._process)
-        self._mq.remove()
-        queues.remove(self._mq)
+        if self._process is not None:
+            self._process.terminate()
+            if self._process in procs:
+                procs.remove(self._process)
+            self._process = None
+        if self._mq is not None:
+            try:
+                self._mq.remove()
+            except sysv_ipc.ExistentialError:
+                pass  # Already removed
+            if self._mq in queues:
+                queues.remove(self._mq)
+            self._mq = None
 
     def __enter__(self):
         """No-op used by Context Managers."""

src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py

@@ -7,6 +7,7 @@
 import os
 import atexit
 import random
+import signal
 import struct
 import sysv_ipc
 
@@ -31,6 +32,18 @@ def final():
 atexit.register(final)
 
 
+def _signal_handler(signum, frame):  # pylint: disable=unused-argument
+    """Handle SIGTERM/SIGINT to ensure cleanup runs"""
+    final()
+    raise SystemExit(1)
+
+
+try:
+    signal.signal(signal.SIGTERM, _signal_handler)
+except (OSError, ValueError):
+    pass  # Not all environments allow signal handling
+
+
 # pylint: disable=c-extension-no-member
 class PulseIn:
     """PulseIn Class to read PWM signals"""
@@ -112,14 +125,26 @@ def _wait_receive_msg(self, timeout=0, type=2):
 
     # pylint: enable=redefined-builtin
 
+    def __del__(self):
+        self.deinit()
+
     def deinit(self):
         """Deinitialises the PulseIn and releases any hardware and software
         resources for reuse."""
         # Clean up after ourselves
-        self._process.terminate()
-        procs.remove(self._process)
-        self._mq.remove()
-        queues.remove(self._mq)
+        if self._process is not None:
+            self._process.terminate()
+            if self._process in procs:
+                procs.remove(self._process)
+            self._process = None
+        if self._mq is not None:
+            try:
+                self._mq.remove()
+            except sysv_ipc.ExistentialError:
+                pass  # Already removed
+            if self._mq in queues:
+                queues.remove(self._mq)
+            self._mq = None
 
     def __enter__(self):
         """No-op used by Context Managers."""

src/adafruit_blinka/microcontroller/generic_linux/libgpiod/libgpiod_chip_1_x.py

@@ -26,6 +26,11 @@ def __init__(self, chip_id: str):
         else:
             self.num_lines = self.num_lines
 
+    def __del__(self):
+        if self._chip:
+            self._chip.close()
+            self._chip = None
+
     def __repr__(self):
         return self.id
 

src/adafruit_blinka/microcontroller/generic_linux/libgpiod/libgpiod_chip_2_x.py

@@ -22,6 +22,11 @@ def __init__(self, chip_id: str):
         info = self._chip.get_info()
         self.num_lines = info.num_lines
 
+    def __del__(self):
+        if self._chip:
+            self._chip.close()
+            self._chip = None
+
     def __repr__(self):
         return self.id
 

src/adafruit_blinka/microcontroller/generic_linux/libgpiod/libgpiod_pin_1_x.py

@@ -38,6 +38,9 @@ def __init__(self, pin_id):
                 self._chip = gpiod.chip("gpiochip0", gpiod.chip.OPEN_BY_NAME)
         self._line = None
 
+    def __del__(self):
+        self.deinit()
+
     def __repr__(self):
         return str(self.id)
 
@@ -115,6 +118,15 @@ def init(self, mode=IN, pull=None):
             else:
                 raise RuntimeError("Invalid mode for pin: %s" % self.id)
 
+    def deinit(self):
+        """Release the pin and associated resources."""
+        if self._line:
+            self._line.release()
+            self._line = None
+        if self._chip:
+            self._chip.close()
+            self._chip = None
+
     def value(self, val=None):
         """Set or return the Pin Value"""
         if val is None:

src/adafruit_blinka/microcontroller/generic_linux/libgpiod/libgpiod_pin_2_x.py

@@ -37,8 +37,7 @@ def __init__(self, pin_id):
         self._line_request = None
 
     def __del__(self):
-        if self._line_request:
-            self._line_request.release()
+        self.deinit()
 
     def __repr__(self):
         return str(self.id)
@@ -89,6 +88,15 @@ def init(self, mode=IN, pull=None):
             else:
                 raise RuntimeError("Invalid mode for pin: %s" % self.id)
 
+    def deinit(self):
+        """Release the pin and associated resources."""
+        if self._line_request:
+            self._line_request.release()
+            self._line_request = None
+        if self._chip:
+            self._chip.close()
+            self._chip = None
+
     def value(self, val=None):
         """Set or return the Pin Value"""
         if val is None:

src/digitalio.py

@@ -79,7 +79,10 @@ def switch_to_input(self, pull=None):
 
     def deinit(self):
         """Deinitialize the Digital Pin"""
-        del self._pin
+        if self._pin is not None:
+            if hasattr(self._pin, "deinit"):
+                self._pin.deinit()
+            self._pin = None
 
     @property
     def direction(self):