fix: fixed some warning and error in compiling

syswonder · Sep 13, 2023 · c9b9c8a · c9b9c8a
1 parent bccb528
commit c9b9c8a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 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/loadavg.rs b/modules/axtask/src/loadavg.rs
@@ -51,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/c/time.c b/ulib/axlibc/c/time.c
@@ -3,8 +3,9 @@
  *   You can use this software according to the terms and conditions of the Mulan PSL v2.
  *   You may obtain a copy of Mulan PSL v2 at:
  *               http://license.coscl.org.cn/MulanPSL2
- *   THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- *   See the Mulan PSL v2 for more details.
+ *   THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A
+ * PARTICULAR PURPOSE. See the Mulan PSL v2 for more details.
  */
 
 #include <errno.h>
@@ -183,6 +184,13 @@ void tzset()
     return;
 }
 
+// TODO
+int getitimer(int, struct itimerval *curr_value)
+{
+    unimplemented();
+    return 0;
+}
+
 // TODO
 int setitimer(int _which, const struct itimerval *restrict _new, struct itimerval *restrict _old)
 {