Rewrite recursive mutex code

libc/thread/internal.h

@@ -1,15 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_THREAD_INTERNAL_H_
-#define COSMOPOLITAN_LIBC_THREAD_INTERNAL_H_
-#include "libc/thread/thread.h"
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-COSMOPOLITAN_C_START_
-
-hidden extern uint64_t _pthread_key_usage[(PTHREAD_KEYS_MAX + 63) / 64];
-hidden extern pthread_key_dtor _pthread_key_dtor[PTHREAD_KEYS_MAX];
-hidden extern _Thread_local void *_pthread_keys[PTHREAD_KEYS_MAX];
-
-void _pthread_key_destruct(void *[PTHREAD_KEYS_MAX]);
-
-COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_THREAD_INTERNAL_H_ */

libc/thread/posixthread.internal.h

@@ -67,6 +67,10 @@ struct PosixThread {
   pthread_attr_t attr;
 };
 
+hidden extern uint64_t _pthread_key_usage[(PTHREAD_KEYS_MAX + 63) / 64];
+hidden extern pthread_key_dtor _pthread_key_dtor[PTHREAD_KEYS_MAX];
+hidden extern _Thread_local void *_pthread_keys[PTHREAD_KEYS_MAX];
+
 int _pthread_reschedule(struct PosixThread *) hidden;
 int _pthread_setschedparam_freebsd(int, int, const struct sched_param *) hidden;
 void _pthread_free(struct PosixThread *) hidden;
@@ -75,6 +79,7 @@ void _pthread_wait(struct PosixThread *) hidden;
 void _pthread_zombies_add(struct PosixThread *) hidden;
 void _pthread_zombies_decimate(void) hidden;
 void _pthread_zombies_harvest(void) hidden;
+void _pthread_key_destruct(void *[PTHREAD_KEYS_MAX]);
 
 COSMOPOLITAN_C_END_
 #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */

libc/thread/pthread_attr_setschedpolicy.c

@@ -0,0 +1,47 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2022 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/thread/thread.h"
+
+/**
+ * Sets thread scheduler policy attribute, e.g.
+ *
+ *     pthread_t id;
+ *     pthread_attr_t attr;
+ *     pthread_attr_init(&attr);
+ *     struct sched_param pri = {sched_get_priority_min(SCHED_OTHER)};
+ *     pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+ *     pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
+ *     pthread_attr_setschedparam(&attr, &pri);
+ *     pthread_create(&id, &attr, func, 0);
+ *     pthread_attr_destroy(&attr);
+ *     pthread_join(id, 0);
+ *
+ * @param policy may be one of:
+ *     - `SCHED_OTHER` the default policy
+ *     - `SCHED_FIFO` for real-time scheduling (usually needs root)
+ *     - `SCHED_RR` for round-robin scheduling (usually needs root)
+ *     - `SCHED_IDLE` for lowest effort (Linux and FreeBSD only)
+ *     - `SCHED_BATCH` for "batch" style execution of processes if
+ *       supported (Linux), otherwise it's treated as `SCHED_OTHER`
+ * @see sched_setscheduler()
+ */
+int pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy) {
+  attr->schedpolicy = policy;
+  return 0;
+}

libc/thread/pthread_create.c

@@ -36,7 +36,6 @@
 #include "libc/sysv/consts/map.h"
 #include "libc/sysv/consts/prot.h"
 #include "libc/sysv/errfuns.h"
-#include "libc/thread/internal.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/spawn.h"
 #include "libc/thread/thread.h"

libc/thread/pthread_getspecific.c

@@ -17,7 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/thread/internal.h"
+#include "libc/thread/posixthread.internal.h"
+#include "libc/thread/thread.h"
 #include "libc/thread/tls.h"
 
 /**

libc/thread/pthread_key_create.c

@@ -19,7 +19,8 @@
 #include "libc/errno.h"
 #include "libc/nexgen32e/bsr.h"
 #include "libc/runtime/runtime.h"
-#include "libc/thread/internal.h"
+#include "libc/thread/posixthread.internal.h"
+#include "libc/thread/thread.h"
 #include "libc/thread/tls.h"
 
 /**

libc/thread/pthread_key_delete.c

@@ -17,7 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/thread/internal.h"
+#include "libc/thread/posixthread.internal.h"
+#include "libc/thread/thread.h"
 
 /**
  * Deletes TLS slot.

libc/thread/pthread_key_destruct.c

@@ -17,7 +17,7 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/nexgen32e/bsr.h"
-#include "libc/thread/internal.h"
+#include "libc/thread/posixthread.internal.h"
 
 void _pthread_key_destruct(void *key[PTHREAD_KEYS_MAX]) {
   int i, j;

libc/thread/pthread_keys.c

@@ -16,7 +16,7 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/thread/internal.h"
+#include "libc/thread/posixthread.internal.h"
 
 // tls value slots for pthread keys api
 _Thread_local void *_pthread_keys[PTHREAD_KEYS_MAX];

libc/thread/pthread_mutex_destroy.c

@@ -18,8 +18,8 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/assert.h"
 #include "libc/errno.h"
-#include "libc/thread/thread.h"
 #include "libc/str/str.h"
+#include "libc/thread/thread.h"
 
 /**
  * Destroys mutex.
@@ -28,7 +28,7 @@
  * @raise EINVAL if mutex is locked in our implementation
  */
 int pthread_mutex_destroy(pthread_mutex_t *mutex) {
-  if (mutex->lock || mutex->waits) {
+  if (mutex->lock) {
     assert(!"deadlock");
     return EINVAL;
   }

libc/thread/pthread_setspecific.c

@@ -17,8 +17,8 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/errno.h"
-#include "libc/thread/internal.h"
-#include "libc/thread/tls.h"
+#include "libc/thread/posixthread.internal.h"
+#include "libc/thread/thread.h"
 
 /**
  * Sets value of TLS slot for current thread.

libc/thread/pthread_zombies.c

@@ -17,11 +17,11 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/intrin/atomic.h"
-#include "libc/thread/thread.h"
 #include "libc/mem/mem.h"
 #include "libc/runtime/runtime.h"
 #include "libc/thread/posixthread.internal.h"
 #include "libc/thread/spawn.h"
+#include "libc/thread/thread.h"
 
 /**
  * @fileoverview Memory collector for detached threads.

libc/thread/thread.h

@@ -53,9 +53,7 @@ typedef struct pthread_spinlock_s {
 typedef struct pthread_mutex_s {
   char type;
   char pshared;
-  int reent;
   _Atomic(int) lock;
-  _Atomic(int) waits;
 } pthread_mutex_t;
 
 typedef struct pthread_mutexattr_s {