diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e69de29 diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..0b395df --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,24 @@ +[workspace] +resolver = "2" + +members = [ + "rust/helloworld", + "rust/memtest", + "rust/exception", + "rust/display", + "rust/fs/shell", + "rust/net/echoserver", + "rust/net/httpclient", + "rust/net/httpserver", + "rust/net/udpserver", + "rust/net/bwbench", + "rust/task/parallel", + "rust/task/sleep", + "rust/task/yield", + "rust/task/priority", + "rust/task/tls", +] + +[workspace.dependencies] +axstd = { git = "https://github.com/arceos-org/arceos.git" } +axnet = { git = "https://github.com/arceos-org/arceos.git" } diff --git a/README.md b/README.md new file mode 100644 index 0000000..85be9d3 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# arceos-apps + +Example apps for [ArceOS](https://github.com/arceos-org/arceos). diff --git a/display/Cargo.toml b/rust/display/Cargo.toml similarity index 100% rename from display/Cargo.toml rename to rust/display/Cargo.toml diff --git a/display/src/display.rs b/rust/display/src/display.rs similarity index 100% rename from display/src/display.rs rename to rust/display/src/display.rs diff --git a/display/src/main.rs b/rust/display/src/main.rs similarity index 100% rename from display/src/main.rs rename to rust/display/src/main.rs diff --git a/exception/Cargo.toml b/rust/exception/Cargo.toml similarity index 100% rename from exception/Cargo.toml rename to rust/exception/Cargo.toml diff --git a/exception/expect_debug_aarch64.out b/rust/exception/expect_debug_aarch64.out similarity index 100% rename from exception/expect_debug_aarch64.out rename to rust/exception/expect_debug_aarch64.out diff --git a/exception/expect_debug_riscv64.out b/rust/exception/expect_debug_riscv64.out similarity index 100% rename from exception/expect_debug_riscv64.out rename to rust/exception/expect_debug_riscv64.out diff --git a/exception/expect_debug_x86_64.out b/rust/exception/expect_debug_x86_64.out similarity index 100% rename from exception/expect_debug_x86_64.out rename to rust/exception/expect_debug_x86_64.out diff --git a/exception/src/main.rs b/rust/exception/src/main.rs similarity index 100% rename from exception/src/main.rs rename to rust/exception/src/main.rs diff --git a/exception/test_cmd b/rust/exception/test_cmd similarity index 100% rename from exception/test_cmd rename to rust/exception/test_cmd diff --git a/fs/shell/Cargo.toml b/rust/fs/shell/Cargo.toml similarity index 100% rename from fs/shell/Cargo.toml rename to rust/fs/shell/Cargo.toml diff --git a/fs/shell/src/cmd.rs b/rust/fs/shell/src/cmd.rs similarity index 100% rename from fs/shell/src/cmd.rs rename to rust/fs/shell/src/cmd.rs diff --git a/fs/shell/src/main.rs b/rust/fs/shell/src/main.rs similarity index 100% rename from fs/shell/src/main.rs rename to rust/fs/shell/src/main.rs diff --git a/fs/shell/src/ramfs.rs b/rust/fs/shell/src/ramfs.rs similarity index 100% rename from fs/shell/src/ramfs.rs rename to rust/fs/shell/src/ramfs.rs diff --git a/helloworld/Cargo.toml b/rust/helloworld/Cargo.toml similarity index 100% rename from helloworld/Cargo.toml rename to rust/helloworld/Cargo.toml diff --git a/helloworld/expect_info.out b/rust/helloworld/expect_info.out similarity index 100% rename from helloworld/expect_info.out rename to rust/helloworld/expect_info.out diff --git a/helloworld/expect_info_smp4.out b/rust/helloworld/expect_info_smp4.out similarity index 100% rename from helloworld/expect_info_smp4.out rename to rust/helloworld/expect_info_smp4.out diff --git a/helloworld/src/main.rs b/rust/helloworld/src/main.rs similarity index 100% rename from helloworld/src/main.rs rename to rust/helloworld/src/main.rs diff --git a/helloworld/test_cmd b/rust/helloworld/test_cmd similarity index 100% rename from helloworld/test_cmd rename to rust/helloworld/test_cmd diff --git a/memtest/Cargo.toml b/rust/memtest/Cargo.toml similarity index 100% rename from memtest/Cargo.toml rename to rust/memtest/Cargo.toml diff --git a/memtest/expect_trace.out b/rust/memtest/expect_trace.out similarity index 100% rename from memtest/expect_trace.out rename to rust/memtest/expect_trace.out diff --git a/memtest/src/main.rs b/rust/memtest/src/main.rs similarity index 100% rename from memtest/src/main.rs rename to rust/memtest/src/main.rs diff --git a/memtest/test_cmd b/rust/memtest/test_cmd similarity index 100% rename from memtest/test_cmd rename to rust/memtest/test_cmd diff --git a/net/bwbench/Cargo.toml b/rust/net/bwbench/Cargo.toml similarity index 86% rename from net/bwbench/Cargo.toml rename to rust/net/bwbench/Cargo.toml index 1ff055a..203c352 100644 --- a/net/bwbench/Cargo.toml +++ b/rust/net/bwbench/Cargo.toml @@ -8,4 +8,4 @@ authors = ["ChengXiang Qi "] [dependencies] axstd = { workspace = true, features = ["net"] } -axnet = { path = "../../../modules/axnet" } +axnet = { workspace = true } diff --git a/net/bwbench/src/main.rs b/rust/net/bwbench/src/main.rs similarity index 100% rename from net/bwbench/src/main.rs rename to rust/net/bwbench/src/main.rs diff --git a/net/echoserver/Cargo.toml b/rust/net/echoserver/Cargo.toml similarity index 100% rename from net/echoserver/Cargo.toml rename to rust/net/echoserver/Cargo.toml diff --git a/net/echoserver/src/main.rs b/rust/net/echoserver/src/main.rs similarity index 100% rename from net/echoserver/src/main.rs rename to rust/net/echoserver/src/main.rs diff --git a/net/httpclient/Cargo.toml b/rust/net/httpclient/Cargo.toml similarity index 100% rename from net/httpclient/Cargo.toml rename to rust/net/httpclient/Cargo.toml diff --git a/net/httpclient/expect_info.out b/rust/net/httpclient/expect_info.out similarity index 100% rename from net/httpclient/expect_info.out rename to rust/net/httpclient/expect_info.out diff --git a/net/httpclient/expect_info_dns.out b/rust/net/httpclient/expect_info_dns.out similarity index 100% rename from net/httpclient/expect_info_dns.out rename to rust/net/httpclient/expect_info_dns.out diff --git a/net/httpclient/src/main.rs b/rust/net/httpclient/src/main.rs similarity index 100% rename from net/httpclient/src/main.rs rename to rust/net/httpclient/src/main.rs diff --git a/net/httpclient/test_cmd b/rust/net/httpclient/test_cmd similarity index 100% rename from net/httpclient/test_cmd rename to rust/net/httpclient/test_cmd diff --git a/net/httpserver/Cargo.toml b/rust/net/httpserver/Cargo.toml similarity index 100% rename from net/httpserver/Cargo.toml rename to rust/net/httpserver/Cargo.toml diff --git a/net/httpserver/src/main.rs b/rust/net/httpserver/src/main.rs similarity index 100% rename from net/httpserver/src/main.rs rename to rust/net/httpserver/src/main.rs diff --git a/net/udpserver/Cargo.toml b/rust/net/udpserver/Cargo.toml similarity index 100% rename from net/udpserver/Cargo.toml rename to rust/net/udpserver/Cargo.toml diff --git a/net/udpserver/src/main.rs b/rust/net/udpserver/src/main.rs similarity index 100% rename from net/udpserver/src/main.rs rename to rust/net/udpserver/src/main.rs diff --git a/task/parallel/Cargo.toml b/rust/task/parallel/Cargo.toml similarity index 100% rename from task/parallel/Cargo.toml rename to rust/task/parallel/Cargo.toml diff --git a/task/parallel/expect_info_smp1_fifo.out b/rust/task/parallel/expect_info_smp1_fifo.out similarity index 100% rename from task/parallel/expect_info_smp1_fifo.out rename to rust/task/parallel/expect_info_smp1_fifo.out diff --git a/task/parallel/expect_info_smp4_cfs.out b/rust/task/parallel/expect_info_smp4_cfs.out similarity index 100% rename from task/parallel/expect_info_smp4_cfs.out rename to rust/task/parallel/expect_info_smp4_cfs.out diff --git a/task/parallel/expect_info_smp4_rr.out b/rust/task/parallel/expect_info_smp4_rr.out similarity index 100% rename from task/parallel/expect_info_smp4_rr.out rename to rust/task/parallel/expect_info_smp4_rr.out diff --git a/task/parallel/src/main.rs b/rust/task/parallel/src/main.rs similarity index 100% rename from task/parallel/src/main.rs rename to rust/task/parallel/src/main.rs diff --git a/task/parallel/test_cmd b/rust/task/parallel/test_cmd similarity index 100% rename from task/parallel/test_cmd rename to rust/task/parallel/test_cmd diff --git a/task/priority/Cargo.toml b/rust/task/priority/Cargo.toml similarity index 100% rename from task/priority/Cargo.toml rename to rust/task/priority/Cargo.toml diff --git a/task/priority/expect_info_smp1_cfs.out b/rust/task/priority/expect_info_smp1_cfs.out similarity index 100% rename from task/priority/expect_info_smp1_cfs.out rename to rust/task/priority/expect_info_smp1_cfs.out diff --git a/task/priority/expect_info_smp1_fifo.out b/rust/task/priority/expect_info_smp1_fifo.out similarity index 100% rename from task/priority/expect_info_smp1_fifo.out rename to rust/task/priority/expect_info_smp1_fifo.out diff --git a/task/priority/expect_info_smp1_rr.out b/rust/task/priority/expect_info_smp1_rr.out similarity index 100% rename from task/priority/expect_info_smp1_rr.out rename to rust/task/priority/expect_info_smp1_rr.out diff --git a/task/priority/expect_info_smp4_cfs.out b/rust/task/priority/expect_info_smp4_cfs.out similarity index 100% rename from task/priority/expect_info_smp4_cfs.out rename to rust/task/priority/expect_info_smp4_cfs.out diff --git a/task/priority/src/main.rs b/rust/task/priority/src/main.rs similarity index 100% rename from task/priority/src/main.rs rename to rust/task/priority/src/main.rs diff --git a/task/priority/test_cmd b/rust/task/priority/test_cmd similarity index 100% rename from task/priority/test_cmd rename to rust/task/priority/test_cmd diff --git a/task/sleep/Cargo.toml b/rust/task/sleep/Cargo.toml similarity index 100% rename from task/sleep/Cargo.toml rename to rust/task/sleep/Cargo.toml diff --git a/task/sleep/expect_info_smp4_fifo.out b/rust/task/sleep/expect_info_smp4_fifo.out similarity index 100% rename from task/sleep/expect_info_smp4_fifo.out rename to rust/task/sleep/expect_info_smp4_fifo.out diff --git a/task/sleep/expect_info_smp4_rr.out b/rust/task/sleep/expect_info_smp4_rr.out similarity index 100% rename from task/sleep/expect_info_smp4_rr.out rename to rust/task/sleep/expect_info_smp4_rr.out diff --git a/task/sleep/src/main.rs b/rust/task/sleep/src/main.rs similarity index 100% rename from task/sleep/src/main.rs rename to rust/task/sleep/src/main.rs diff --git a/task/sleep/test_cmd b/rust/task/sleep/test_cmd similarity index 100% rename from task/sleep/test_cmd rename to rust/task/sleep/test_cmd diff --git a/task/tls/Cargo.toml b/rust/task/tls/Cargo.toml similarity index 100% rename from task/tls/Cargo.toml rename to rust/task/tls/Cargo.toml diff --git a/task/tls/expect_info_smp1_fifo.out b/rust/task/tls/expect_info_smp1_fifo.out similarity index 100% rename from task/tls/expect_info_smp1_fifo.out rename to rust/task/tls/expect_info_smp1_fifo.out diff --git a/task/tls/expect_info_smp4_rr.out b/rust/task/tls/expect_info_smp4_rr.out similarity index 100% rename from task/tls/expect_info_smp4_rr.out rename to rust/task/tls/expect_info_smp4_rr.out diff --git a/task/tls/src/main.rs b/rust/task/tls/src/main.rs similarity index 100% rename from task/tls/src/main.rs rename to rust/task/tls/src/main.rs diff --git a/task/tls/test_cmd b/rust/task/tls/test_cmd similarity index 100% rename from task/tls/test_cmd rename to rust/task/tls/test_cmd diff --git a/task/yield/Cargo.toml b/rust/task/yield/Cargo.toml similarity index 100% rename from task/yield/Cargo.toml rename to rust/task/yield/Cargo.toml diff --git a/task/yield/expect_debug_smp1_fifo.out b/rust/task/yield/expect_debug_smp1_fifo.out similarity index 100% rename from task/yield/expect_debug_smp1_fifo.out rename to rust/task/yield/expect_debug_smp1_fifo.out diff --git a/task/yield/expect_info_smp4_fifo.out b/rust/task/yield/expect_info_smp4_fifo.out similarity index 100% rename from task/yield/expect_info_smp4_fifo.out rename to rust/task/yield/expect_info_smp4_fifo.out diff --git a/task/yield/expect_info_smp4_rr.out b/rust/task/yield/expect_info_smp4_rr.out similarity index 100% rename from task/yield/expect_info_smp4_rr.out rename to rust/task/yield/expect_info_smp4_rr.out diff --git a/task/yield/src/main.rs b/rust/task/yield/src/main.rs similarity index 100% rename from task/yield/src/main.rs rename to rust/task/yield/src/main.rs diff --git a/task/yield/test_cmd b/rust/task/yield/test_cmd similarity index 100% rename from task/yield/test_cmd rename to rust/task/yield/test_cmd