adjustor 3.5.0__tar.gz → 3.5.2__tar.gz

{adjustor-3.5.0/src/adjustor.egg-info → adjustor-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.5.0
+Version: 3.5.2
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor

{adjustor-3.5.0 → adjustor-3.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adjustor"
-version = "3.5.0"
+version = "3.5.2"
 authors = [
   { name="Kapenekakis Antheas", email="pypi@antheas.dev" },
 ]

{adjustor-3.5.0 → adjustor-3.5.2}/src/adjustor/drivers/amd/__init__.py

@@ -142,11 +142,13 @@ class AmdGPUPlugin(HHDPlugin):
 
         if self.ppd_conflict and os.environ.get("HHD_PPD_MASK", None):
             logger.warning(
-                "PPD conflict detected but HHD_PPD_MASK is set. Masking PPD."
+                "PPD conflict detected but HHD_PPD_MASK is set. Masking PPD/TuneD."
             )
             # Mask and disable
             os.system("systemctl mask power-profiles-daemon.service")
             os.system("systemctl disable --now power-profiles-daemon.service")
+            os.system("systemctl mask tuned.service")
+            os.system("systemctl disable --now tuned.service")
             # Keep going without check to avoid obscure errors
             self.ppd_conflict = False
 

{adjustor-3.5.0 → adjustor-3.5.2}/src/adjustor/drivers/asus/__init__.py

@@ -24,6 +24,7 @@ CTDP_FN = "/sys/devices/platform/asus-nb-wmi/ppt_pl1_spl"
 EXTREME_FN = "/sys/devices/platform/asus-nb-wmi/mcu_powersave"
 EXTREME_ENABLE = bool(os.environ.get("HHD_ALLY_POWERSAVE", None))
 # This setting can really mess up the controller
+EXTREME_STARTUP_DELAY = 12
 EXTREME_DELAY = 3.8
 
 FAN_CURVE_ENDPOINT = "/sys/class/hwmon"
@@ -147,7 +148,7 @@ class AsusDriverPlugin(HHDPlugin):
         self.queue_fan = None
         self.queue_tdp = None
         self.queue_charge_limit = None
-        self.queue_extreme = None
+        self.queue_extreme = time.perf_counter() + EXTREME_STARTUP_DELAY
         self.new_tdp = None
         self.new_mode = None
         self.old_target = None
@@ -216,7 +217,7 @@ class AsusDriverPlugin(HHDPlugin):
             self.old_conf = conf["tdp.asus"]
             return
 
-        curr = time.time()
+        curr = time.perf_counter()
 
         # Charge limit
         lim = conf["tdp.asus.charge_limit"].to(str)
@@ -461,16 +462,22 @@ class AsusDriverPlugin(HHDPlugin):
         # Extreme standby
         if self.extreme_supported:
             standby = conf["tdp.asus.extreme_standby"].to(bool)
-            if standby != self.extreme_standby:
-                self.extreme_standby = standby
+            if self.extreme_standby is not None and self.extreme_standby != standby:
                 self.queue_extreme = curr + EXTREME_DELAY
+            self.extreme_standby = standby
 
             if self.queue_extreme and self.queue_extreme < curr:
                 self.queue_extreme = None
                 try:
-                    logger.info (f"Setting extreme standby to '{standby}'")
-                    with open(EXTREME_FN, "w") as f:
-                        f.write("1" if standby == "enabled" else "0")
+                    nval = standby == "enabled"
+                    with open(EXTREME_FN, "r") as f:
+                        cval = f.read().strip() == "1"
+                    if nval != cval:
+                        logger.info (f"Setting extreme standby to '{standby}'")
+                        with open(EXTREME_FN, "w") as f:
+                            f.write("1" if standby == "enabled" else "0")
+                    else:
+                        logger.info(f"Extreme standby already set to '{standby}'")
                 except Exception as e:
                     logger.error(f"Could not set extreme standby. Error:\n{e}")
 

{adjustor-3.5.0 → adjustor-3.5.2}/src/adjustor/drivers/general/__init__.py

@@ -27,6 +27,7 @@ class GeneralPowerPlugin(HHDPlugin):
         self.old_sched = None
         self.sched_proc = None
         self.ppd_supported = None
+        self.tuned_supported = None
         self.is_steamdeck = is_steamdeck
         self.ovr_enabled = False
         self.should_exit = Event()
@@ -54,6 +55,26 @@ class GeneralPowerPlugin(HHDPlugin):
                 except Exception as e:
                     logger.warning(f"powerprofilectl returned with error:\n{e}")
 
+        # TuneD
+        if self.tuned_supported is None:
+            self.tuned_supported = False
+            if tuned := shutil.which('tuned-adm'):
+                try:
+                    if os.environ.get("HHD_PPD_MASK", None):
+                        logger.info("Unmasking TuneD in the case it was masked.")
+                        os.system('systemctl unmask tuned')
+                    subprocess.run(
+                        [tuned],
+                        check=True,
+                        stdin=subprocess.DEVNULL,
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL,
+                    )
+                    self.tuned_supported = True
+                except Exception as e:
+                    logger.warning(f"tuned-adm returned with error:\n{e}")
+
+
         if not self.ppd_supported:
             del sets["children"]["profile"]
 
@@ -122,6 +143,54 @@ class GeneralPowerPlugin(HHDPlugin):
                     logger.warning(f"powerprofilectl returned with error:\n{e}")
                     self.ppd_supported = False
 
+        # Handle TuneD
+        if self.tuned_supported:
+            curr = time.time()
+            ppd_tuned_mapping = {
+                "power-saver": "powersave",
+                "balanced": "balanced",
+                "performance": "throughput-performance"
+            }
+            new_profile = ppd_tuned_mapping.get(conf.get("tdp.general.profile", self.target))
+            if new_profile != self.target and new_profile and self.target:
+                logger.info(f"Setting TuneD profile to '{new_profile}'")
+                self.target = new_profile
+                try:
+                    subprocess.run(
+                        [shutil.which('tuned-adm'), "profile", new_profile],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                    )
+                except Exception as e:
+                    self.tuned_supported = False
+                    logger.warning(f"tuned-adm returned with error:\n{e}")
+                    self.tuned_supported = False
+            elif not self.last_check or curr - self.last_check > 2:
+                # Update profile every 2 seconds
+                self.last_check = curr
+                try:
+                    res = subprocess.run(
+                        [shutil.which('tuned-adm'), "active"],
+                        check=True,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                    )
+
+                    tuned_ppd_mapping = {
+                        "powersave": "power-saver",
+                        "balanced": "balanced",
+                        "throughput-performance": "performance"
+                    }
+                    self.target = tuned_ppd_mapping.get(res.stdout.decode().split(":")[1].strip())  # type: ignore
+
+                    if self.target != conf["tdp.general.profile"].to(str):
+                        conf["tdp.general.profile"] = self.target
+                except Exception as e:
+                    self.tuned_supported = False
+                    logger.warning(f"powerprofilectl returned with error:\n{e}")
+                    self.tuned_supported = False
+
         # Handle sched
         if self.avail_scheds:
             # Check health and print error

{adjustor-3.5.0 → adjustor-3.5.2/src/adjustor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adjustor
-Version: 3.5.0
+Version: 3.5.2
 Summary: Adjustor, a userspace program for managing the TDP of handheld devices.
 Author-email: Kapenekakis Antheas <pypi@antheas.dev>
 Project-URL: Homepage, https://github.com/hhd-dev/adjustor