diff --git a/lib/std/os/posix/files.c3 b/lib/std/os/posix/files.c3 index f3e38b297..38911424c 100644 --- a/lib/std/os/posix/files.c3 +++ b/lib/std/os/posix/files.c3 @@ -4,34 +4,6 @@ import libc; def Mode_t = uint; def DIRPtr = distinct void*; -struct DarwinTimespec @private -{ - long tv_sec; - long tv_nsec; -} - -struct Darwin64Stat @private -{ - int st_dev; - ushort st_mode; - ushort st_nlink; - ulong st_ino; - uint st_uid; - uint st_gid; - int st_rdev; - DarwinTimespec st_atimespec; // time of last access - DarwinTimespec st_mtimespec; // time of last data modification - DarwinTimespec st_ctimespec; // time of last status change - DarwinTimespec st_birthtimespec; // time of file creation(birth) - long st_size; - long st_blocks; - int st_blocksize; - uint st_flags; - uint st_gen; - int st_lspare; - long[2] st_qspare; -} - struct Posix_dirent { Ino_t d_fileno; @@ -67,6 +39,6 @@ const DT_LNK = 10; const DT_SOCK = 12; const DT_WHT = 14; -const USE_DARWIN_INODE64 = env::DARWIN && env::ARCH_TYPE == X86_64; +const USE_DARWIN_INODE64 = env::DARWIN && env::X86_64; extern fn Posix_dirent* readdir(DIRPtr) @extern("readdir$INODE64") @if(USE_DARWIN_INODE64); diff --git a/lib/std/os/posix/threads.c3 b/lib/std/os/posix/threads.c3 new file mode 100644 index 000000000..b1ce5823d --- /dev/null +++ b/lib/std/os/posix/threads.c3 @@ -0,0 +1,112 @@ +module std::os::posix @if(env::POSIX); +import libc; + +const PTHREAD_MUTEX_NORMAL = 0; +const PTHREAD_MUTEX_ERRORCHECK = 1; +const PTHREAD_MUTEX_RECURSIVE = 2; + +def PosixThreadFn = fn void*(void*); +def Pthread_t = distinct void*; + +extern fn CInt pthread_create(Pthread_t*, Pthread_attr_t*, PosixThreadFn, void*); +extern fn CInt pthread_cancel(Pthread_t*); +extern fn CInt pthread_detach(Pthread_t); +extern fn CInt pthread_equal(Pthread_t this, Pthread_t other); +extern fn void pthread_exit(void* value_ptr) @noreturn; +extern fn CInt pthread_join(Pthread_t, void** value_ptr); +extern fn CInt pthread_kill(Pthread_t, CInt sig); +extern fn void pthread_once(Pthread_once_t*, OnceFn); +extern fn Pthread_t pthread_self(); +extern fn CInt pthread_setcancelstate(CInt state, CInt* oldstate); +extern fn CInt pthread_setcanceltype(CInt type, CInt* oldtype); +extern fn CInt pthread_testcancel(); + +extern fn CInt pthread_attr_destroy(Pthread_attr_t*); +extern fn CInt pthread_attr_getinheritsched(Pthread_attr_t*, CInt*); +extern fn CInt pthread_attr_getschedparam(Pthread_attr_t*, Pthread_sched_param*); +extern fn CInt pthread_attr_getschedpolicy(Pthread_attr_t*, CInt*); +extern fn CInt pthread_attr_getscope(Pthread_attr_t*, CInt*); +extern fn CInt pthread_attr_getstacksize(Pthread_attr_t*, usz*); +extern fn CInt pthread_attr_getstackaddr(Pthread_attr_t*, void**); +extern fn CInt pthread_attr_getdetachstate(Pthread_attr_t*, CInt*); +extern fn CInt pthread_attr_init(Pthread_attr_t*); +extern fn CInt pthread_attr_setinheritsched(Pthread_attr_t*, CInt); +extern fn CInt pthread_attr_setschedparam(Pthread_attr_t*, Pthread_sched_param*); +extern fn CInt pthread_attr_setschedpolicy(Pthread_attr_t*, CInt); +extern fn CInt pthread_attr_setscope(Pthread_attr_t*, CInt); +extern fn CInt pthread_attr_setstacksize(Pthread_attr_t*, usz); +extern fn CInt pthread_attr_setstackaddr(Pthread_attr_t*, void*); +extern fn CInt pthread_attr_setdetachstate(Pthread_attr_t*, CInt); + +extern fn CInt pthread_mutexattr_destroy(Pthread_mutexattr_t*); +extern fn CInt pthread_mutexattr_getprioceiling(Pthread_mutexattr_t*, CInt*); +extern fn CInt pthread_mutexattr_getprotocol(Pthread_mutexattr_t*, CInt*); +extern fn CInt pthread_mutexattr_gettype(Pthread_mutexattr_t*, CInt*); +extern fn CInt pthread_mutexattr_init(Pthread_mutexattr_t*); +extern fn CInt pthread_mutexattr_setprioceiling(Pthread_mutexattr_t*, CInt); +extern fn CInt pthread_mutexattr_setprotocol(Pthread_mutexattr_t*, CInt); +extern fn CInt pthread_mutexattr_settype(Pthread_mutexattr_t*, CInt); + +extern fn CInt pthread_mutex_destroy(Pthread_mutex_t*); +extern fn CInt pthread_mutex_init(Pthread_mutex_t*, Pthread_mutexattr_t*); +extern fn Errno pthread_mutex_lock(Pthread_mutex_t*); +extern fn Errno pthread_mutex_trylock(Pthread_mutex_t*); +extern fn Errno pthread_mutex_unlock(Pthread_mutex_t*); + +extern fn CInt pthread_condattr_destroy(Pthread_condattr_t*); +extern fn CInt pthread_condattr_init(Pthread_condattr_t*); + +extern fn CInt pthread_cond_broadcast(Pthread_cond_t*); +extern fn CInt pthread_cond_destroy(Pthread_cond_t*); +extern fn CInt pthread_cond_init(Pthread_cond_t*, Pthread_condattr_t*); +extern fn CInt pthread_cond_signal(Pthread_cond_t*); +extern fn CInt pthread_cond_timedwait(Pthread_cond_t*, Pthread_mutex_t*, TimeSpec*); +extern fn CInt pthread_cond_wait(Pthread_cond_t*, Pthread_mutex_t*); + +extern fn CInt pthread_rwlock_destroy(Pthread_rwlock_t*); +extern fn CInt pthread_rwlock_init(Pthread_rwlock_t*, Pthread_rwlockattr_t*); +extern fn CInt pthread_rwlock_rdlock(Pthread_rwlock_t*); +extern fn CInt pthread_rwlock_tryrdlock(Pthread_rwlock_t*); +extern fn CInt pthread_rwlock_trywrlock(Pthread_rwlock_t*); +extern fn CInt pthread_rwlock_unlock(Pthread_rwlock_t*); +extern fn CInt pthread_rwlock_wrlock(Pthread_rwlock_t*); + +extern fn CInt pthread_rwlockattr_destroy(Pthread_rwlockattr_t*); +extern fn CInt pthread_rwlockattr_getpshared(Pthread_rwlockattr_t*, CInt*); +extern fn CInt pthread_rwlockattr_init(Pthread_rwlockattr_t*); +extern fn CInt pthread_rwlockattr_setpshared(Pthread_rwlockattr_t*, CInt); + +extern fn CInt pthread_key_create(Pthread_key_t*, PosixThreadFn routine); +extern fn CInt pthread_key_delete(Pthread_key_t); +extern fn void* pthread_getspecific(Pthread_key_t); +extern fn CInt pthread_setspecific(Pthread_key_t, void* value_ptr); + +extern fn CInt pthread_atfork(OnceFn prepare, OnceFn parent, OnceFn child); +extern fn void pthread_cleanup_pop(CInt execute); +extern fn void pthread_cleanup_push(PosixThreadFn routine, void* routine_arg); + +extern fn int sched_yield(); + +module std::thread::os @if(env::POSIX && !env::LINUX); +def Pthread_attr_t = distinct ulong[8]; +def Pthread_cond_t = distinct ulong[6]; +def Pthread_condattr_t = distinct ulong[8]; +def Pthread_key_t = distinct ulong; +def Pthread_mutex_t = distinct ulong[8]; +def Pthread_mutexattr_t = distinct ulong[2]; +def Pthread_once_t = distinct ulong[2]; +def Pthread_rwlock_t = distinct ulong[25]; +def Pthread_rwlockattr_t = distinct ulong[3]; +def Pthread_sched_param = distinct ulong; + +module std::thread::os @if(env::LINUX); +def Pthread_attr_t = distinct ulong[7]; // 24 on 32bit +def Pthread_cond_t = distinct ulong[6]; +def Pthread_condattr_t = distinct uint; +def Pthread_key_t = distinct uint; +def Pthread_mutex_t = distinct ulong[5]; // 24 on 32 bit +def Pthread_mutexattr_t = distinct uint; +def Pthread_once_t = distinct int; +def Pthread_rwlock_t = distinct ulong[7]; // 32 on 3bit +def Pthread_rwlockattr_t = distinct uint; +def Pthread_sched_param = distinct uint; diff --git a/lib/std/threads/os/thread_posix.c3 b/lib/std/threads/os/thread_posix.c3 index b195534c2..0e57ecc0a 100644 --- a/lib/std/threads/os/thread_posix.c3 +++ b/lib/std/threads/os/thread_posix.c3 @@ -1,47 +1,14 @@ -module std::thread::os @if(thread::THREAD_MODEL == ThreadModel.POSIX); +module std::os::posix @if(env::POSIX); import libc; -const PTHREAD_MUTEX_NORMAL = 0; -const PTHREAD_MUTEX_ERRORCHECK = 1; -const PTHREAD_MUTEX_RECURSIVE = 2; - -def NativeMutex = PthreadMutex; -def NativeConditionVariable = PthreadCond; -def NativeThread = Pthread; -def NativeOnceFlag = PthreadOnce; - -def Pthread = distinct void*; -def PosixThreadFn = fn void*(void*); - -extern fn int pthread_attr_destroy(PthreadAttribute*); -extern fn int pthread_attr_getdetachstate(PthreadAttribute*, int*); -extern fn int pthread_attr_init(PthreadAttribute*); -extern fn int pthread_mutex_init(PthreadMutex*, PthreadMutexAttribute*); -extern fn int pthread_mutex_destroy(PthreadMutex*); -extern fn int pthread_mutex_lock(PthreadMutex*); -extern fn int pthread_mutexattr_init(PthreadMutexAttribute*); -extern fn int pthread_mutexattr_destroy(PthreadMutexAttribute*); -extern fn int pthread_mutexattr_settype(PthreadMutexAttribute*, int); -extern fn int pthread_cond_init(PthreadCond*, PthreadCondAttribute*); -extern fn int pthread_cond_destroy(PthreadCond*); -extern fn int pthread_detach(Pthread); -extern fn int pthread_join(Pthread, void**); -extern fn int pthread_create(Pthread*, PthreadAttribute*, PosixThreadFn, void*); -extern fn Pthread pthread_self(); -extern fn Errno pthread_mutex_trylock(PthreadMutex*); -extern fn Errno pthread_mutex_unlock(PthreadMutex*); -extern fn Errno pthread_cond_signal(PthreadCond*); -extern fn Errno pthread_cond_broadcast(PthreadCond*); -extern fn Errno pthread_cond_wait(PthreadCond*, PthreadMutex*); -extern fn Errno pthread_cond_timedwait(PthreadCond*, PthreadMutex*, TimeSpec*); -extern fn void pthread_exit(void*); -extern fn void pthread_once(PthreadOnce*, OnceFn); -extern fn int pthread_equal(Pthread this, Pthread other); -extern fn int sched_yield(); +def NativeMutex = Pthread_mutex_t; +def NativeConditionVariable = Pthread_cond_t; +def NativeThread = Pthread_t; +def NativeOnceFlag = Pthread_once_t; fn void! NativeMutex.init(NativeMutex* mutex, MutexType type) { - PthreadMutexAttribute attr; + Pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr)) return ThreadFault.INIT_FAILED?; defer pthread_mutexattr_destroy(&attr); if (type & thread::MUTEX_RECURSIVE) @@ -217,18 +184,3 @@ fn void! native_sleep(double s) if (libc::nanosleep(&to, null)) return ThreadFault.INTERRUPTED?; } -module std::thread::os @if(thread::THREAD_MODEL == ThreadModel.POSIX && !env::LINUX); -def PthreadMutex = distinct ulong[8]; -def PthreadMutexAttribute = distinct ulong[2]; -def PthreadAttribute = distinct ulong[8]; -def PthreadCond = distinct ulong[6]; -def PthreadCondAttribute = distinct ulong[8]; -def PthreadOnce = distinct ulong[2]; - -module std::thread::os @if(thread::THREAD_MODEL == ThreadModel.POSIX && env::LINUX); -def PthreadMutex = distinct ulong[5]; -def PthreadAttribute = distinct ulong[7]; -def PthreadMutexAttribute = distinct uint; -def PthreadCondAttribute = distinct uint; -def PthreadCond = distinct ulong[6]; -def PthreadOnce = distinct uint;