linux-like: Move pthread API in to the new module

Author: tgross35

src/new/bionic_libc/pthread.rs

@@ -1,26 +1,37 @@
 //! Header: `unistd.h`
 
-pub use crate::new::common::linux_like::pthread::pthread_setname_np;
+pub use crate::new::common::linux_like::pthread::{
+    pthread_getattr_np,
+    pthread_setname_np,
+};
 pub use crate::new::common::posix::pthread::{
     pthread_atfork,
     pthread_attr_getguardsize,
     pthread_attr_getinheritsched,
+    pthread_attr_getstack,
     pthread_attr_setguardsize,
     pthread_attr_setinheritsched,
+    pthread_attr_setstack,
     pthread_barrier_destroy,
     pthread_barrier_init,
     pthread_barrier_wait,
     pthread_barrierattr_destroy,
     pthread_barrierattr_getpshared,
     pthread_barrierattr_init,
     pthread_barrierattr_setpshared,
+    pthread_condattr_getclock,
     pthread_condattr_getpshared,
+    pthread_condattr_setclock,
+    pthread_condattr_setpshared,
     pthread_create,
     pthread_getcpuclockid,
     pthread_getschedparam,
     pthread_kill,
     pthread_mutex_timedlock,
     pthread_mutexattr_getpshared,
+    pthread_mutexattr_setpshared,
+    pthread_rwlockattr_getpshared,
+    pthread_rwlockattr_setpshared,
     pthread_setschedparam,
     pthread_sigmask,
     pthread_spin_destroy,

src/new/common/linux_like/mod.rs

@@ -1,4 +1,4 @@
 //! API that primarily comes from Linux but is also used other platforms (e.g. Android).
 
-#[cfg(any(target_os = "android", target_os = "linux"))]
+#[cfg(any(target_os = "android", target_os = "emscripten", target_os = "linux"))]
 pub(crate) mod pthread;

src/new/common/linux_like/pthread.rs

@@ -8,6 +8,8 @@ extern "C" {
         cpuset: *mut crate::cpu_set_t,
     ) -> c_int;
 
+    pub fn pthread_getattr_np(native: crate::pthread_t, attr: *mut crate::pthread_attr_t) -> c_int;
+
     #[cfg(target_os = "linux")]
     pub fn pthread_getname_np(thread: crate::pthread_t, name: *mut c_char, len: size_t) -> c_int;
 

src/new/common/posix/pthread.rs

@@ -36,6 +36,18 @@ extern "C" {
         policy: *mut c_int,
     ) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_attr_getstack(
+        attr: *const crate::pthread_attr_t,
+        stackaddr: *mut *mut c_void,
+        stacksize: *mut size_t,
+    ) -> c_int;
+
     #[cfg(any(target_os = "android", target_os = "linux"))]
     pub fn pthread_attr_setguardsize(attr: *mut crate::pthread_attr_t, guardsize: size_t) -> c_int;
 
@@ -54,6 +66,18 @@ extern "C" {
     #[cfg(target_os = "linux")]
     pub fn pthread_attr_setschedpolicy(attr: *mut crate::pthread_attr_t, policy: c_int) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_attr_setstack(
+        attr: *mut crate::pthread_attr_t,
+        stackaddr: *mut c_void,
+        stacksize: size_t,
+    ) -> c_int;
+
     #[cfg(any(target_os = "android", target_os = "linux"))]
     pub fn pthread_barrier_destroy(barrier: *mut crate::pthread_barrier_t) -> c_int;
 
@@ -88,12 +112,45 @@ extern "C" {
     #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
     pub fn pthread_cancel(thread: crate::pthread_t) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_condattr_getclock(
+        attr: *const crate::pthread_condattr_t,
+        clock_id: *mut crate::clockid_t,
+    ) -> c_int;
+
     #[cfg(any(target_os = "android", target_os = "linux"))]
     pub fn pthread_condattr_getpshared(
         attr: *const crate::pthread_condattr_t,
         pshared: *mut c_int,
     ) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_condattr_setclock(
+        attr: *mut crate::pthread_condattr_t,
+        clock_id: crate::clockid_t,
+    ) -> c_int;
+
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_condattr_setpshared(
+        attr: *mut crate::pthread_condattr_t,
+        pshared: c_int,
+    ) -> c_int;
+
     #[cfg(any(target_os = "android", target_os = "emscripten", target_os = "linux"))]
     pub fn pthread_create(
         native: *mut crate::pthread_t,
@@ -151,12 +208,45 @@ extern "C" {
         protocol: c_int,
     ) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_mutexattr_setpshared(
+        attr: *mut crate::pthread_mutexattr_t,
+        pshared: c_int,
+    ) -> c_int;
+
     #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
     pub fn pthread_mutexattr_setrobust(
         attr: *mut crate::pthread_mutexattr_t,
         robustness: c_int,
     ) -> c_int;
 
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_rwlockattr_getpshared(
+        attr: *const crate::pthread_rwlockattr_t,
+        val: *mut c_int,
+    ) -> c_int;
+
+    #[cfg(any(
+        target_os = "android",
+        target_os = "emscripten",
+        target_os = "linux",
+        target_os = "l4re"
+    ))]
+    pub fn pthread_rwlockattr_setpshared(
+        attr: *mut crate::pthread_rwlockattr_t,
+        val: c_int,
+    ) -> c_int;
+
     #[cfg(target_os = "linux")]
     pub fn pthread_once(control: *mut crate::pthread_once_t, routine: extern "C" fn()) -> c_int;
 

src/new/emscripten/pthread.rs

@@ -1,3 +1,12 @@
 //! Header: `pthread.h`
 
-pub use crate::new::common::posix::pthread::pthread_create;
+pub use crate::new::common::linux_like::pthread::pthread_getattr_np;
+pub use crate::new::common::posix::pthread::{
+    pthread_attr_getstack,
+    pthread_attr_setstack,
+    pthread_condattr_getclock,
+    pthread_condattr_setclock,
+    pthread_condattr_setpshared,
+    pthread_create,
+    pthread_rwlockattr_setpshared,
+};

src/new/glibc/sysdeps/nptl/pthread.rs

@@ -4,6 +4,7 @@
 
 pub use crate::new::common::linux_like::pthread::{
     pthread_getaffinity_np,
+    pthread_getattr_np,
     pthread_getname_np,
     pthread_setaffinity_np,
     pthread_setname_np,
@@ -14,10 +15,12 @@ pub use crate::new::common::posix::pthread::{
     pthread_attr_getinheritsched,
     pthread_attr_getschedparam,
     pthread_attr_getschedpolicy,
+    pthread_attr_getstack,
     pthread_attr_setguardsize,
     pthread_attr_setinheritsched,
     pthread_attr_setschedparam,
     pthread_attr_setschedpolicy,
+    pthread_attr_setstack,
     pthread_barrier_destroy,
     pthread_barrier_init,
     pthread_barrier_wait,
@@ -26,7 +29,10 @@ pub use crate::new::common::posix::pthread::{
     pthread_barrierattr_init,
     pthread_barrierattr_setpshared,
     pthread_cancel,
+    pthread_condattr_getclock,
     pthread_condattr_getpshared,
+    pthread_condattr_setclock,
+    pthread_condattr_setpshared,
     pthread_create,
     pthread_getcpuclockid,
     pthread_getschedparam,
@@ -37,8 +43,11 @@ pub use crate::new::common::posix::pthread::{
     pthread_mutexattr_getpshared,
     pthread_mutexattr_getrobust,
     pthread_mutexattr_setprotocol,
+    pthread_mutexattr_setpshared,
     pthread_mutexattr_setrobust,
     pthread_once,
+    pthread_rwlockattr_getpshared,
+    pthread_rwlockattr_setpshared,
     pthread_setschedparam,
     pthread_setschedprio,
     pthread_sigmask,

src/new/musl/pthread.rs

@@ -4,6 +4,7 @@
 
 pub use crate::new::common::linux_like::pthread::{
     pthread_getaffinity_np,
+    pthread_getattr_np,
     pthread_getname_np,
     pthread_setaffinity_np,
     pthread_setname_np,
@@ -14,18 +15,23 @@ pub use crate::new::common::posix::pthread::{
     pthread_attr_getinheritsched,
     pthread_attr_getschedparam,
     pthread_attr_getschedpolicy,
+    pthread_attr_getstack,
     pthread_attr_setguardsize,
     pthread_attr_setinheritsched,
     pthread_attr_setschedparam,
     pthread_attr_setschedpolicy,
+    pthread_attr_setstack,
     pthread_barrier_destroy,
     pthread_barrier_init,
     pthread_barrier_wait,
     pthread_barrierattr_destroy,
     pthread_barrierattr_getpshared,
     pthread_barrierattr_init,
     pthread_barrierattr_setpshared,
+    pthread_condattr_getclock,
     pthread_condattr_getpshared,
+    pthread_condattr_setclock,
+    pthread_condattr_setpshared,
     pthread_create,
     pthread_getcpuclockid,
     pthread_getschedparam,
@@ -34,7 +40,10 @@ pub use crate::new::common::posix::pthread::{
     pthread_mutexattr_getprotocol,
     pthread_mutexattr_getpshared,
     pthread_mutexattr_setprotocol,
+    pthread_mutexattr_setpshared,
     pthread_once,
+    pthread_rwlockattr_getpshared,
+    pthread_rwlockattr_setpshared,
     pthread_setschedparam,
     pthread_setschedprio,
     pthread_sigmask,

src/new/uclibc/pthread.rs

@@ -2,6 +2,7 @@
 
 pub use crate::new::common::linux_like::pthread::{
     pthread_getaffinity_np,
+    pthread_getattr_np,
     pthread_getname_np,
     pthread_setaffinity_np,
     pthread_setname_np,
@@ -12,10 +13,12 @@ pub use crate::new::common::posix::pthread::{
     pthread_attr_getinheritsched,
     pthread_attr_getschedparam,
     pthread_attr_getschedpolicy,
+    pthread_attr_getstack,
     pthread_attr_setguardsize,
     pthread_attr_setinheritsched,
     pthread_attr_setschedparam,
     pthread_attr_setschedpolicy,
+    pthread_attr_setstack,
     pthread_barrier_destroy,
     pthread_barrier_init,
     pthread_barrier_wait,
@@ -24,7 +27,10 @@ pub use crate::new::common::posix::pthread::{
     pthread_barrierattr_init,
     pthread_barrierattr_setpshared,
     pthread_cancel,
+    pthread_condattr_getclock,
     pthread_condattr_getpshared,
+    pthread_condattr_setclock,
+    pthread_condattr_setpshared,
     pthread_create,
     pthread_getcpuclockid,
     pthread_getschedparam,
@@ -35,8 +41,11 @@ pub use crate::new::common::posix::pthread::{
     pthread_mutexattr_getpshared,
     pthread_mutexattr_getrobust,
     pthread_mutexattr_setprotocol,
+    pthread_mutexattr_setpshared,
     pthread_mutexattr_setrobust,
     pthread_once,
+    pthread_rwlockattr_getpshared,
+    pthread_rwlockattr_setpshared,
     pthread_setschedparam,
     pthread_setschedprio,
     pthread_sigmask,

src/unix/linux_like/mod.rs

@@ -1880,17 +1880,6 @@ extern "C" {
 
     pub fn dirfd(dirp: *mut crate::DIR) -> c_int;
 
-    pub fn pthread_getattr_np(native: crate::pthread_t, attr: *mut crate::pthread_attr_t) -> c_int;
-    pub fn pthread_attr_getstack(
-        attr: *const crate::pthread_attr_t,
-        stackaddr: *mut *mut c_void,
-        stacksize: *mut size_t,
-    ) -> c_int;
-    pub fn pthread_attr_setstack(
-        attr: *mut crate::pthread_attr_t,
-        stackaddr: *mut c_void,
-        stacksize: size_t,
-    ) -> c_int;
     pub fn memalign(align: size_t, size: size_t) -> *mut c_void;
     pub fn setgroups(ngroups: size_t, ptr: *const crate::gid_t) -> c_int;
     pub fn pipe2(fds: *mut c_int, flags: c_int) -> c_int;
@@ -1915,21 +1904,7 @@ extern "C" {
     pub fn newlocale(mask: c_int, locale: *const c_char, base: crate::locale_t) -> crate::locale_t;
     pub fn uselocale(loc: crate::locale_t) -> crate::locale_t;
     pub fn mknodat(dirfd: c_int, pathname: *const c_char, mode: mode_t, dev: dev_t) -> c_int;
-    pub fn pthread_condattr_getclock(
-        attr: *const pthread_condattr_t,
-        clock_id: *mut clockid_t,
-    ) -> c_int;
-    pub fn pthread_condattr_setclock(
-        attr: *mut pthread_condattr_t,
-        clock_id: crate::clockid_t,
-    ) -> c_int;
-    pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: c_int) -> c_int;
-    pub fn pthread_mutexattr_setpshared(attr: *mut pthread_mutexattr_t, pshared: c_int) -> c_int;
-    pub fn pthread_rwlockattr_getpshared(
-        attr: *const pthread_rwlockattr_t,
-        val: *mut c_int,
-    ) -> c_int;
-    pub fn pthread_rwlockattr_setpshared(attr: *mut pthread_rwlockattr_t, val: c_int) -> c_int;
+
     pub fn ptsname_r(fd: c_int, buf: *mut c_char, buflen: size_t) -> c_int;
     pub fn clearenv() -> c_int;
     pub fn waitid(