Merge pull request #260 from danieljordan10/rusty-lb-fixes

scx_rusty: load balancing fixes
sched-ext · May 2, 2024 · 8fe900e · 8fe900e
2 parents 4fad916 + de2773d
commit 8fe900e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/scheds/rust/scx_rusty/src/load_balance.rs b/scheds/rust/scx_rusty/src/load_balance.rs
@@ -311,7 +311,7 @@ impl LoadEntity {
     }
 
     fn xfer_between(&self, other: &LoadEntity) -> f64 {
-        self.imbal().min(other.imbal()).abs() * self.xfer_ratio
+        self.imbal().abs().min(other.imbal().abs()) * self.xfer_ratio
     }
 }
 
@@ -714,11 +714,8 @@ impl<'a, 'b> LoadBalancer<'a, 'b> {
                     continue;
                 }
 
-                let weight = (task_ctx.weight as f64).min(self.infeas_threshold);
-
                 let rd = &task_ctx.dcyc_rd;
-                let load = weight
-                    * ravg_read(
+                let mut load = ravg_read(
                         rd.val,
                         rd.val_at,
                         rd.old,
@@ -728,6 +725,11 @@ impl<'a, 'b> LoadBalancer<'a, 'b> {
                         RAVG_FRAC_BITS,
                     );
 
+                if self.lb_apply_weight {
+                    let weight = (task_ctx.weight as f64).min(self.infeas_threshold);
+                    load *= weight;
+                }
+
                 dom.tasks.insert(
                     TaskInfo {
                         pid: *pid,