From 42b12ae3ec97597f6af8c59824317d4f32f023b4 Mon Sep 17 00:00:00 2001 From: Adnan Hodzic Date: Sun, 20 Sep 2020 09:03:21 +0200 Subject: [PATCH] further turbo trigger refinements + reorder of cpu/load based triggers --- source/core.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/source/core.py b/source/core.py index c71eb7a..b7ae36a 100644 --- a/source/core.py +++ b/source/core.py @@ -36,9 +36,9 @@ load1m, _, _ = os.getloadavg() # get CPU utilization as a percentage cpuload = psutil.cpu_percent(interval=1) -# powersave/performance load thresholds -powersave_load_threshold = (50*CPUS)/100 -performance_load_threshold = (25*CPUS)/100 +# powersave/performance system load thresholds +powersave_load_threshold = (75*CPUS)/100 +performance_load_threshold = (50*CPUS)/100 # auto-cpufreq log file auto_cpufreq_log_file = Path("/var/log/auto-cpufreq.log") @@ -314,12 +314,12 @@ def set_powersave(): display_load() # conditions for setting turbo in powersave - if load1m > powersave_load_threshold: - print("High load, setting turbo boost: on") - turbo(True) - elif psutil.cpu_percent(percpu=False, interval=0.01) >= 25.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): + if psutil.cpu_percent(percpu=False, interval=0.01) >= 30.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): print("High CPU load, setting turbo boost: on") turbo(True) + elif load1m > powersave_load_threshold: + print("High system load, setting turbo boost: on") + turbo(True) else: print("Load optimal, setting turbo boost: off") turbo(False) @@ -333,12 +333,12 @@ def mon_powersave(): # cpu usage/system load display_load() - if load1m > powersave_load_threshold: - print("High load, suggesting to set turbo boost: on") + if psutil.cpu_percent(percpu=False, interval=0.01) >= 30.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): + print("High CPU load, suggesting to set turbo boost: on") get_turbo() footer() - elif psutil.cpu_percent(percpu=False, interval=0.01) >= 25.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): - print("High CPU load, suggesting to set turbo boost: on") + elif load1m > powersave_load_threshold: + print("High system load, suggesting to set turbo boost: on") get_turbo() footer() else: @@ -358,12 +358,12 @@ def set_performance(): # cpu usage/system load display_load() - if load1m >= performance_load_threshold: - print("High load, setting turbo boost: on") - turbo(True) - elif psutil.cpu_percent(percpu=False, interval=0.01) >= 15.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): + if psutil.cpu_percent(percpu=False, interval=0.01) >= 20.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 75): print("High CPU load, setting turbo boost: on") turbo(True) + elif load1m >= performance_load_threshold: + print("High system load, setting turbo boost: on") + turbo(True) else: print("Load optimal, setting turbo boost: off") turbo(False) @@ -377,12 +377,12 @@ def mon_performance(): # cpu usage/system load display_load() - if load1m > performance_load_threshold: - print("High load, suggesting to set turbo boost: on") + if psutil.cpu_percent(percpu=False, interval=0.01) >= 20.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 75): + print("High CPU load, suggesting to set turbo boost: on") get_turbo() footer() - elif psutil.cpu_percent(percpu=False, interval=0.01) >= 25.0 or isclose(max(psutil.cpu_percent(percpu=True, interval=0.01)), 100): - print("High CPU load, suggesting to set turbo boost: on") + elif load1m > performance_load_threshold: + print("High system load, suggesting to set turbo boost: on") get_turbo() footer() else: