cpu: sched_runtime can be set. This need at least kernel 6.12

wwmm · Nov 30, 2024 · 62455b4 · 62455b4
1 parent 2f68587
commit 62455b4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/fastgame_apply.cpp b/src/fastgame_apply.cpp
@@ -308,10 +308,10 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int {
       update_system_setting("/proc/" + util::to_string(game_pid) + "/autogroup", autogroup_niceness);
 
       if (use_batch_scheduler) {
-        util::set_sched_runtime(game_pid, sched_runtime, SCHED_BATCH, 0);
+        util::set_sched_runtime(game_pid, sched_runtime, SCHED_BATCH, niceness, 0);
 
       } else {
-        util::set_sched_runtime(game_pid, sched_runtime, SCHED_OTHER, 0);
+        util::set_sched_runtime(game_pid, sched_runtime, SCHED_OTHER, niceness, 0);
       }
 
       if (enable_realtime_io_priority) {
@@ -338,9 +338,9 @@ auto main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[]) -> int {
         if (use_batch_scheduler) {
           util::set_process_scheduler(child_pid, SCHED_BATCH, 0);
 
-          util::set_sched_runtime(child_pid, sched_runtime, SCHED_BATCH, 0);
+          util::set_sched_runtime(child_pid, sched_runtime, SCHED_BATCH, niceness, 0);
         } else {
-          util::set_sched_runtime(child_pid, sched_runtime, SCHED_OTHER, 0);
+          util::set_sched_runtime(child_pid, sched_runtime, SCHED_OTHER, niceness, 0);
         }
 
         setpriority(PRIO_PROCESS, child_pid, niceness);

diff --git a/src/fastgame_launcher.cpp b/src/fastgame_launcher.cpp
@@ -58,13 +58,14 @@ auto main(int argc, char* argv[]) -> int {
   util::apply_cpu_affinity(0, cpu_affinity);
 
   double sched_runtime = root.get<double>("cpu.sched-runtime", util::get_sched_runtime(0, 0));
+  int niceness = root.get<int>("cpu.niceness", 0);
 
   if (root.get<bool>("cpu.use-batch-scheduler")) {
     util::set_process_scheduler(0, SCHED_BATCH, 0);
 
-    util::set_sched_runtime(0, sched_runtime, SCHED_BATCH, 0);
+    util::set_sched_runtime(0, sched_runtime, SCHED_BATCH, niceness, 0);
   } else {
-    util::set_sched_runtime(0, sched_runtime, SCHED_OTHER, 0);
+    util::set_sched_runtime(0, sched_runtime, SCHED_OTHER, niceness, 0);
   }
 
   int timer_slack_ns = root.get<int>("cpu.timer-slack", 50000);

diff --git a/src/util.cpp b/src/util.cpp
@@ -193,14 +193,19 @@ void set_process_scheduler(const int& pid, const int& policy_index, const int& p
   sched_setscheduler(pid, policy_index, &policy_params);
 }
 
-void set_sched_runtime(const int& pid, const double& value, const int& policy_index, const uint& flags) {
+void set_sched_runtime(const int& pid,
+                       const double& value,
+                       const int& policy_index,
+                       const int& priority,
+                       const uint& flags) {
   sched_attr attr = {};
 
   attr.size = sizeof(sched_attr);
   attr.sched_policy = policy_index;
   attr.sched_runtime = value * 1000 * 1000;  // ms in nanoseconds
+  attr.sched_priority = priority;
 
-  if (syscall(SYS_sched_setattr, pid, &attr, flags) < 0) {
+  if (syscall(SYS_sched_setattr, pid, &attr, flags) != 0) {
     perror("sched_setattr");
   }
 }

diff --git a/src/util.hpp b/src/util.hpp
@@ -39,7 +39,11 @@ void clear_cpu_affinity(const int& pid);
 
 void set_process_scheduler(const int& pid, const int& policy_index, const int& priority);
 
-void set_sched_runtime(const int& pid, const double& value, const int& policy_index, const uint& flags);
+void set_sched_runtime(const int& pid,
+                       const double& value,
+                       const int& policy_index,
+                       const int& priority,
+                       const uint& flags);
 
 auto get_sched_runtime(const int& pid, const uint& flags) -> uint64_t;