add environ functions

Cargo.toml

@@ -19,6 +19,7 @@ members = [
     "crates/driver_net",
     "crates/driver_pci",
     "crates/driver_virtio",
+	"crates/dtb",
     "crates/flatten_objects",
     "crates/handler_table",
     "crates/kernel_guard",

Makefile

@@ -6,6 +6,8 @@
 #     - `MODE`: Build mode: release, debug
 #     - `LOG:` Logging level: warn, error, info, debug, trace
 #     - `V`: Verbose level: (empty), 1, 2
+#	  - `ARGS`: Command-line arguments separated by comma. Only available when feature `alloc` is enabled.
+#	  - `ENVS`: Environment variables, separated by comma between key value pairs. Only available when feature `alloc` is enabled.
 # * App options:
 #     - `A` or `APP`: Path to the application
 #     - `FEATURES`: Features os ArceOS modules to be enabled.
@@ -53,6 +55,10 @@ NET_DEV ?= user
 IP ?= 10.0.2.15
 GW ?= 10.0.2.2
 
+# args and envs
+ARGS ?= 
+ENVS ?= 
+
 # App type
 ifeq ($(wildcard $(APP)),)
   $(error Application path "$(APP)" is not valid)

api/arceos_posix_api/src/lib.rs

@@ -25,6 +25,9 @@ extern crate axruntime;
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
+#[cfg(feature = "alloc")]
+pub use axruntime::{environ, environ_iter, RX_ENVIRON};
+
 #[macro_use]
 mod utils;
 

apps/c/envtest/expect_info.out

@@ -0,0 +1,22 @@
+smp = 1
+build_mode = release
+log_level = info
+
+Primary CPU 0 started.
+Found physcial memory regions:
+ .text (READ | EXECUTE | RESERVED)
+ .rodata (READ | RESERVED)
+ .data .tdata .tbss .percpu (READ | WRITE | RESERVED)
+ boot stack (READ | WRITE | RESERVED)
+ .bss (READ | WRITE | RESERVED)
+ free memory (READ | WRITE | FREE)
+Initialize global memory allocator...
+  use TLSF allocator.
+Initialize kernel page table...
+Initialize platform devices...
+Primary CPU 0 init OK.
+Running argv tests...
+Argv tests run OK!
+Running environ tests...
+Environ tests run OK!
+Shutting down...

apps/c/envtest/features.txt

@@ -0,0 +1,2 @@
+alloc
+paging

apps/c/envtest/main.c

@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+int main(int argc, char** argv) {
+	puts("Running argv tests...");
+	if (argc != 3) puts("args num is wrong");
+	if (strcmp(argv[0], "envtest") || strcmp(argv[1], "test1") || strcmp(argv[2], "test2")) puts("argv is wrong");
+	if(argv[3] != NULL) puts("argv is wrong");
+	puts("Argv tests run OK!");
+
+	puts("Running environ tests...");
+	char *env1 = "env1", *ex1 = "ex1", *ex2 = "ex_2";
+    if(setenv(env1, ex1, 1) || strcmp(ex1, getenv(env1))) puts("set new env is wrong");
+	if(setenv(env1, ex2, 1) || strcmp(ex2, getenv(env1))) puts("set old env is wrong");
+	if(setenv(env1, ex1, 0) || strcmp(ex2, getenv(env1))) puts("override the old env is wrong");
+	if(strcmp("hello", getenv("world")) || strcmp("world", getenv("hello"))) puts("boot env is wrong");
+	puts("Environ tests run OK!");
+    return 0;
+}
+
+

apps/c/envtest/test_cmd

@@ -0,0 +1,2 @@
+test_one "LOG=info ARGS=envtest,test1,test2 ENVS=hello=world,world=hello" "expect_info.out"
+rm -f $APP/*.o

apps/c/memtest/expect_trace.out

@@ -40,4 +40,4 @@ allocated addr=0x[0-9a-f]\{16\}
 allocated addr=0x[0-9a-f]\{16\}
 allocated addr=0x[0-9a-f]\{16\}
 Memory tests run OK!
-Shutting down...
+Shutting down...

apps/c/memtest/memtest.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int main()
+int main(int argc, char* argv[])
 {
     puts("Running memory tests...");
     uintptr_t *brk = (uintptr_t *)malloc(0);

apps/c/redis/README.md

@@ -1,8 +1,19 @@
 
 # How to run?
 - Run:
-  - `make A=apps/c/redis/ LOG=error NET=y BLK=y ARCH=aarch64 SMP=4 run`(for aarch64)
-  - `make A=apps/c/redis/ LOG=error NET=y BLK=y ARCH=x86_64 SMP=4 run`(for x86_64)
+
+  - for aarch64
+
+     ```
+     make A=apps/c/redis/ LOG=error NET=y BLK=y ARCH=aarch64 SMP=4 ARGS="./redis-server,--bind,0.0.0.0,--port,5555,--save,\"\",--appendonly,no,--protected-mode,no,--ignore-warnings,ARM64-COW-BUG" run
+     ```
+
+  - for x86_64
+
+     ```
+     make A=apps/c/redis/ LOG=error NET=y BLK=y ARCH=x86_64 SMP=4 ARGS="./redis-server,--bind,0.0.0.0,--port,5555,--save,\"\",--appendonly,no,--protected-mode,no" run
+     ```
+
 
 # How to test?
 - Use `redis-cli -p 5555` to connect to redis-server, and enjoy ArceOS-Redis world!

apps/c/redis/redis.patch

@@ -68,30 +68,10 @@ index e4f7d90..1b41e94 100644
 
  .PHONY: clean
 diff --git a/src/server.c b/src/server.c
-index b170cbb..f5dfde0 100644
+index b170cbb..a3960ce 100644
 --- a/src/server.c
 +++ b/src/server.c
-@@ -6854,6 +6854,19 @@ redisTestProc *getTestProcByName(const char *name) {
- #endif
-
- int main(int argc, char **argv) {
-+    const char *cmdline = "./redis-server "
-+        "--bind 0.0.0.0 "
-+        "--port 5555 "
-+        "--save \"\" "
-+        "--appendonly no "
-+        "--protected-mode no "
-+#if defined (__arm64__)
-+        "--ignore-warnings ARM64-COW-BUG "
-+#endif
-+        ;
-+    printf("Run Redis with: %s\n", cmdline);
-+    argv = sdssplitargs(cmdline, &argc);
-+
-     struct timeval tv;
-     int j;
-     char config_from_stdin = 0;
-@@ -6900,7 +6913,7 @@ int main(int argc, char **argv) {
+@@ -6900,7 +6900,7 @@ int main(int argc, char **argv) {
 
      /* We need to initialize our libraries, and the server configuration. */
  #ifdef INIT_SETPROCTITLE_REPLACEMENT

crates/dtb/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "dtb"
+version = "0.1.0"
+edition = "2021"
+authors = ["Leping Wang <[email protected]>"]
+description = "Device tree basic operations"
+license = "GPL-3.0-or-later OR Apache-2.0"
+homepage = "https://github.com/rcore-os/arceos"
+repository = "https://github.com/rcore-os/arceos/tree/main/crates/dtb"
+documentation = "https://rcore-os.github.io/arceos/dtb/index.html"
+
+[dependencies]
+fdt-rs = { version = "0.4.3", default-features = false }
+lazy_init = { path = "../../crates/lazy_init" }