fix: fixed some warning and error in compiling

syswonder · Sep 13, 2023 · 6c8361b · 6c8361b
1 parent 3def120
commit 6c8361b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/api/arceos_posix_api/src/imp/fd_ops.rs b/api/arceos_posix_api/src/imp/fd_ops.rs
@@ -18,6 +18,7 @@ use spin::RwLock;
 use super::stdio::{stdin, stdout};
 use crate::ctypes;
 
+/// Maximum number of files per process
 pub const AX_FILE_LIMIT: usize = 1024;
 
 pub trait FileLike: Send + Sync {

diff --git a/api/arceos_posix_api/src/lib.rs b/api/arceos_posix_api/src/lib.rs
@@ -48,7 +48,7 @@ pub use imp::task::{sys_exit, sys_getpid, sys_sched_yield};
 pub use imp::time::{sys_clock_gettime, sys_nanosleep};
 
 #[cfg(feature = "fd")]
-pub use imp::fd_ops::{sys_close, sys_dup, sys_dup2, sys_fcntl};
+pub use imp::fd_ops::{sys_close, sys_dup, sys_dup2, sys_fcntl, AX_FILE_LIMIT};
 #[cfg(feature = "fs")]
 pub use imp::fs::{sys_fstat, sys_getcwd, sys_lseek, sys_lstat, sys_open, sys_rename, sys_stat};
 #[cfg(feature = "select")]

diff --git a/modules/axruntime/src/lib.rs b/modules/axruntime/src/lib.rs
@@ -278,7 +278,7 @@ fn init_interrupt() {
     fn update_timer() {
         // Safety: we have disabled preemption in IRQ handler.
         let mut deadline = unsafe { NEXT_DEADLINE.read_current_raw() };
-        deadline = deadline + PERIODIC_INTERVAL_NANOS;
+        deadline += PERIODIC_INTERVAL_NANOS;
         unsafe { NEXT_DEADLINE.write_current_raw(deadline) };
         axhal::time::set_oneshot_timer(deadline);
     }

diff --git a/modules/axtask/src/lib.rs b/modules/axtask/src/lib.rs
@@ -48,6 +48,7 @@ cfg_if::cfg_if! {
         mod task;
         mod api;
         mod wait_queue;
+        /// load average
         pub mod loadavg;
 
         #[cfg(feature = "irq")]

diff --git a/modules/axtask/src/loadavg.rs b/modules/axtask/src/loadavg.rs
@@ -32,6 +32,7 @@ static mut LAST_UPDATE: AtomicU64 = AtomicU64::new(0);
 // TODO: if irq is disabled, what value should AVENRUN be?
 static mut AVENRUN: [u64; 3] = [0, 0, 0];
 
+/// Get the load average
 pub fn get_avenrun(loads: &mut [u64; 3]) {
     for i in 0..3 {
         unsafe {
@@ -50,7 +51,7 @@ fn calc_load(load: u64, exp: u64, active: u64) -> u64 {
     if active >= load {
         newload += FIXED_1 - 1;
     }
-    return newload / FIXED_1;
+    newload / FIXED_1
 }
 
 #[cfg(feature = "irq")]

diff --git a/ulib/axlibc/src/sys.rs b/ulib/axlibc/src/sys.rs
@@ -27,7 +27,7 @@ pub unsafe extern "C" fn sysconf(name: c_int) -> c_long {
         ctypes::_SC_AVPHYS_PAGES => axalloc::global_allocator().available_pages(),
         // Maximum number of files per process
         #[cfg(feature = "fd")]
-        ctypes::_SC_OPEN_MAX => super::fd_ops::AX_FILE_LIMIT,
+        ctypes::_SC_OPEN_MAX => arceos_posix_api::AX_FILE_LIMIT.try_into().unwrap(),
         _ => 0,
     }
 }