No longer use default features in axtask

README.md

@@ -92,7 +92,7 @@ export PATH=`pwd`/x86_64-linux-musl-cross/bin:`pwd`/aarch64-linux-musl-cross/bin
 
 ```bash
 # in arceos directory
-make A=path/to/app ARCH=<arch> LOG=<log> NET=[y|n] FS=[y|n]
+make A=path/to/app ARCH=<arch> LOG=<log> NET=[y|n] BLK=[y|n]
 ```
 
 Where `<arch>` should be one of `riscv64`, `aarch64`，`x86_64`.
@@ -153,7 +153,6 @@ make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=4 run
 
     ```bash
     # in features.txt
-    default
     alloc
     paging
     net

apps/c/httpclient/features.txt

@@ -1,4 +1,3 @@
-default
 alloc
 paging
 net

apps/c/httpserver/features.txt

@@ -1,4 +1,3 @@
-default
 alloc
 paging
 net

apps/c/iperf/features.txt

@@ -1,4 +1,3 @@
-default
 alloc
 paging
 net

apps/c/memtest/features.txt

@@ -1,3 +1,2 @@
-default
 alloc
 paging

apps/c/pthread/basic/features.txt

@@ -1,4 +1,3 @@
-default
 alloc
 paging
 multitask

apps/c/pthread/parallel/expect_info_smp4_fifo.out

@@ -0,0 +1,60 @@
+smp = 4
+build_mode = release
+log_level = info
+
+CPU 0 started
+Found physcial memory regions:
+ .text (READ | EXECUTE | RESERVED)
+ .rodata (READ | RESERVED)
+ .data (READ | WRITE | RESERVED)
+ .percpu (READ | WRITE | RESERVED)
+ boot stack (READ | WRITE | RESERVED)
+ .bss (READ | WRITE | RESERVED)
+ free memory (READ | WRITE | FREE)
+Initialize global memory allocator...
+Initialize kernel page table...
+Initialize platform devices...
+Initialize scheduling...
+ use FIFO scheduler
+CPU 1 started
+CPU 1 init OK
+CPU 2 started
+CPU 2 init OK
+CPU 3 started
+CPU 3 init OK
+CPU 0 init OK
+part 0: \[0, 125000)
+part 1: \[125000, 250000)
+part 2: \[250000, 375000)
+part 3: \[375000, 500000)
+part 0 finished
+part 4: \[500000, 625000)
+part 1 finished
+part 5: \[625000, 750000)
+part 2 finished
+part 6: \[750000, 875000)
+part 3 finished
+part 7: \[875000, 1000000)
+part 4 finished
+part 8: \[1000000, 1125000)
+part 5 finished
+part 9: \[1125000, 1250000)
+part 6 finished
+part 10: \[1250000, 1375000)
+part 7 finished
+part 11: \[1375000, 1500000)
+part 8 finished
+part 12: \[1500000, 1625000)
+part 9 finished
+part 13: \[1625000, 1750000)
+part 10 finished
+part 14: \[1750000, 1875000)
+part 11 finished
+part 15: \[1875000, 2000000)
+part 12 finished
+part 13 finished
+part 14 finished
+part 15 finished
+actual sum = 61783189038
+(C)Pthread parallel run OK!
+Shutting down...

apps/c/pthread/parallel/features.txt

@@ -1,4 +1,3 @@
 alloc
 paging
 multitask
-sched_rr

apps/c/pthread/parallel/test_cmd

@@ -1,2 +1,3 @@
-test_one "SMP=4 LOG=info" "expect_info_smp4_rr.out"
+test_one "SMP=4 LOG=info" "expect_info_smp4_fifo.out"
+test_one "SMP=4 LOG=info APP_FEATURES=sched_rr" "expect_info_smp4_rr.out"
 rm -f $APP/*.o

apps/c/pthread/pipe/features.txt

@@ -1,4 +1,3 @@
-default
 paging
 alloc
 multitask

apps/c/pthread/sleep/features.txt

@@ -1,4 +1,3 @@
-default
 paging
 alloc
 multitask

apps/c/sqlite3/features.txt

@@ -1,4 +1,3 @@
-default
 fp_simd
 alloc
 paging

apps/c/udpserver/features.txt

@@ -1,4 +1,3 @@
-default
 alloc
 paging
 net

apps/display/Cargo.toml

@@ -7,5 +7,5 @@ authors = ["Shiping Yuan <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libax = { path = "../../ulib/libax", features = ["alloc", "paging", "display"] }
+libax = { path = "../../ulib/libax", features = ["display"] }
 embedded-graphics = "0.8"

apps/net/echoserver/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libax = { path = "../../../ulib/libax", features = ["paging", "multitask", "net"] }
+libax = { path = "../../../ulib/libax", features = ["multitask", "net"] }

apps/net/httpclient/Cargo.toml

@@ -3,10 +3,11 @@ name = "arceos-httpclient"
 version = "0.1.0"
 edition = "2021"
 authors = ["Yuekai Jia <[email protected]>", "Dashuai Wu <[email protected]>"]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libax = { path = "../../../ulib/libax", features = ["paging", "net"] }
+libax = { path = "../../../ulib/libax", features = ["net"] }
 
 [features]
 default = []

apps/net/httpserver/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libax = { path = "../../../ulib/libax", features = ["paging", "multitask", "net"] }
+libax = { path = "../../../ulib/libax", features = ["multitask", "net"] }

apps/net/udpserver/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2021"
 authors = ["Dashuai Wu <[email protected]>"]
 
 [dependencies]
-libax = { path = "../../../ulib/libax", features = ["paging", "net"] }
+libax = { path = "../../../ulib/libax", features = ["net"] }

apps/task/parallel/Cargo.toml

@@ -7,9 +7,8 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["libax/default"]
 sched_rr = ["libax/sched_rr"]
 sched_cfs = ["libax/sched_cfs"]
 
 [dependencies]
-libax = { path = "../../../ulib/libax", default-features = false, features = ["alloc", "paging", "multitask", "irq"] }
+libax = { path = "../../../ulib/libax", features = ["alloc", "paging", "multitask", "irq"] }

apps/task/priority/Cargo.toml

@@ -7,9 +7,8 @@ authors = ["Haoxing Ye <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["libax/default"]
 sched_rr = ["libax/sched_rr"]
 sched_cfs = ["libax/sched_cfs"]
 
 [dependencies]
-libax = { path = "../../../ulib/libax", default-features = false, features = ["alloc", "paging", "multitask"] }
+libax = { path = "../../../ulib/libax", features = ["alloc", "paging", "multitask"] }

apps/task/sleep/Cargo.toml

@@ -7,8 +7,7 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-preempt = ["libax/sched_rr"]
-default = ["libax/default"]
+sched_rr = ["libax/sched_rr"]
 
 [dependencies]
-libax = { path = "../../../ulib/libax", default-features = false, features = ["paging", "multitask", "irq"] }
+libax = { path = "../../../ulib/libax", features = ["paging", "multitask", "irq"] }

apps/task/sleep/test_cmd

@@ -1,2 +1,2 @@
 test_one "SMP=4 LOG=info" "expect_info_smp4_fifo.out"
-test_one "SMP=4 LOG=info APP_FEATURES=preempt" "expect_info_smp4_rr.out"
+test_one "SMP=4 LOG=info APP_FEATURES=sched_rr" "expect_info_smp4_rr.out"

apps/task/yield/Cargo.toml

@@ -7,9 +7,8 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["libax/default"]
 sched_rr = ["libax/sched_rr"]
 sched_cfs = ["libax/sched_cfs"]
 
 [dependencies]
-libax = { path = "../../../ulib/libax", default-features = false, features = ["paging", "multitask"] }
+libax = { path = "../../../ulib/libax", features = ["paging", "multitask"] }

doc/README.md

@@ -34,7 +34,7 @@
 * [driver_net](../crates/driver_net): Common traits and types for network device (NIC) drivers.
 * [driver_pci](../crates/driver_pci): Structures and functions for PCI bus operations.
 * [driver_virtio](../crates/driver_virtio): Wrappers of some devices in the `virtio-drivers` crate, that implement traits in the `driver_common` series crates.
-* [flatten_objects](../../crates/flatten_objects): A container that stores numbered objects. Each object can be assigned with a unique ID.
+* [flatten_objects](../crates/flatten_objects): A container that stores numbered objects. Each object can be assigned with a unique ID.
 * [handler_table](../crates/handler_table): A lock-free table of event handlers. [![Crates.io](https://img.shields.io/crates/v/handler_table)](https://crates.io/crates/handler_table)
 * [kernel_guard](../crates/kernel_guard): RAII wrappers to create a critical section with local IRQs or preemption disabled. [![Crates.io](https://img.shields.io/crates/v/kernel_guard)](https://crates.io/crates/kernel_guard)
 * [lazy_init](../crates/lazy_init): A wrapper for lazy initialized values without concurrency safety but more efficient.

modules/axconfig/Cargo.toml

@@ -16,9 +16,6 @@ platform-qemu-virt-aarch64 = []
 platform-raspi4-aarch64 = []
 default = []
 
-[dependencies]
-cfg-if = "1.0"
-
 [build-dependencies]
 toml_edit = "0.19"
 serde = "1.0"

modules/axconfig/build.rs

@@ -2,20 +2,67 @@ use std::io::{Result, Write};
 use std::{convert::AsRef, fs, path::Path};
 use toml_edit::{Decor, Document, Item, Table, Value};
 
+const SUPPORTED_PLATFORMS: &[(&str, &str)] = &[
+    ("pc-x86", "x86_64"),
+    ("qemu-virt-riscv", "riscv"),
+    ("qemu-virt-aarch64", "aarch64"),
+    ("raspi4-aarch64", "aarch64"),
+    ("dummy", ""),
+];
+
 fn main() {
-    // generate config_*.rs for all platforms
-    for fname in fs::read_dir("src/platform").unwrap() {
-        let fname = fname.unwrap().path();
-        if fname.extension().unwrap() == "toml" {
-            let platform = fname.file_stem().unwrap().to_str().unwrap();
-            gen_config_rs(platform).unwrap();
-            println!("cargo:rerun-if-changed={}", fname.display());
-        }
-    }
+    let platform = resolve_platform().replace('-', "_");
+
+    let out_dir = std::env::var_os("OUT_DIR").unwrap();
+    let out_path = Path::new(&out_dir).join(format!("config_{platform}.rs"));
+    gen_config_rs(&platform, &out_path).unwrap();
+
+    println!("cargo:rustc-cfg={platform}");
+    println!("cargo:rerun-if-changed=src/platform/{platform}.toml");
     println!("cargo:rerun-if-changed=src/defconfig.toml");
     println!("cargo:rerun-if-env-changed=SMP");
 }
 
+fn resolve_platform() -> String {
+    fn has_feature(feature: &str) -> bool {
+        std::env::var(format!(
+            "CARGO_FEATURE_{}",
+            feature.to_uppercase().replace('-', "_")
+        ))
+        .is_ok()
+    }
+
+    let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+    let platform = std::env::var("AX_PLATFORM").unwrap_or("dummy".to_string());
+
+    // If the `PLATFORM` environment variable is set, use it as the target platform.
+    if platform != "dummy" && SUPPORTED_PLATFORMS.iter().any(|(p, _)| *p == platform) {
+        return platform;
+    }
+
+    let mut candidates = vec![];
+    for (plat, arch) in SUPPORTED_PLATFORMS {
+        if has_feature(&format!("platform-{plat}")) {
+            candidates.push((*plat, *arch));
+        }
+    }
+
+    // If only one platform feature is specified, use it as the target platform.
+    if candidates.len() == 1 {
+        return candidates[0].0.into();
+    }
+
+    // Otherwise, the platform feature should be matched with the target arch.
+    for (plat, arch) in candidates {
+        if target_arch.starts_with(arch) {
+            return plat.into();
+        }
+    }
+
+    // If none of the above conditions is met, use the dummy platform.
+    "dummy".into()
+}
+
 fn add_config(config: &mut Table, key: &str, item: Item, comments: Option<&str>) {
     config.insert(key, item);
     if let Some(comm) = comments {
@@ -56,7 +103,7 @@ fn is_num(s: &str) -> bool {
     }
 }
 
-fn gen_config_rs(platform: &str) -> Result<()> {
+fn gen_config_rs(platform: &str, out_path: &Path) -> Result<()> {
     // Load TOML config file
     let mut config = Table::new();
     parse_config_toml(&mut config, "src/defconfig.toml").unwrap();
@@ -75,9 +122,9 @@ fn gen_config_rs(platform: &str) -> Result<()> {
     let mut output = Vec::new();
     writeln!(
         output,
-        "//! Platform constants and parameters for {platform}."
+        "// Platform constants and parameters for {platform}."
     )?;
-    writeln!(output, "//! Generated by build.rs, DO NOT edit!\n")?;
+    writeln!(output, "// Generated by build.rs, DO NOT edit!\n")?;
 
     for (key, item) in config.iter() {
         let var_name = key.to_uppercase().replace('-', "_");
@@ -122,7 +169,7 @@ fn gen_config_rs(platform: &str) -> Result<()> {
         }
     }
 
-    let out_path = format!("src/config_{}.rs", platform.replace('-', "_"));
+    println!("Generating config file: {}", out_path.display());
     fs::write(out_path, output)?;
 
     Ok(())