trcc-linux 5.1.0__tar.gz → 5.1.2__tar.gz

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 5.1.0
+Version: 5.1.2
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "5.1.0"
+version = "5.1.2"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "5.1.0"
+__version__ = "5.1.2"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -260,3 +260,14 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          devices. Removes led_hr10.py, uc_seven_segment.py, style 13, HR10
 #          CLI commands, and all related tests. LED styles now 1-12. -1762 lines.
 #          2286 tests.
+# 5.1.1  - OOP/KISS refactor phase 1: dc_writer class→module functions,
+#          cli.py split to cli/ package (6 submodules), controller __getattr__
+#          delegation (LEDController 26→6 methods, OverlayController 19→5),
+#          extract LEDEffectEngine from LEDService (Strategy pattern), move
+#          HW info to adapters/system/hardware.py, shared test conftest.py.
+#          Net -3100 lines. 2286 tests.
+# 5.1.2  - Fix SCSI SG_IO ioctl (was silently broken — ctypes bytearray bug
+#          caused every write to fork sg_raw subprocess). Pre-allocate ctypes
+#          buffers per chunk size. Cache shutil.which('sg_raw'). Cache
+#          psutil.cpu_freq (10s TTL). Slow sensor poll 2s→4s. CPU usage
+#          drops ~21%→15% (animated theme), ~7% (static). 2286 tests.

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/src/trcc/adapters/device/scsi.py

@@ -7,10 +7,18 @@ This module provides those two functions.
 SCSI send protocol is inlined here (from trcc_handshake_v2) so everything
 lives in one place under src/trcc/.  LCDDriver is used only for resolution
 auto-detection during device discovery.
