JakeHillion/scx-upstream
1
0
Fork 0
mirror of https://github.com/sched-ext/scx.git synced 2024-11-25 12:10:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #530 from sched-ext/htejun/misc

Browse Source 
scx_utils::topology: Use lazy_static instead of LazyLock
This commit is contained in:
Tejun Heo 2024-08-21 06:04:14 -10:00 committed by GitHub
commit 6a2faf2e17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/scx_utils/src/lib.rs
View File

@ -65,8 +65,8 @@ pub use topology::Cpu;
pub use topology::Node;
pub use topology::Topology;
pub use topology::TopologyMap;
pub use topology::NR_CPU_IDS;
pub use topology::NR_CPUS_POSSIBLE;
pub use topology::NR_CPU_IDS;
mod cpumask;
pub use cpumask::Cpumask;

40
rust/scx_utils/src/topology.rs
View File

@ -76,24 +76,24 @@ use sscanf::sscanf;
use std::collections::BTreeMap;
use std::path::Path;
use std::slice::Iter;
use std::sync::LazyLock;
/// The maximum possible number of CPU IDs in the system. As mentioned above,
/// this is different than the number of possible CPUs on the system (though
/// very seldom is). This number may differ from the number of possible CPUs on
/// the system when e.g. there are fully disabled CPUs in the middle of the
/// range of possible CPUs (i.e. CPUs that may not be onlined).
pub static NR_CPU_IDS: LazyLock<usize> = LazyLock::new(|| {
read_cpu_ids().unwrap().last().unwrap() + 1
});
lazy_static::lazy_static! {
/// The maximum possible number of CPU IDs in the system. As mentioned
/// above, this is different than the number of possible CPUs on the
/// system (though very seldom is). This number may differ from the
/// number of possible CPUs on the system when e.g. there are fully
/// disabled CPUs in the middle of the range of possible CPUs (i.e. CPUs
/// that may not be onlined).
pub static ref NR_CPU_IDS: usize = read_cpu_ids().unwrap().last().unwrap() + 1;
/// The number of possible CPUs that may be active on the system. Note that this
/// value is separate from the number of possible _CPU IDs_ in the system, as
/// there may be gaps in what CPUs are allowed to be onlined. For example, some
/// BIOS implementations may report spans of disabled CPUs that may not be
/// onlined, whose IDs are lower than the IDs of other CPUs that may be onlined.
pub static NR_CPUS_POSSIBLE: LazyLock<usize> =
LazyLock::new(|| libbpf_rs::num_possible_cpus().unwrap());
/// The number of possible CPUs that may be active on the system. Note
/// that this value is separate from the number of possible _CPU IDs_ in
/// the system, as there may be gaps in what CPUs are allowed to be
/// onlined. For example, some BIOS implementations may report spans of
/// disabled CPUs that may not be onlined, whose IDs are lower than the
/// IDs of other CPUs that may be onlined.
pub static ref NR_CPUS_POSSIBLE: usize = libbpf_rs::num_possible_cpus().unwrap();
}
#[derive(Debug, Clone)]
pub struct Cpu {
@ -430,10 +430,8 @@ fn create_insert_cpu(cpu_id: usize, node: &mut Node, online_mask: &Cpumask) -> R
// if there's no cache information then we have no option but to assume a single unified cache
// per node.
let cache_path = cpu_path.join("cache");
let l2_id =
read_file_usize(&cache_path.join(format!("index{}", 2)).join("id")).unwrap_or(0);
let l3_id =
read_file_usize(&cache_path.join(format!("index{}", 3)).join("id")).unwrap_or(0);
let l2_id = read_file_usize(&cache_path.join(format!("index{}", 2)).join("id")).unwrap_or(0);
let l3_id = read_file_usize(&cache_path.join(format!("index{}", 3)).join("id")).unwrap_or(0);
// Assume that LLC is always 3.
let llc_id = l3_id;
@ -513,7 +511,7 @@ fn create_default_node(online_mask: &Cpumask) -> Result<Vec<Node>> {
let cpu_ids = read_cpu_ids()?;
for cpu_id in cpu_ids.iter() {
create_insert_cpu(*cpu_id, &mut node, &online_mask)?;
create_insert_cpu(*cpu_id, &mut node, &online_mask)?;
}
nodes.push(node);