DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 15:26:47 +00:00
Code Issues Releases Wiki Activity

暂时禁用load balance (#591)

Browse Source 
原因见issue: https://github.com/DragonOS-Community/DragonOS/issues/571
This commit is contained in:
LoGin 2024-03-12 15:33:01 +08:00 committed by GitHub
parent 4374bd1d11
commit 818a64c776
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/src/sched/cfs.rs
View File

@ -100,6 +100,7 @@ impl CFSQueue {
} }
} }
/// 获取运行队列的长度 /// 获取运行队列的长度
#[allow(dead_code)]
pub fn get_cfs_queue_size( pub fn get_cfs_queue_size(
queue: &SpinLockGuard<RBTree<i64, Arc<ProcessControlBlock>>>, queue: &SpinLockGuard<RBTree<i64, Arc<ProcessControlBlock>>>,
) -> usize { ) -> usize {

27
kernel/src/sched/core.rs
View File

@ -6,7 +6,6 @@ use core::{
use alloc::{sync::Arc, vec::Vec}; use alloc::{sync::Arc, vec::Vec};
use crate::{ use crate::{
include::bindings::bindings::smp_get_total_cpu,
kinfo, kinfo,
mm::percpu::PerCpu, mm::percpu::PerCpu,
process::{AtomicPid, Pid, ProcessControlBlock, ProcessFlags, ProcessManager, ProcessState}, process::{AtomicPid, Pid, ProcessControlBlock, ProcessFlags, ProcessManager, ProcessState},
@ -51,6 +50,7 @@ impl CpuExecuting {
// 获取某个cpu的负载情况，返回当前负载，cpu_id 是获取负载的cpu的id // 获取某个cpu的负载情况，返回当前负载，cpu_id 是获取负载的cpu的id
// TODO:将获取负载情况调整为最近一段时间运行进程的数量 // TODO:将获取负载情况调整为最近一段时间运行进程的数量
#[allow(dead_code)]
pub fn get_cpu_loads(cpu_id: ProcessorId) -> u32 { pub fn get_cpu_loads(cpu_id: ProcessorId) -> u32 {
let cfs_scheduler = __get_cfs_scheduler(); let cfs_scheduler = __get_cfs_scheduler();
let rt_scheduler = __get_rt_scheduler(); let rt_scheduler = __get_rt_scheduler();
@ -64,19 +64,22 @@ pub fn get_cpu_loads(cpu_id: ProcessorId) -> u32 {
// 负载均衡 // 负载均衡
pub fn loads_balance(pcb: Arc<ProcessControlBlock>) { pub fn loads_balance(pcb: Arc<ProcessControlBlock>) {
// 对pcb的迁移情况进行调整 // 对pcb的迁移情况进行调整
// 由于调度器问题，暂时不进行负载均衡，见issue: https://github.com/DragonOS-Community/DragonOS/issues/571
let min_loads_cpu_id = ProcessorId::new(0);
// 获取总的CPU数量 // 获取总的CPU数量
let cpu_num = unsafe { smp_get_total_cpu() }; // let cpu_num = unsafe { smp_get_total_cpu() };
// 获取当前负载最小的CPU的id // 获取当前负载最小的CPU的id
let mut min_loads_cpu_id = smp_get_processor_id(); // let mut min_loads = get_cpu_loads(smp_get_processor_id());
let mut min_loads = get_cpu_loads(smp_get_processor_id()); // for cpu_id in 0..cpu_num {
for cpu_id in 0..cpu_num { // let cpu_id = ProcessorId::new(cpu_id);
let cpu_id = ProcessorId::new(cpu_id); // let tmp_cpu_loads = get_cpu_loads(cpu_id);
let tmp_cpu_loads = get_cpu_loads(cpu_id); // if min_loads - tmp_cpu_loads > 0 {
if min_loads - tmp_cpu_loads > 0 { // min_loads_cpu_id = cpu_id;
min_loads_cpu_id = cpu_id; // min_loads = tmp_cpu_loads;
min_loads = tmp_cpu_loads; // }
} // }
}
let pcb_cpu = pcb.sched_info().on_cpu(); let pcb_cpu = pcb.sched_info().on_cpu();
// 将当前pcb迁移到负载最小的CPU // 将当前pcb迁移到负载最小的CPU

2
kernel/src/sched/rt.rs
View File

@ -81,6 +81,8 @@ impl RTQueue {
} }
queue.push_front(pcb); queue.push_front(pcb);
} }
#[allow(dead_code)]
pub fn get_rt_queue_size(&mut self) -> usize { pub fn get_rt_queue_size(&mut self) -> usize {
let queue = self.locked_queue.lock_irqsave(); let queue = self.locked_queue.lock_irqsave();
return queue.len(); return queue.len();