Merge pull request #16 from syswonder/dev

Merge Dev to Main

.github/workflows/build.yml

@@ -53,8 +53,10 @@ jobs:
       run: make ARCH=${{ matrix.arch }} A=apps/memtest
     - name: Build exception
       run: make ARCH=${{ matrix.arch }} A=apps/exception
-    - name: Build display
-      run: make ARCH=${{ matrix.arch }} A=apps/display
+    - name: Build display/basic_painting
+      run: make ARCH=${{ matrix.arch }} A=apps/display/basic_painting
+    - name: Build display/draw_map
+      run: make ARCH=${{ matrix.arch }} A=apps/display/draw_map
     - name: Build task/yield
       run: make ARCH=${{ matrix.arch }} A=apps/task/yield
     - name: Build task/parallel

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",
@@ -55,7 +56,8 @@ members = [
     "ulib/axstd",
     "ulib/axlibc",
 
-    "apps/display",
+    "apps/display/basic_painting",
+    "apps/display/draw_map",
     "apps/exception",
     "apps/helloworld",
     "apps/memtest",

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)

README.md

@@ -180,4 +180,4 @@ make PLATFORM=x86_64-pc-oslab A=apps/c/redis FEATURES=driver-ixgbe,driver-ramdis
 
 ## Design
 
-![](doc/figures/ArceOS.svg)
+![](doc/figures/rukos.svg)

api/arceos_posix_api/Cargo.toml

@@ -26,6 +26,7 @@ net = ["dep:axnet", "axfeat/net", "fd"]
 pipe = ["fd"]
 select = ["fd"]
 epoll = ["fd"]
+poll = ["fd"]
 
 [dependencies]
 # ArceOS modules
@@ -43,6 +44,7 @@ axnet = { path = "../../modules/axnet", optional = true }
 # Other crates
 axio = { path = "../../crates/axio" }
 axerrno = { path = "../../crates/axerrno" }
+memory_addr = { path = "../../crates/memory_addr" }
 static_assertions = "1.1.0"
 spin = { version = "0.9" }
 lazy_static = { version = "1.4", features = ["spin_no_std"] }

api/arceos_posix_api/build.rs

@@ -10,6 +10,33 @@
 fn main() {
     use std::io::Write;
 
+    fn gen_pthread_cond(out_file: &str) -> std::io::Result<()> {
+        let (cond_size, _cond_init) = if cfg!(feature = "multitask") {
+            if cfg!(feature = "smp") {
+                (5, "{0, 0, 0, 0, 0}") // core::mem::transmute::<_, [usize; 6]>(axsync::Mutex::new(()))
+            } else {
+                (4, "{0, 0, 0, 0}") // core::mem::transmute::<_, [usize; 5]>(axsync::Mutex::new(()))
+            }
+        } else {
+            (1, "{0}")
+        };
+        let mut output = Vec::new();
+        writeln!(
+            output,
+            "// Generated by arceos_posix_api/build.rs, DO NOT edit!"
+        )?;
+        writeln!(
+            output,
+            r#"
+typedef struct {{
+    long __l[{cond_size}];
+}} pthread_cond_t;
+"#
+        )?;
+        std::fs::write(out_file, output)?;
+        Ok(())
+    }
+
     fn gen_pthread_mutex(out_file: &str) -> std::io::Result<()> {
         // TODO: generate size and initial content automatically.
         let (mutex_size, mutex_init) = if cfg!(feature = "multitask") {
@@ -57,11 +84,17 @@ typedef struct {{
             "pthread_attr_t",
             "pthread_mutex_t",
             "pthread_mutexattr_t",
+            "pollfd",
+            "nfds_t",
             "epoll_event",
             "iovec",
             "clockid_t",
             "rlimit",
             "aibuf",
+            "msghdr",
+            "pthread_cond_t",
+            "pthread_condattr_t",
+            "sysinfo",
         ];
         let allow_vars = [
             "O_.*",
@@ -111,5 +144,6 @@ typedef struct {{
     }
 
     gen_pthread_mutex("../../ulib/axlibc/include/ax_pthread_mutex.h").unwrap();
+    gen_pthread_cond("../../ulib/axlibc/include/ax_pthread_cond.h").unwrap();
     gen_c_to_rust_bindings("ctypes.h", "src/ctypes_gen.rs");
 }

api/arceos_posix_api/ctypes.h

@@ -12,11 +12,13 @@
 #include <netinet/in.h>
 #include <pthread.h>
 #include <stddef.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <sys/resource.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/sysinfo.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/uio.h>