Merge pull request #559 from sched-ext/htejun/cargo-workspace

build: Use workspace to group rust sub-projects

README.md

@@ -244,9 +244,7 @@ For example, here, the `scx_simple` binary can be found at
 `$SCX/build/scheds/c/scx_simple`.
 
 For Rust userspace schedulers such as the ones under `scheds/rust`, the
-same directory under the build root is used as the cargo build target
-directory. Thus, here, the `scx_rusty` binary can be found at
-`$SCX/build/scheds/rust/scx_rusty/release/scx_rusty`.
+`scx_rusty` binary can be found at `$SCX/build/scheds/rust/release`.
 
 
 ### SCX specific build options
@@ -264,7 +262,6 @@ options can be used in such cases.
 - 'cargo_home': 'CARGO_HOME env to use when invoking cargo'
 - `offline`: 'Compilation step should not access the internet'
 - `enable_rust`: 'Enable the build of rust sub-projects'
-- `serialize`: 'Enable/disable the sequential build of the schedulers. Set this to false if you need to build just one scheduler.'
 
 For example, let's say you want to use `bpftool` and `libbpf` shipped in the
 kernel tree located at `$KERNEL`. We need to build `bpftool` in the kernel

meson-scripts/install_rust_user_scheds

@@ -4,8 +4,8 @@ set -e
 
 for manifest in "$MESON_SOURCE_ROOT"/scheds/rust/*/Cargo.toml; do
     source_dir="${manifest%/Cargo.toml}"
-    target_dir="${MESON_BUILD_ROOT}${source_dir#${MESON_SOURCE_ROOT}}"
-    name="${target_dir##*/}"
+    target_dir="${MESON_BUILD_ROOT}/scheds/rust"
+    name="${source_dir##*/}"
 
     # Skip scx_mitosis
     if [ "$name" = "scx_mitosis" ]; then

meson.build

@@ -12,8 +12,6 @@ cc = meson.get_compiler('c')
 
 enable_rust = get_option('enable_rust')
 
-serialize = get_option('serialize')
-
 bpf_clang = find_program(get_option('bpf_clang'))
 
 run_veristat = find_program(join_paths(meson.current_source_dir(),
@@ -338,9 +336,6 @@ run_target('veristat_diff', command: [run_veristat_diff, meson.current_build_dir
                                  get_option('veristat_scheduler'), get_option('kernel'),
                                  get_option('veristat_diff_dir')])
 
-if enable_rust
-  subdir('rust')
-endif
 subdir('scheds')
 
 if enable_stress

meson.options

@@ -14,8 +14,6 @@ option('offline', type: 'boolean', value: 'false',
        description: 'Compilation step should not access the internet')
 option('enable_rust', type: 'boolean', value: 'true',
        description: 'Enable rust sub-projects')
-option('serialize', type: 'boolean', value: 'true',
-       description: 'Serialize the build of all schedulers')
 option('enable_stress', type: 'boolean', value: 'true',
        description: 'Enable stress tests')
 option('kernel', type: 'string', value: 'vmlinuz',

rust/Cargo.toml

@@ -0,0 +1,3 @@
+[workspace]
+members = ["scx_utils", "scx_stats", "scx_stats/scx_stats_derive", "scx_rustland_core"]
+resolver = "2"

rust/scx_stats/Cargo.toml

@@ -1,5 +1,3 @@
-workspace = { members = ["scx_stats_derive"] }
-
 [package]
 name = "scx_stats"
 version = "1.0.3"

scheds/rust/.gitignore

@@ -0,0 +1,2 @@
+*/src/bpf/.output
+target

scheds/rust/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = ["scx_lavd", "scx_bpfland", "scx_rustland", "scx_rlfifo",
+           "scx_rusty",
+           "scx_layered"] # scx_mitosis temporarily excluded
+resolver = "2"