diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
index 5268bf60cb91512d274b22ddbd219bfad8191101..68419a6e9593748d0269402aefded95c99fb7e43 100644
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -28,6 +28,11 @@ const AT_FDCWD: c_int = -100;
const AT_EMPTY_PATH: c_int = 0x1000;
const AT_REMOVEDIR: c_int = 0x200;
+const CLONE_VM: usize = 0x0100;
+const CLONE_FS: usize = 0x0200;
+const CLONE_FILES: usize = 0x0400;
+const CLONE_SIGHAND: usize = 0x0800;
+
#[repr(C)]
#[derive(Default)]
struct linux_statfs {
@@ -185,7 +190,7 @@ impl Pal for Sys {
}
fn fork() -> pid_t {
- e(unsafe { syscall!(CLONE, SIGCHLD, 0) }) as pid_t
+ e(unsafe { syscall!(CLONE, SIGCHLD, 0, 0, 0, 0) }) as pid_t
}
fn fsync(fildes: c_int) -> c_int {
@@ -249,6 +254,10 @@ impl Pal for Sys {
e(unsafe { syscall!(GETPPID) }) as pid_t
}
+ fn gettid() -> pid_t {
+ e(unsafe { syscall!(GETTID) }) as pid_t
+ }
+
fn gettimeofday(tp: *mut timeval, tzp: *mut timezone) -> c_int {
e(unsafe { syscall!(GETTIMEOFDAY, tp, tzp) }) as c_int
}
@@ -322,6 +331,10 @@ impl Pal for Sys {
e(unsafe { syscall!(POLL, fds, nfds, timeout) }) as c_int
}
+ fn pte_clone() -> pid_t {
+ e(unsafe { syscall!(CLONE, CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, 0, 0, 0, 0) }) as pid_t
+ }
+
fn read(fildes: c_int, buf: &mut [u8]) -> ssize_t {
e(unsafe { syscall!(READ, fildes, buf.as_mut_ptr(), buf.len()) }) as ssize_t
}
@@ -378,6 +391,10 @@ impl Pal for Sys {
e(unsafe { syscall!(UNLINKAT, AT_FDCWD, path.as_ptr(), AT_REMOVEDIR) }) as c_int
}
+ fn sched_yield() -> c_int {
+ e(unsafe { syscall!(SCHED_YIELD) }) as c_int
+ }
+
fn select(
nfds: c_int,
readfds: *mut fd_set,
diff --git a/src/platform/mod.rs b/src/platform/mod.rs
index d94515a7da2e1e6425ca22d36bf790c19e0598fc..f48a87c3fe5583c478613d7aca04cdc918670885 100644
--- a/src/platform/mod.rs
+++ b/src/platform/mod.rs
@@ -26,6 +26,8 @@ mod sys;
#[path = "redox/mod.rs"]
mod sys;
+mod pte;
+
pub use self::rlb::{Line, RawLineBuffer};
pub mod rlb;
diff --git a/src/platform/pal/mod.rs b/src/platform/pal/mod.rs
index 79d5217370c08afaf33e68cfcb43ce1e9bc154f6..a67a29062f1d4b107cf31e07383ca6e8e007b397 100644
--- a/src/platform/pal/mod.rs
+++ b/src/platform/pal/mod.rs
@@ -83,6 +83,8 @@ pub trait Pal {
fn getppid() -> pid_t;
+ fn gettid() -> pid_t;
+
fn gettimeofday(tp: *mut timeval, tzp: *mut timezone) -> c_int;
fn getuid() -> uid_t;
@@ -118,6 +120,8 @@ pub trait Pal {
fn poll(fds: *mut pollfd, nfds: nfds_t, timeout: c_int) -> c_int;
+ fn pte_clone() -> pid_t;
+
fn read(fildes: c_int, buf: &mut [u8]) -> ssize_t;
fn readlink(pathname: &CStr, out: &mut [u8]) -> ssize_t;
@@ -128,6 +132,8 @@ pub trait Pal {
fn rmdir(path: &CStr) -> c_int;
+ fn sched_yield() -> c_int;
+
//TODO: Deprecate in favor of poll
fn select(
nfds: c_int,
diff --git a/src/platform/redox/pte.rs b/src/platform/pte.rs
similarity index 73%
rename from src/platform/redox/pte.rs
rename to src/platform/pte.rs
index a4dd41c1c08bb4d512b46788a2ea57b42fa344a3..7b9c71f4d2e1009b0552615df383c98edc795682 100644
--- a/src/platform/redox/pte.rs
+++ b/src/platform/pte.rs
@@ -1,22 +1,25 @@
use alloc::boxed::Box;
use alloc::collections::BTreeMap;
-use core::{mem, intrinsics, ptr};
+use core::{intrinsics, ptr};
use core::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
-use syscall;
-use platform::types::{c_int, c_uint, c_void};
+use header::time::timespec;
+use mutex::{FUTEX_WAIT, FUTEX_WAKE};
+use platform::{Pal, Sys};
+use platform::types::{c_int, c_uint, c_void, pid_t};
pub struct Semaphore {
lock: i32,
count: i32,
}
-type pte_osThreadHandle = usize;
+type pte_osThreadHandle = pid_t;
type pte_osMutexHandle = *mut i32;
type pte_osSemaphoreHandle = *mut Semaphore;
type pte_osThreadEntryPoint = unsafe extern "C" fn(params: *mut c_void) -> c_int;
#[repr(C)]
+#[derive(Eq, PartialEq)]
pub enum pte_osResult {
PTE_OS_OK = 0,
PTE_OS_NO_RESOURCES,
@@ -49,14 +52,6 @@ pub unsafe extern "C" fn pte_osInit() -> pte_osResult {
PTE_OS_OK
}
-/*
-pte_osResult pte_osThreadCreate(pte_osThreadEntryPoint entryPoint,
- int stackSize,
- int initialPriority,
- void *argv,
- pte_osThreadHandle* ppte_osThreadHandle)
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadCreate(entryPoint: pte_osThreadEntryPoint,
_stackSize: c_int,
@@ -65,7 +60,10 @@ pub unsafe extern "C" fn pte_osThreadCreate(entryPoint: pte_osThreadEntryPoint,
ppte_osThreadHandle: *mut pte_osThreadHandle
) -> pte_osResult {
// XXX error handling
- let id = syscall::clone(syscall::CLONE_VM | syscall::CLONE_FS | syscall::CLONE_FILES).unwrap();
+ let id = Sys::pte_clone();
+ if id < 0 {
+ return PTE_OS_GENERAL_FAILURE;
+ }
let mutex = Box::into_raw(Box::new(0));
@@ -73,7 +71,7 @@ pub unsafe extern "C" fn pte_osThreadCreate(entryPoint: pte_osThreadEntryPoint,
// Wait until pte_osThreadStart
pte_osMutexLock(mutex);
entryPoint(argv);
- let _ = syscall::exit(0);
+ pte_osThreadExit();
} else {
pte_osMutexLock(&mut pid_mutexes_lock);
if pid_mutexes.is_none() {
@@ -86,7 +84,6 @@ pub unsafe extern "C" fn pte_osThreadCreate(entryPoint: pte_osThreadEntryPoint,
PTE_OS_OK
}
-// pte_osResult pte_osThreadStart(pte_osThreadHandle osThreadHandle)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadStart(handle: pte_osThreadHandle) -> pte_osResult {
let mut ret = PTE_OS_GENERAL_FAILURE;
@@ -101,20 +98,18 @@ pub unsafe extern "C" fn pte_osThreadStart(handle: pte_osThreadHandle) -> pte_os
ret
}
-/*
-void pte_osThreadExit()
-pte_osResult pte_osThreadExitAndDelete(pte_osThreadHandle handle)
-pte_osResult pte_osThreadDelete(pte_osThreadHandle handle)
-*/
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadExit() {
- syscall::exit(0);
+ Sys::exit(0);
}
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadExitAndDelete(handle: pte_osThreadHandle) -> pte_osResult {
- pte_osThreadDelete(handle);
- syscall::exit(0);
+ let res = pte_osThreadDelete(handle);
+ if res != PTE_OS_OK {
+ return res;
+ }
+ pte_osThreadExit();
PTE_OS_OK
}
@@ -130,52 +125,38 @@ pub unsafe extern "C" fn pte_osThreadDelete(handle: pte_osThreadHandle) -> pte_o
PTE_OS_OK
}
-// pte_osResult pte_osThreadWaitForEnd(pte_osThreadHandle threadHandle)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadWaitForEnd(handle: pte_osThreadHandle) -> pte_osResult {
let mut status = 0;
- syscall::waitpid(handle, &mut status, 0);
+ Sys::waitpid(handle, &mut status, 0);
PTE_OS_OK
}
-// pte_osResult pte_osThreadCancel(pte_osThreadHandle threadHandle)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadCancel(handle: pte_osThreadHandle) -> pte_osResult {
//TODO: allow cancel of thread
PTE_OS_OK
}
-// pte_osResult pte_osThreadCheckCancel(pte_osThreadHandle threadHandle)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadCheckCancel(handle: pte_osThreadHandle) -> pte_osResult {
PTE_OS_OK
}
-//void pte_osThreadSleep(unsigned int msecs)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadSleep(msecs: c_uint) {
- let tm = syscall::TimeSpec {
+ let tm = timespec {
tv_sec: msecs as i64 / 1000,
- tv_nsec: (msecs % 1000) as i32 * 1000000,
+ tv_nsec: (msecs % 1000) as i64 * 1000000,
};
- let mut rmtp = mem::uninitialized();
- let _ = syscall::nanosleep(&tm, &mut rmtp);
+ Sys::nanosleep(&tm, ptr::null_mut());
}
-// pte_osThreadHandle pte_osThreadGetHandle(void)
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadGetHandle() -> pte_osThreadHandle {
- syscall::getpid().unwrap()
+ Sys::gettid()
}
-/*
-int pte_osThreadGetPriority(pte_osThreadHandle threadHandle)
-pte_osResult pte_osThreadSetPriority(pte_osThreadHandle threadHandle, int newPriority)
-int pte_osThreadGetMinPriority()
-int pte_osThreadGetMaxPriority()
-int pte_osThreadGetDefaultPriority()
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osThreadGetPriority(threadHandle: pte_osThreadHandle) -> c_int {
// XXX Shouldn't Redox support priorities?
@@ -202,13 +183,6 @@ pub unsafe extern "C" fn pte_osThreadGetDefaultPriority() -> c_int {
1
}
-/*
-pte_osResult pte_osMutexCreate(pte_osMutexHandle *pHandle)
-pte_osResult pte_osMutexDelete(pte_osMutexHandle handle)
-pte_osResult pte_osMutexLock(pte_osMutexHandle handle)
-pte_osResult pte_osMutexUnlock(pte_osMutexHandle handle)
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osMutexCreate(pHandle: *mut pte_osMutexHandle) -> pte_osResult {
*pHandle = Box::into_raw(Box::new(0));
@@ -234,7 +208,7 @@ pub unsafe extern "C" fn pte_osMutexLock(handle: pte_osMutexHandle) -> pte_osRes
c = intrinsics::atomic_xchg(handle, 2);
}
while c != 0 {
- let _ = syscall::futex(handle, syscall::FUTEX_WAIT, 2, 0, ptr::null_mut());
+ Sys::futex(handle, FUTEX_WAIT, 2);
c = intrinsics::atomic_xchg(handle, 2);
}
@@ -255,19 +229,11 @@ pub unsafe extern "C" fn pte_osMutexUnlock(handle: pte_osMutexHandle) -> pte_osR
}
}
}
- let _ = syscall::futex(handle, syscall::FUTEX_WAKE, 1, 0, ptr::null_mut());
+ Sys::futex(handle, FUTEX_WAKE, 1);
PTE_OS_OK
}
-/*
-pte_osResult pte_osSemaphoreCreate(int initialValue, pte_osSemaphoreHandle *pHandle)
-pte_osResult pte_osSemaphoreDelete(pte_osSemaphoreHandle handle)
-pte_osResult pte_osSemaphorePost(pte_osSemaphoreHandle handle, int count)
-pte_osResult pte_osSemaphorePend(pte_osSemaphoreHandle handle, unsigned int *pTimeoutMsecs)
-pte_osResult pte_osSemaphoreCancellablePend(pte_osSemaphoreHandle semHandle, unsigned int *pTimeout)
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osSemaphoreCreate(initialValue: c_int, pHandle: *mut pte_osSemaphoreHandle) -> pte_osResult {
*pHandle = Box::into_raw(Box::new(Semaphore {
@@ -304,7 +270,7 @@ pub unsafe extern "C" fn pte_osSemaphorePend(handle: pte_osSemaphoreHandle, pTim
acquired = true;
}
pte_osMutexUnlock(&mut semaphore.lock);
- let _ = syscall::sched_yield();
+ Sys::sched_yield();
}
PTE_OS_OK
}
@@ -315,14 +281,6 @@ pub unsafe extern "C" fn pte_osSemaphoreCancellablePend(handle: pte_osSemaphoreH
pte_osSemaphorePend(handle, pTimeout)
}
-/*
-int pte_osAtomicExchange(int *ptarg, int val)
-int pte_osAtomicCompareExchange(int *pdest, int exchange, int comp)
-int pte_osAtomicExchangeAdd(int volatile* pAddend, int value)
-int pte_osAtomicDecrement(int *pdest)
-int pte_osAtomicIncrement(int *pdest)
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osAtomicExchange(ptarg: *mut c_int, val: c_int) -> c_int {
intrinsics::atomic_xchg(ptarg, val)
@@ -348,13 +306,6 @@ pub unsafe extern "C" fn pte_osAtomicIncrement(pdest: *mut c_int) -> c_int {
intrinsics::atomic_xadd(pdest, 1) + 1
}
-/*
-pte_osResult pte_osTlsSetValue(unsigned int index, void * value)
-void * pte_osTlsGetValue(unsigned int index)
-pte_osResult pte_osTlsAlloc(unsigned int *pKey)
-pte_osResult pte_osTlsFree(unsigned int index)
-*/
-
#[no_mangle]
pub unsafe extern "C" fn pte_osTlsSetValue(index: c_uint, value: *mut c_void) -> pte_osResult {
locals().insert(index, value);
diff --git a/src/platform/redox/mod.rs b/src/platform/redox/mod.rs
index 318745cbb582f26140430ebd34abf8f8701e859d..b98b6546b2ab1194ab179f312e3202cc81c93131 100644
--- a/src/platform/redox/mod.rs
+++ b/src/platform/redox/mod.rs
@@ -31,7 +31,6 @@ use super::types::*;
use super::{errno, Pal, Read};
mod extra;
-mod pte;
mod signal;
mod socket;
@@ -551,6 +550,11 @@ impl Pal for Sys {
e(syscall::getppid()) as pid_t
}
+ fn gettid() -> pid_t {
+ //TODO
+ getpid()
+ }
+
fn gettimeofday(tp: *mut timeval, tzp: *mut timezone) -> c_int {
let mut redox_tp = redox_timespec::default();
let err = e(syscall::clock_gettime(
@@ -814,6 +818,10 @@ impl Pal for Sys {
total
}
+ fn pte_clone() -> pid_t {
+ e(syscall::clone(syscall::CLONE_VM | syscall::CLONE_FS | syscall::CLONE_FILES | syscall::CLONE_SIGHAND)) as pid_t
+ }
+
fn read(fd: c_int, buf: &mut [u8]) -> ssize_t {
e(syscall::read(fd as usize, buf)) as ssize_t
}
@@ -869,6 +877,10 @@ impl Pal for Sys {
e(syscall::rmdir(path.to_bytes())) as c_int
}
+ fn sched_yield() -> c_int {
+ e(syscall::sched_yield()) as c_int
+ }
+
fn select(
nfds: c_int,
readfds: *mut fd_set,
diff --git a/tests/Makefile b/tests/Makefile
index ae16621e8bade527aca22ca5808985e73376ab76..2c4983fa0911e743182ba55860508f4707007333 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -104,7 +104,8 @@ BINS=\
unistd/getid \
unistd/link \
unistd/setid \
- unistd/stat
+ unistd/stat \
+ unistd/sysconf
# resource/getrusage
# time/times