resolved conflict

Author: qianxichen233

src/RawPOSIX/src/interface/signal.rs

@@ -1,7 +1,5 @@
-use crate::{
-    constants::{SA_NODEFER, SA_RESETHAND, SIG_DFL},
-    interface::{cagetable_getref, cagetable_getref_opt, RustAtomicOrdering},
-};
+use crate::interface::{cagetable_getref, cagetable_getref_opt, RustAtomicOrdering};
+use sysdefs::constants::{SA_NODEFER, SA_RESETHAND, SIG_DFL};
 
 const EPOCH_NORMAL: u64 = 0;
 const EPOCH_SIGNAL: u64 = 0xc0ffee;

src/RawPOSIX/src/interface/timer.rs

@@ -7,7 +7,7 @@ pub use std::time::Duration as RustDuration;
 pub use std::time::Instant as RustInstant;
 use std::time::SystemTime;
 
-use crate::constants::SIGALRM;
+use sysdefs::constants::SIGALRM;
 
 use super::lind_send_signal;
 

src/sysdefs/src/constants/mod.rs

@@ -2,10 +2,8 @@ pub mod err_const;
 pub mod fs_const;
 pub mod net_const;
 pub mod sys_const;
-pub mod threei_const;
 
 pub use err_const::*;
 pub use fs_const::*;
 pub use net_const::*;
 pub use sys_const::*;
-pub use threei_const::*;

src/wasmtime/crates/lind-multi-process/Cargo.toml

@@ -17,3 +17,4 @@ wasmtime = { workspace = true, features = ['threads'] }
 wasmtime-environ = { workspace = true }
 wasmtime-lind-utils = { path = "../lind-utils" }
 rawposix = { path = "../rawposix" }
+sysdefs = { path = "../sysdefs" }

src/wasmtime/crates/lind-multi-process/src/signal.rs

@@ -1,4 +1,4 @@
-use rawposix::constants::{SIG_DFL, SIG_IGN};
+use sysdefs::constants::{SIG_DFL, SIG_IGN};
 use wasmtime::{raise_trap, AsContext, AsContextMut, AsyncifyState, Caller, Trap};
 
 use crate::LindHost;
@@ -155,37 +155,37 @@ pub fn thread_suicide() -> ! {
 // see https://man7.org/linux/man-pages/man7/signal.7.html for more information
 fn signal_default_handler_dispatcher(signo: i32) -> SignalDefaultHandler {
     match signo {
-        rawposix::constants::SIGHUP => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGINT => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGQUIT => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGILL => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGTRAP => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGABRT => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGBUS => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGFPE => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGKILL => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGUSR1 => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGSEGV => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGUSR2 => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGPIPE => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGALRM => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGTERM => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGSTKFLT => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGCHLD => SignalDefaultHandler::Ignore,
-        rawposix::constants::SIGCONT => SignalDefaultHandler::Continue,
-        rawposix::constants::SIGSTOP => SignalDefaultHandler::Stop,
-        rawposix::constants::SIGTSTP => SignalDefaultHandler::Stop,
-        rawposix::constants::SIGTTIN => SignalDefaultHandler::Stop,
-        rawposix::constants::SIGTTOU => SignalDefaultHandler::Stop,
-        rawposix::constants::SIGURG => SignalDefaultHandler::Ignore,
-        rawposix::constants::SIGXCPU => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGXFSZ => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGVTALRM => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGPROF => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGWINCH => SignalDefaultHandler::Ignore,
-        rawposix::constants::SIGIO => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGPWR => SignalDefaultHandler::Terminate,
-        rawposix::constants::SIGSYS => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGHUP => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGINT => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGQUIT => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGILL => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGTRAP => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGABRT => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGBUS => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGFPE => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGKILL => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGUSR1 => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGSEGV => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGUSR2 => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGPIPE => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGALRM => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGTERM => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGSTKFLT => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGCHLD => SignalDefaultHandler::Ignore,
+        sysdefs::constants::SIGCONT => SignalDefaultHandler::Continue,
+        sysdefs::constants::SIGSTOP => SignalDefaultHandler::Stop,
+        sysdefs::constants::SIGTSTP => SignalDefaultHandler::Stop,
+        sysdefs::constants::SIGTTIN => SignalDefaultHandler::Stop,
+        sysdefs::constants::SIGTTOU => SignalDefaultHandler::Stop,
+        sysdefs::constants::SIGURG => SignalDefaultHandler::Ignore,
+        sysdefs::constants::SIGXCPU => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGXFSZ => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGVTALRM => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGPROF => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGWINCH => SignalDefaultHandler::Ignore,
+        sysdefs::constants::SIGIO => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGPWR => SignalDefaultHandler::Terminate,
+        sysdefs::constants::SIGSYS => SignalDefaultHandler::Terminate,
         _ => panic!("invalid signal number!"),
     }
 }