Restructure thread implementations (#731)

This PR restructures the current two `pthreads` implementations into
parallel directories to prepare for a third implementation for `wasip3`.

- Move the single-threaded stubbed implementation from
`wasi-libc/thread-stub` to
`wasi-libc/libc-top-half/musl/src/thread/single-threaded`
- Move the `wasi-threads` implementation from
`wasi-libc/libc-top-half/musl/src/thread` to
`wasi-libc/libc-top-half/musl/src/thread/wasi-threads`
- Move common files into
`wasi-libc/libc-top-half/musl/src/thread/common`
- Delete the unused architecture subfolders from
`wasi-libc/libc-top-half/musl/src/thread`

The implementation for wasip3 will live in
`wasi-libc/libc-top-half/musl/src/thread/coop-threads`, which will be
created and populated in future PRs.

Author: TartanLlama

libc-top-half/CMakeLists.txt

@@ -224,49 +224,49 @@ set(top_half_sources
   musl/src/network/ntohl.c
   musl/src/network/ntohs.c
   musl/src/stat/futimesat.c
-  musl/src/thread/default_attr.c
-  musl/src/thread/pthread_attr_destroy.c
-  musl/src/thread/pthread_attr_get.c
-  musl/src/thread/pthread_attr_init.c
-  musl/src/thread/pthread_attr_setdetachstate.c
-  musl/src/thread/pthread_attr_setguardsize.c
-  musl/src/thread/pthread_attr_setschedparam.c
-  musl/src/thread/pthread_attr_setstack.c
-  musl/src/thread/pthread_attr_setstacksize.c
-  musl/src/thread/pthread_barrierattr_destroy.c
-  musl/src/thread/pthread_barrierattr_init.c
-  musl/src/thread/pthread_barrierattr_setpshared.c
-  musl/src/thread/pthread_cancel.c
-  musl/src/thread/pthread_cleanup_push.c
-  musl/src/thread/pthread_condattr_destroy.c
-  musl/src/thread/pthread_condattr_init.c
-  musl/src/thread/pthread_condattr_setclock.c
-  musl/src/thread/pthread_condattr_setpshared.c
-  musl/src/thread/pthread_equal.c
-  musl/src/thread/pthread_getattr_np.c
-  musl/src/thread/pthread_getspecific.c
-  musl/src/thread/pthread_key_create.c
-  musl/src/thread/pthread_mutex_destroy.c
-  musl/src/thread/pthread_mutex_init.c
-  musl/src/thread/pthread_mutexattr_destroy.c
-  musl/src/thread/pthread_mutexattr_init.c
-  musl/src/thread/pthread_mutexattr_setprotocol.c
-  musl/src/thread/pthread_mutexattr_setpshared.c
-  musl/src/thread/pthread_mutexattr_setrobust.c
-  musl/src/thread/pthread_mutexattr_settype.c
-  musl/src/thread/pthread_rwlock_destroy.c
-  musl/src/thread/pthread_rwlock_init.c
-  musl/src/thread/pthread_rwlockattr_destroy.c
-  musl/src/thread/pthread_rwlockattr_init.c
-  musl/src/thread/pthread_rwlockattr_setpshared.c
-  musl/src/thread/pthread_self.c
-  musl/src/thread/pthread_setcancelstate.c
-  musl/src/thread/pthread_setcanceltype.c
-  musl/src/thread/pthread_setspecific.c
-  musl/src/thread/pthread_spin_destroy.c
-  musl/src/thread/pthread_spin_init.c
-  musl/src/thread/pthread_testcancel.c
-  musl/src/thread/thrd_sleep.c
+  musl/src/thread/common/default_attr.c
+  musl/src/thread/common/pthread_attr_destroy.c
+  musl/src/thread/common/pthread_attr_get.c
+  musl/src/thread/common/pthread_attr_init.c
+  musl/src/thread/common/pthread_attr_setdetachstate.c
+  musl/src/thread/common/pthread_attr_setguardsize.c
+  musl/src/thread/common/pthread_attr_setschedparam.c
+  musl/src/thread/common/pthread_attr_setstack.c
+  musl/src/thread/common/pthread_attr_setstacksize.c
+  musl/src/thread/common/pthread_barrierattr_destroy.c
+  musl/src/thread/common/pthread_barrierattr_init.c
+  musl/src/thread/common/pthread_barrierattr_setpshared.c
+  musl/src/thread/common/pthread_cancel.c
+  musl/src/thread/common/pthread_cleanup_push.c
+  musl/src/thread/common/pthread_condattr_destroy.c
+  musl/src/thread/common/pthread_condattr_init.c
+  musl/src/thread/common/pthread_condattr_setclock.c
+  musl/src/thread/common/pthread_condattr_setpshared.c
+  musl/src/thread/common/pthread_equal.c
+  musl/src/thread/common/pthread_getattr_np.c
+  musl/src/thread/common/pthread_getspecific.c
+  musl/src/thread/common/pthread_key_create.c
+  musl/src/thread/common/pthread_mutex_destroy.c
+  musl/src/thread/common/pthread_mutex_init.c
+  musl/src/thread/common/pthread_mutexattr_destroy.c
+  musl/src/thread/common/pthread_mutexattr_init.c
+  musl/src/thread/common/pthread_mutexattr_setprotocol.c
+  musl/src/thread/common/pthread_mutexattr_setpshared.c
+  musl/src/thread/common/pthread_mutexattr_setrobust.c
+  musl/src/thread/common/pthread_mutexattr_settype.c
+  musl/src/thread/common/pthread_rwlock_destroy.c
+  musl/src/thread/common/pthread_rwlock_init.c
+  musl/src/thread/common/pthread_rwlockattr_destroy.c
+  musl/src/thread/common/pthread_rwlockattr_init.c
+  musl/src/thread/common/pthread_rwlockattr_setpshared.c
+  musl/src/thread/common/pthread_self.c
+  musl/src/thread/common/pthread_setcancelstate.c
+  musl/src/thread/common/pthread_setcanceltype.c
+  musl/src/thread/common/pthread_setspecific.c
+  musl/src/thread/common/pthread_spin_destroy.c
+  musl/src/thread/common/pthread_spin_init.c
+  musl/src/thread/common/pthread_testcancel.c
+  musl/src/thread/common/thrd_sleep.c
   musl/src/time/__month_to_secs.c
   musl/src/time/__secs_to_tm.c
   musl/src/time/__tm_to_secs.c
@@ -396,80 +396,80 @@ if (THREADS)
     musl/src/stdio/flockfile.c
     musl/src/stdio/ftrylockfile.c
     musl/src/stdio/funlockfile.c
-    musl/src/thread/__lock.c
-    musl/src/thread/__wait.c
-    musl/src/thread/__timedwait.c
-    musl/src/thread/pthread_barrier_destroy.c
-    musl/src/thread/pthread_barrier_init.c
-    musl/src/thread/pthread_barrier_wait.c
-    musl/src/thread/pthread_cond_broadcast.c
-    musl/src/thread/pthread_cond_destroy.c
-    musl/src/thread/pthread_cond_init.c
-    musl/src/thread/pthread_cond_signal.c
-    musl/src/thread/pthread_cond_timedwait.c
-    musl/src/thread/pthread_cond_wait.c
-    musl/src/thread/pthread_create.c
-    musl/src/thread/pthread_detach.c
-    musl/src/thread/pthread_join.c
-    musl/src/thread/pthread_mutex_consistent.c
-    musl/src/thread/pthread_mutex_getprioceiling.c
-    musl/src/thread/pthread_mutex_lock.c
-    musl/src/thread/pthread_mutex_timedlock.c
-    musl/src/thread/pthread_mutex_trylock.c
-    musl/src/thread/pthread_mutex_unlock.c
-    musl/src/thread/pthread_once.c
-    musl/src/thread/pthread_rwlock_rdlock.c
-    musl/src/thread/pthread_rwlock_timedrdlock.c
-    musl/src/thread/pthread_rwlock_timedwrlock.c
-    musl/src/thread/pthread_rwlock_tryrdlock.c
-    musl/src/thread/pthread_rwlock_trywrlock.c
-    musl/src/thread/pthread_rwlock_unlock.c
-    musl/src/thread/pthread_rwlock_wrlock.c
-    musl/src/thread/pthread_spin_lock.c
-    musl/src/thread/pthread_spin_trylock.c
-    musl/src/thread/pthread_spin_unlock.c
-    musl/src/thread/sem_destroy.c
-    musl/src/thread/sem_getvalue.c
-    musl/src/thread/sem_init.c
-    musl/src/thread/sem_post.c
-    musl/src/thread/sem_timedwait.c
-    musl/src/thread/sem_trywait.c
-    musl/src/thread/sem_wait.c
-    musl/src/thread/wasm32/wasi_thread_start.s
-    musl/src/thread/wasm32/__wasilibc_busywait.c
+    musl/src/thread/wasi-threads/__lock.c
+    musl/src/thread/wasi-threads/__wait.c
+    musl/src/thread/wasi-threads/__timedwait.c
+    musl/src/thread/wasi-threads/pthread_barrier_destroy.c
+    musl/src/thread/wasi-threads/pthread_barrier_init.c
+    musl/src/thread/wasi-threads/pthread_barrier_wait.c
+    musl/src/thread/wasi-threads/pthread_cond_broadcast.c
+    musl/src/thread/wasi-threads/pthread_cond_destroy.c
+    musl/src/thread/wasi-threads/pthread_cond_init.c
+    musl/src/thread/wasi-threads/pthread_cond_signal.c
+    musl/src/thread/wasi-threads/pthread_cond_timedwait.c
+    musl/src/thread/wasi-threads/pthread_cond_wait.c
+    musl/src/thread/wasi-threads/pthread_create.c
+    musl/src/thread/wasi-threads/pthread_detach.c
+    musl/src/thread/wasi-threads/pthread_join.c
+    musl/src/thread/wasi-threads/pthread_mutex_consistent.c
+    musl/src/thread/wasi-threads/pthread_mutex_getprioceiling.c
+    musl/src/thread/wasi-threads/pthread_mutex_lock.c
+    musl/src/thread/wasi-threads/pthread_mutex_timedlock.c
+    musl/src/thread/wasi-threads/pthread_mutex_trylock.c
+    musl/src/thread/wasi-threads/pthread_mutex_unlock.c
+    musl/src/thread/wasi-threads/pthread_once.c
+    musl/src/thread/wasi-threads/pthread_rwlock_rdlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_timedrdlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_timedwrlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_tryrdlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_trywrlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_unlock.c
+    musl/src/thread/wasi-threads/pthread_rwlock_wrlock.c
+    musl/src/thread/wasi-threads/pthread_spin_lock.c
+    musl/src/thread/wasi-threads/pthread_spin_trylock.c
+    musl/src/thread/wasi-threads/pthread_spin_unlock.c
+    musl/src/thread/wasi-threads/sem_destroy.c
+    musl/src/thread/wasi-threads/sem_getvalue.c
+    musl/src/thread/wasi-threads/sem_init.c
+    musl/src/thread/wasi-threads/sem_post.c
+    musl/src/thread/wasi-threads/sem_timedwait.c
+    musl/src/thread/wasi-threads/sem_trywait.c
+    musl/src/thread/wasi-threads/sem_wait.c
+    musl/src/thread/wasi-threads/wasi_thread_start.s
+    musl/src/thread/wasi-threads/__wasilibc_busywait.c
   )
 else()
   # pthreads stubs for single-threaded environment
   list(APPEND top_half_sources
-    ../thread-stub/pthread_barrier_destroy.c
-    ../thread-stub/pthread_barrier_init.c
-    ../thread-stub/pthread_barrier_wait.c
-    ../thread-stub/pthread_cond_broadcast.c
-    ../thread-stub/pthread_cond_destroy.c
-    ../thread-stub/pthread_cond_init.c
-    ../thread-stub/pthread_cond_signal.c
-    ../thread-stub/pthread_cond_timedwait.c
-    ../thread-stub/pthread_cond_wait.c
-    ../thread-stub/pthread_create.c
-    ../thread-stub/pthread_detach.c
-    ../thread-stub/pthread_join.c
-    ../thread-stub/pthread_mutex_consistent.c
-    ../thread-stub/pthread_mutex_getprioceiling.c
-    ../thread-stub/pthread_mutex_lock.c
-    ../thread-stub/pthread_mutex_timedlock.c
-    ../thread-stub/pthread_mutex_trylock.c
-    ../thread-stub/pthread_mutex_unlock.c
-    ../thread-stub/pthread_once.c
-    ../thread-stub/pthread_rwlock_rdlock.c
-    ../thread-stub/pthread_rwlock_timedrdlock.c
-    ../thread-stub/pthread_rwlock_timedwrlock.c
-    ../thread-stub/pthread_rwlock_tryrdlock.c
-    ../thread-stub/pthread_rwlock_trywrlock.c
-    ../thread-stub/pthread_rwlock_unlock.c
-    ../thread-stub/pthread_rwlock_wrlock.c
-    ../thread-stub/pthread_spin_lock.c
-    ../thread-stub/pthread_spin_trylock.c
-    ../thread-stub/pthread_spin_unlock.c
+    musl/src/thread/single-threaded/pthread_barrier_destroy.c
+    musl/src/thread/single-threaded/pthread_barrier_init.c
+    musl/src/thread/single-threaded/pthread_barrier_wait.c
+    musl/src/thread/single-threaded/pthread_cond_broadcast.c
+    musl/src/thread/single-threaded/pthread_cond_destroy.c
+    musl/src/thread/single-threaded/pthread_cond_init.c
+    musl/src/thread/single-threaded/pthread_cond_signal.c
+    musl/src/thread/single-threaded/pthread_cond_timedwait.c
+    musl/src/thread/single-threaded/pthread_cond_wait.c
+    musl/src/thread/single-threaded/pthread_create.c
+    musl/src/thread/single-threaded/pthread_detach.c
+    musl/src/thread/single-threaded/pthread_join.c
+    musl/src/thread/single-threaded/pthread_mutex_consistent.c
+    musl/src/thread/single-threaded/pthread_mutex_getprioceiling.c
+    musl/src/thread/single-threaded/pthread_mutex_lock.c
+    musl/src/thread/single-threaded/pthread_mutex_timedlock.c
+    musl/src/thread/single-threaded/pthread_mutex_trylock.c
+    musl/src/thread/single-threaded/pthread_mutex_unlock.c
+    musl/src/thread/single-threaded/pthread_once.c
+    musl/src/thread/single-threaded/pthread_rwlock_rdlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_timedrdlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_timedwrlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_tryrdlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_trywrlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_unlock.c
+    musl/src/thread/single-threaded/pthread_rwlock_wrlock.c
+    musl/src/thread/single-threaded/pthread_spin_lock.c
+    musl/src/thread/single-threaded/pthread_spin_trylock.c
+    musl/src/thread/single-threaded/pthread_spin_unlock.c
   )
 endif()
 

libc-top-half/musl/src/thread/README.md

@@ -0,0 +1,6 @@
+# pthreads
+
+This directory contains two implementations of the `pthreads` library:
+
+- `wasi-threads` - based on the original musl implementation, used for the `wasm32-wasip1-threads` target; see [`wasi-threads`](https://github.com/WebAssembly/wasi-threads) for details
+- `single-threaded` - used for single-threaded WASIP1 and WASIP2 targets; is never able to spawn new threads, but otherwise follows the letter of the specification