From cd555741d0a0309909b31418aceed69f7346dd87 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 5 Sep 2024 17:10:02 -1000 Subject: [PATCH 1/2] rust: Synchronize depency versions --- rust/scx_loader/Cargo.toml | 4 ++-- scheds/rust/scx_mitosis/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/scx_loader/Cargo.toml b/rust/scx_loader/Cargo.toml index c4faaed3b..6cd1869bb 100644 --- a/rust/scx_loader/Cargo.toml +++ b/rust/scx_loader/Cargo.toml @@ -7,11 +7,11 @@ description = "DBUS on-demand loader of sched-ext schedulers" license = "GPL-2.0-only" [dependencies] -anyhow = "1.0" +anyhow = "1.0.65" clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] } colored = "2" ctrlc = { version = "3.1", features = ["termination"] } -log = "0.4" +log = "0.4.17" nix = { features = ["process", "signal"], default-features = false, version = "0.29" } serde = { version = "1.0", features = ["derive"] } tokio = { version = "1.39", features = ["macros", "sync", "rt-multi-thread", "process"] } diff --git a/scheds/rust/scx_mitosis/Cargo.toml b/scheds/rust/scx_mitosis/Cargo.toml index 00f5eaecc..3ff4527a4 100644 --- a/scheds/rust/scx_mitosis/Cargo.toml +++ b/scheds/rust/scx_mitosis/Cargo.toml @@ -13,7 +13,7 @@ cgroupfs = "0.7" clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] } ctrlc = { version = "3.1", features = ["termination"] } fb_procfs = "0.7" -itertools = "0.12.1" +itertools = "0.13.0" lazy_static = "1.4" libbpf-rs = "0.24.1" libc = "0.2.137" From 46fc2e1a49c096e5cb8a5635e8cad67e0e967f51 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 5 Sep 2024 18:11:50 -1000 Subject: [PATCH 2/2] version: v1.0.4 --- meson.build | 2 +- rust/scx_loader/Cargo.toml | 2 +- rust/scx_rustland_core/Cargo.toml | 4 ++-- rust/scx_stats/Cargo.toml | 2 +- rust/scx_stats/scx_stats_derive/Cargo.toml | 4 ++-- rust/scx_utils/Cargo.toml | 4 ++-- scheds/rust/Cargo.lock | 18 +++++++++--------- scheds/rust/scx_bpfland/Cargo.toml | 10 +++++----- scheds/rust/scx_lavd/Cargo.toml | 10 +++++----- scheds/rust/scx_layered/Cargo.toml | 10 +++++----- scheds/rust/scx_mitosis/Cargo.toml | 4 ++-- scheds/rust/scx_rlfifo/Cargo.toml | 6 +++--- scheds/rust/scx_rustland/Cargo.toml | 10 +++++----- scheds/rust/scx_rusty/Cargo.toml | 10 +++++----- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/meson.build b/meson.build index ee30d4f33..7a8f42b9e 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('sched_ext schedulers', 'c', - version: '1.0.3', + version: '1.0.4', license: 'GPL-2.0',) if meson.version().version_compare('<1.2') diff --git a/rust/scx_loader/Cargo.toml b/rust/scx_loader/Cargo.toml index 6cd1869bb..c675052c6 100644 --- a/rust/scx_loader/Cargo.toml +++ b/rust/scx_loader/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_loader" -version = "0.1.0" +version = "1.0.4" authors = ["Vladislav Nepogodin "] edition = "2021" description = "DBUS on-demand loader of sched-ext schedulers" diff --git a/rust/scx_rustland_core/Cargo.toml b/rust/scx_rustland_core/Cargo.toml index a59af8001..561588c0e 100644 --- a/rust/scx_rustland_core/Cargo.toml +++ b/rust/scx_rustland_core/Cargo.toml @@ -12,12 +12,12 @@ anyhow = "1.0.65" plain = "0.2.3" libbpf-rs = "0.24.1" libc = "0.2.137" -scx_utils = { path = "../scx_utils", version = "1.0.3" } +scx_utils = { path = "../scx_utils", version = "1.0.4" } [build-dependencies] tar = "0.4" walkdir = "2.4" -scx_utils = { path = "../scx_utils", version = "1.0.3" } +scx_utils = { path = "../scx_utils", version = "1.0.4" } [lib] name = "scx_rustland_core" diff --git a/rust/scx_stats/Cargo.toml b/rust/scx_stats/Cargo.toml index 102c82e03..8f0cd9574 100644 --- a/rust/scx_stats/Cargo.toml +++ b/rust/scx_stats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_stats" -version = "1.0.3" +version = "1.0.4" edition = "2021" authors = ["Tejun Heo "] license = "GPL-2.0-only" diff --git a/rust/scx_stats/scx_stats_derive/Cargo.toml b/rust/scx_stats/scx_stats_derive/Cargo.toml index d131e8482..27f46a7b1 100644 --- a/rust/scx_stats/scx_stats_derive/Cargo.toml +++ b/rust/scx_stats/scx_stats_derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_stats_derive" -version = "1.0.3" +version = "1.0.4" edition = "2021" authors = ["Tejun Heo "] license = "GPL-2.0-only" @@ -13,6 +13,6 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" quote = "1.0" -scx_stats = { path = "..", version = "1.0.3" } +scx_stats = { path = "..", version = "1.0.4" } serde_json = "1.0" syn = { version = "2.0", features = ["extra-traits", "full"] } diff --git a/rust/scx_utils/Cargo.toml b/rust/scx_utils/Cargo.toml index fc67b0078..87d38eb9f 100644 --- a/rust/scx_utils/Cargo.toml +++ b/rust/scx_utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_utils" -version = "1.0.3" +version = "1.0.4" edition = "2021" authors = ["Tejun Heo "] license = "GPL-2.0-only" @@ -22,7 +22,7 @@ log = "0.4.17" nvml-wrapper = "0.10.0" paste = "1.0" regex = "1.10" -scx_stats = { path = "../scx_stats", version = "1.0.3" } +scx_stats = { path = "../scx_stats", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } sscanf = "0.4" tar = "0.4" diff --git a/scheds/rust/Cargo.lock b/scheds/rust/Cargo.lock index 955758d05..754eb677d 100644 --- a/scheds/rust/Cargo.lock +++ b/scheds/rust/Cargo.lock @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "scx_bpfland" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "clap", @@ -1153,7 +1153,7 @@ dependencies = [ [[package]] name = "scx_lavd" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "bitvec", @@ -1180,7 +1180,7 @@ dependencies = [ [[package]] name = "scx_layered" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "bitvec", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "scx_rlfifo" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "ctrlc", @@ -1216,7 +1216,7 @@ dependencies = [ [[package]] name = "scx_rustland" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "clap", @@ -1250,7 +1250,7 @@ dependencies = [ [[package]] name = "scx_rusty" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "chrono", @@ -1273,7 +1273,7 @@ dependencies = [ [[package]] name = "scx_stats" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "crossbeam", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "scx_stats_derive" -version = "1.0.3" +version = "1.0.4" dependencies = [ "proc-macro2", "quote", @@ -1298,7 +1298,7 @@ dependencies = [ [[package]] name = "scx_utils" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "bindgen", diff --git a/scheds/rust/scx_bpfland/Cargo.toml b/scheds/rust/scx_bpfland/Cargo.toml index 12b413ff9..5d3da131f 100644 --- a/scheds/rust/scx_bpfland/Cargo.toml +++ b/scheds/rust/scx_bpfland/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_bpfland" -version = "1.0.3" +version = "1.0.4" authors = ["Andrea Righi "] edition = "2021" description = "A vruntime-based sched_ext scheduler that prioritizes interactive workloads. https://github.com/sched-ext/scx/tree/main" @@ -13,15 +13,15 @@ clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] } crossbeam = "0.8.4" libbpf-rs = "0.24.1" log = "0.4.17" -scx_stats = { path = "../../../rust/scx_stats", version = "1.0.3" } -scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.3" } -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_stats = { path = "../../../rust/scx_stats", version = "1.0.4" } +scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.4" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } simplelog = "0.12" rlimit = "0.10.1" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } [features] enable_backtrace = [] diff --git a/scheds/rust/scx_lavd/Cargo.toml b/scheds/rust/scx_lavd/Cargo.toml index 98b67d5be..7fd27c897 100644 --- a/scheds/rust/scx_lavd/Cargo.toml +++ b/scheds/rust/scx_lavd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_lavd" -version = "1.0.3" +version = "1.0.4" authors = ["Changwoo Min ", "Igalia"] edition = "2021" description = "A Latency-criticality Aware Virtual Deadline (LAVD) scheduler based on sched_ext, which is a Linux kernel feature which enables implementing kernel thread schedulers in BPF and dynamically loading them. https://github.com/sched-ext/scx/tree/main" @@ -19,9 +19,9 @@ libbpf-rs = "0.24.1" libc = "0.2.137" log = "0.4.17" ordered-float = "3.4.0" -scx_stats = { path = "../../../rust/scx_stats", version = "1.0.3" } -scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.3" } -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_stats = { path = "../../../rust/scx_stats", version = "1.0.4" } +scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.4" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } simplelog = "0.12" static_assertions = "1.1.0" @@ -30,7 +30,7 @@ plain = "0.2.3" gpoint = "0.2" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } [features] enable_backtrace = [] diff --git a/scheds/rust/scx_layered/Cargo.toml b/scheds/rust/scx_layered/Cargo.toml index be6b490e2..d8129a4f9 100644 --- a/scheds/rust/scx_layered/Cargo.toml +++ b/scheds/rust/scx_layered/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_layered" -version = "1.0.3" +version = "1.0.4" authors = ["Tejun Heo ", "Meta"] edition = "2021" description = "A highly configurable multi-layer BPF / user space hybrid scheduler used within sched_ext, which is a Linux kernel feature which enables implementing kernel thread schedulers in BPF and dynamically loading them. https://github.com/sched-ext/scx/tree/main" @@ -18,15 +18,15 @@ lazy_static = "1.4" libbpf-rs = "0.24.1" libc = "0.2.137" log = "0.4.17" -scx_stats = { path = "../../../rust/scx_stats", version = "1.0.3" } -scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.3" } -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_stats = { path = "../../../rust/scx_stats", version = "1.0.4" } +scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.4" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" simplelog = "0.12" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } [features] enable_backtrace = [] diff --git a/scheds/rust/scx_mitosis/Cargo.toml b/scheds/rust/scx_mitosis/Cargo.toml index 3ff4527a4..c9a163670 100644 --- a/scheds/rust/scx_mitosis/Cargo.toml +++ b/scheds/rust/scx_mitosis/Cargo.toml @@ -20,13 +20,13 @@ libc = "0.2.137" log = "0.4.17" maplit = "1.0.2" prometheus-client = "0.19" -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" simplelog = "0.12" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } [features] enable_backtrace = [] diff --git a/scheds/rust/scx_rlfifo/Cargo.toml b/scheds/rust/scx_rlfifo/Cargo.toml index ac9cd7bd0..892b50a87 100644 --- a/scheds/rust/scx_rlfifo/Cargo.toml +++ b/scheds/rust/scx_rlfifo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_rlfifo" -version = "1.0.3" +version = "1.0.4" authors = ["Andrea Righi "] edition = "2021" description = "A simple FIFO scheduler in Rust that runs in user-space" @@ -12,11 +12,11 @@ plain = "0.2.3" ctrlc = { version = "3.1", features = ["termination"] } libbpf-rs = "0.24.1" libc = "0.2.137" -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } scx_rustland_core = { path = "../../../rust/scx_rustland_core", version = "2.0.1" } [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } scx_rustland_core = { path = "../../../rust/scx_rustland_core", version = "2.0.1" } [features] diff --git a/scheds/rust/scx_rustland/Cargo.toml b/scheds/rust/scx_rustland/Cargo.toml index 6c65b6bca..c4c2ab13d 100644 --- a/scheds/rust/scx_rustland/Cargo.toml +++ b/scheds/rust/scx_rustland/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_rustland" -version = "1.0.3" +version = "1.0.4" authors = ["Andrea Righi "] edition = "2021" description = "A BPF component (dispatcher) that implements the low level sched-ext functionalities and a user-space counterpart (scheduler), written in Rust, that implements the actual scheduling policy. This is used within sched_ext, which is a Linux kernel feature which enables implementing kernel thread schedulers in BPF and dynamically loading them. https://github.com/sched-ext/scx/tree/main" @@ -17,14 +17,14 @@ libc = "0.2.137" log = "0.4.17" ordered-float = "3.4.0" serde = { version = "1.0", features = ["derive"] } -scx_stats = { path = "../../../rust/scx_stats", version = "1.0.3" } -scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.3" } -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_stats = { path = "../../../rust/scx_stats", version = "1.0.4" } +scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.4" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } scx_rustland_core = { path = "../../../rust/scx_rustland_core", version = "2.0.1" } simplelog = "0.12" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } scx_rustland_core = { path = "../../../rust/scx_rustland_core", version = "2.0.1" } [features] diff --git a/scheds/rust/scx_rusty/Cargo.toml b/scheds/rust/scx_rusty/Cargo.toml index 60a053be4..7c7e92ba1 100644 --- a/scheds/rust/scx_rusty/Cargo.toml +++ b/scheds/rust/scx_rusty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scx_rusty" -version = "1.0.3" +version = "1.0.4" authors = ["Dan Schatzberg ", "Meta"] edition = "2021" description = "A multi-domain, BPF / user space hybrid scheduler used within sched_ext, which is a Linux kernel feature which enables implementing kernel thread schedulers in BPF and dynamically loading them. https://github.com/sched-ext/scx/tree/main" @@ -17,16 +17,16 @@ libbpf-rs = "0.24.1" libc = "0.2.137" log = "0.4.17" ordered-float = "3.4.0" -scx_stats = { path = "../../../rust/scx_stats", version = "1.0.3" } -scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.3" } -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_stats = { path = "../../../rust/scx_stats", version = "1.0.4" } +scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.4" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } serde = { version = "1.0", features = ["derive"] } simplelog = "0.12" sorted-vec = "0.8.3" static_assertions = "1.1.0" [build-dependencies] -scx_utils = { path = "../../../rust/scx_utils", version = "1.0.3" } +scx_utils = { path = "../../../rust/scx_utils", version = "1.0.4" } [features] enable_backtrace = []