+
+Performance: uses native SG_IO ioctl when available (no subprocess fork).
+Falls back to sg_raw subprocess automatically on older kernels or permission
+issues.
 """
+from __future__ import annotations
 
 import binascii
+import ctypes
+import fcntl
 import logging
+import os
 import struct
 import subprocess
 import tempfile
@@ -24,6 +32,145 @@ from trcc.core.models import HandshakeResult, fbl_to_resolution
 
 log = logging.getLogger(__name__)
 
+# =========================================================================
+# SG_IO ioctl — direct SCSI passthrough (no subprocess fork)
+# =========================================================================
+
+_SG_IO = 0x2285
+_SG_DXFER_TO_DEV = -2
+_SG_DXFER_FROM_DEV = -3
+
+
+class _SgIoHdr(ctypes.Structure):
+    """Linux sg_io_hdr_t for SG_IO ioctl."""
+
+    _fields_ = [
+        ('interface_id', ctypes.c_int),
+        ('dxfer_direction', ctypes.c_int),
+        ('cmd_len', ctypes.c_ubyte),
+        ('mx_sb_len', ctypes.c_ubyte),
+        ('iovec_count', ctypes.c_ushort),
+        ('dxfer_len', ctypes.c_uint),
+        ('dxferp', ctypes.c_void_p),
+        ('cmdp', ctypes.c_void_p),
+        ('sbp', ctypes.c_void_p),
+        ('timeout', ctypes.c_uint),
+        ('flags', ctypes.c_uint),
+        ('pack_id', ctypes.c_int),
+        ('usr_ptr', ctypes.c_void_p),
+        ('status', ctypes.c_ubyte),
+        ('masked_status', ctypes.c_ubyte),
+        ('msg_status', ctypes.c_ubyte),
+        ('sb_len_wr', ctypes.c_ubyte),
+        ('host_status', ctypes.c_ushort),
+        ('driver_status', ctypes.c_ushort),
+        ('resid', ctypes.c_int),
+        ('duration', ctypes.c_uint),
+        ('info', ctypes.c_uint),
+    ]
+
+
+# Module state: None = untested, True/False = tested
+_sg_io_available: bool | None = None
+# Cached file descriptors per device path
+_device_fds: dict[str, int] = {}
+
+# Pre-allocated SG_IO buffers per data size (avoids ctypes alloc per write).
+# Key: data length → (cdb_buf, data_buf, sense_buf, hdr, ioctl_buf)
+_SG_HDR_SIZE = ctypes.sizeof(_SgIoHdr)
+_write_bufs: dict[int, tuple] = {}
+
+
+def _get_device_fd(dev: str) -> int:
+    """Get or open a file descriptor for the SCSI generic device."""
+    fd = _device_fds.get(dev)
+    if fd is not None:
+        return fd
+    fd = os.open(dev, os.O_RDWR | os.O_NONBLOCK)
+    _device_fds[dev] = fd
+    return fd
+
+
+def _close_device_fd(dev: str) -> None:
+    """Close and remove cached fd."""
+    fd = _device_fds.pop(dev, None)
+    if fd is not None:
+        try:
+            os.close(fd)
+        except OSError:
+            pass
+
+
+def _get_write_bufs(cdb_len: int, data_len: int) -> tuple:
+    """Get or create pre-allocated ctypes buffers for a given data size."""
+    bufs = _write_bufs.get(data_len)
+    if bufs is not None:
+        return bufs
+    cdb_buf = (ctypes.c_ubyte * cdb_len)()
+    data_buf = (ctypes.c_ubyte * data_len)()
+    sense_buf = (ctypes.c_ubyte * 32)()
+    hdr = _SgIoHdr()
+    ioctl_buf = ctypes.create_string_buffer(_SG_HDR_SIZE)
+    # Pre-fill immutable header fields
+    hdr.interface_id = ord('S')
+    hdr.dxfer_direction = _SG_DXFER_TO_DEV
+    hdr.cmd_len = cdb_len
+    hdr.mx_sb_len = 32
+    hdr.dxfer_len = data_len
+    hdr.dxferp = ctypes.addressof(data_buf)
+    hdr.cmdp = ctypes.addressof(cdb_buf)
+    hdr.sbp = ctypes.addressof(sense_buf)
+    hdr.timeout = 10000
+    bufs = (cdb_buf, data_buf, sense_buf, hdr, ioctl_buf)
+    _write_bufs[data_len] = bufs
+    return bufs
+
+
+def _sg_io_write(dev: str, cdb: bytes, data: bytes) -> bool:
+    """SCSI write via SG_IO ioctl. No subprocess, no temp file."""
+    fd = _get_device_fd(dev)
+
+    cdb_buf, data_buf, _sense, hdr, ioctl_buf = _get_write_bufs(len(cdb), len(data))
+    # Copy payload into pre-allocated buffers
+    ctypes.memmove(cdb_buf, cdb, len(cdb))
+    ctypes.memmove(data_buf, data, len(data))
+
+    ctypes.memmove(ioctl_buf, ctypes.addressof(hdr), _SG_HDR_SIZE)
+    fcntl.ioctl(fd, _SG_IO, ioctl_buf)
+    ctypes.memmove(ctypes.addressof(hdr), ioctl_buf, _SG_HDR_SIZE)
+
+    return hdr.status == 0
+
+
+def _sg_io_read(dev: str, cdb: bytes, length: int) -> bytes:
+    """SCSI read via SG_IO ioctl. No subprocess."""
+    fd = _get_device_fd(dev)
+
+    cdb_buf = (ctypes.c_ubyte * len(cdb)).from_buffer_copy(cdb)
+    data_buf = (ctypes.c_ubyte * length)()
+    sense_buf = (ctypes.c_ubyte * 32)()
+
+    hdr = _SgIoHdr()
+    hdr.interface_id = ord('S')
+    hdr.dxfer_direction = _SG_DXFER_FROM_DEV
+    hdr.cmd_len = len(cdb)
+    hdr.mx_sb_len = 32
+    hdr.dxfer_len = length
+    hdr.dxferp = ctypes.addressof(data_buf)
+    hdr.cmdp = ctypes.addressof(cdb_buf)
+    hdr.sbp = ctypes.addressof(sense_buf)
+    hdr.timeout = 10000
+
+    buf = ctypes.create_string_buffer(ctypes.sizeof(hdr))
+    ctypes.memmove(buf, ctypes.addressof(hdr), ctypes.sizeof(hdr))
+    fcntl.ioctl(fd, _SG_IO, buf)
+    ctypes.memmove(ctypes.addressof(hdr), buf, ctypes.sizeof(hdr))
+
+    if hdr.status != 0:
+        return b''
+    actual = length - hdr.resid
+    return bytes(data_buf[:actual])
+
 # Boot signature: device still initializing its display controller
 _BOOT_SIGNATURE = b'\xa1\xa2\xa3\xa4'
 _BOOT_WAIT_SECONDS = 3.0
@@ -103,7 +250,19 @@ class ScsiDevice(FrameDevice):
 
     @staticmethod
     def _scsi_read(dev: str, cdb: bytes, length: int) -> bytes:
-        """Execute SCSI READ via sg_raw."""
+        """Execute SCSI READ via SG_IO ioctl (or sg_raw fallback)."""
+        global _sg_io_available
+        if _sg_io_available is not False:
+            try:
+                result = _sg_io_read(dev, cdb, length)
+                _sg_io_available = True
+                return result
+            except OSError as e:
+                if _sg_io_available is None:
+                    log.warning("SG_IO read failed (%s: %s), falling back to sg_raw",
+                                type(e).__name__, e)
+                    _sg_io_available = False
+
         SysUtils.require_sg_raw()
         cdb_hex = ' '.join(f'{b:02x}' for b in cdb)
         cmd = ['sg_raw', '-r', str(length), dev] + cdb_hex.split()
@@ -112,9 +271,23 @@ class ScsiDevice(FrameDevice):
 
     @staticmethod
     def _scsi_write(dev: str, header: bytes, data: bytes) -> bool:
-        """Execute SCSI WRITE via sg_raw with temp file for payload."""
+        """Execute SCSI WRITE via SG_IO ioctl (or sg_raw fallback)."""
+        global _sg_io_available
+        cdb = header[:16]
+
+        if _sg_io_available is not False:
+            try:
+                ok = _sg_io_write(dev, cdb, data)
+                _sg_io_available = True
+                return ok
+            except OSError as e:
+                if _sg_io_available is None:
+                    log.warning("SG_IO ioctl failed (%s: %s), falling back to sg_raw",
+                                type(e).__name__, e)
+                    _sg_io_available = False
+
         SysUtils.require_sg_raw()
-        cdb_hex = ' '.join(f'{b:02x}' for b in list(header[:16]))
+        cdb_hex = ' '.join(f'{b:02x}' for b in cdb)
 
         with tempfile.NamedTemporaryFile(delete=True) as f:
             f.write(data)

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/src/trcc/adapters/infra/data_repository.py

@@ -84,10 +84,16 @@ class SysUtils:
             return []
         return [e for e in sorted(os.listdir(sysfs)) if e.startswith('sg')]
 
+    _sg_raw_path: str | None = None
+    _sg_raw_checked: bool = False
+
     @staticmethod
     def require_sg_raw() -> None:
         """Verify sg_raw is available; raise FileNotFoundError with install help if not."""
-        if not shutil.which('sg_raw'):
+        if not SysUtils._sg_raw_checked:
+            SysUtils._sg_raw_path = shutil.which('sg_raw')
+            SysUtils._sg_raw_checked = True
+        if not SysUtils._sg_raw_path:
             raise FileNotFoundError(SysUtils._SG_RAW_INSTALL_HELP)
 
     @staticmethod

{trcc_linux-5.1.0 → trcc_linux-5.1.2}/src/trcc/adapters/infra/dc_config.py

@@ -123,9 +123,9 @@ class DcConfig:
 
     def save(self, filepath: str | Path) -> None:
         """Write config1.dc in 0xDD binary format."""
-        from .dc_writer import DcWriter
+        from .dc_writer import write as write_dc
 
-        DcWriter.write(self._to_theme_config(), str(filepath))
+        write_dc(self._to_theme_config(), str(filepath))
 
     def _to_theme_config(self):
         """Convert to dc_writer.ThemeConfig for write_dc_file()."""
@@ -165,9 +165,9 @@ class DcConfig:
     def from_overlay_config(cls, overlay_config: dict,
                             width: int = 320, height: int = 320) -> DcConfig:
         """Create DcConfig from an overlay renderer config dict."""
-        from .dc_writer import DcWriter
+        from .dc_writer import overlay_to_theme
 
-        tc = DcWriter.overlay_to_theme(overlay_config, width, height)
+        tc = overlay_to_theme(overlay_config, width, height)
         dc = cls()
         dc.elements = tc.elements
         dc.overlay_w = tc.overlay_w