Make improvements

- Improve compatibility with Blink virtual machine
- Add non-POSIX APIs for joining threads and signal masks
- Never ever use anything except 32-bit integers for atomics
- Add some `#undef` statements to workaround `ctags` problems
This commit is contained in:
Justine Tunney 2022-11-10 21:52:47 -08:00
parent b46ac13504
commit f2af97711b
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
114 changed files with 902 additions and 363 deletions

View file

@ -22,7 +22,7 @@
#include "libc/testlib/testlib.h"
void SetUpOnce(void) {
ASSERT_SYS(0, 0, pledge("stdio", 0));
ASSERT_SYS(0, 0, pledge("stdio rpath", 0));
}
unsigned P[] = {

View file

@ -22,7 +22,7 @@
#include "libc/testlib/testlib.h"
void SetUpOnce(void) {
ASSERT_SYS(0, 0, pledge("stdio", 0));
ASSERT_SYS(0, 0, pledge("stdio rpath", 0));
}
TEST(_bitreverse, test) {

View file

@ -111,9 +111,10 @@ int Worker(void *arg) {
void TestContendedLock(const char *name, int kind) {
char *stk;
double ns;
int tid, x, i, n = 10000;
errno_t rc;
struct timespec t1, t2;
pthread_mutexattr_t attr;
int tid, x, i, n = 10000;
struct CosmoTib tib = {.tib_self = &tib, .tib_self2 = &tib, .tib_tid = -1};
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, kind);
@ -122,12 +123,13 @@ void TestContendedLock(const char *name, int kind) {
atomic_store(&ready, 0);
atomic_store(&success, 0);
stk = _mapstack();
tid = clone(Worker, stk, GetStackSize() - 16 /* openbsd:stackbound */,
CLONE_VM | CLONE_THREAD | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | CLONE_SETTLS,
0, 0, &tib, &tib.tib_tid);
if (tid == -1) {
kprintf("clone failed: %s\n", strerror(errno));
rc = clone(Worker, stk, GetStackSize() - 16 /* openbsd:stackbound */,
CLONE_VM | CLONE_THREAD | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
CLONE_PARENT_SETTID | CLONE_CHILD_SETTID |
CLONE_CHILD_CLEARTID | CLONE_SETTLS,
0, &tid, &tib, &tib.tib_tid);
if (rc) {
kprintf("clone failed: %s\n", strerror(rc));
_Exit(1);
}
while (!atomic_load(&ready)) donothing;

View file

@ -0,0 +1,72 @@
/*-*- 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/atomic.h"
#include "libc/calls/struct/timespec.h"
#include "libc/intrin/atomic.h"
#include "libc/intrin/intrin.h"
#include "libc/intrin/kprintf.h"
#include "libc/testlib/testlib.h"
#include "libc/thread/thread.h"
#include "third_party/zip/zip.h"
#define THREADS 8
#define ITERATIONS 20000
atomic_int number;
pthread_t th[THREADS];
pthread_spinlock_t lock;
void *SpinWorker(void *arg) {
for (int i = 0; i < ITERATIONS; ++i) {
ASSERT_EQ(0, pthread_spin_lock(&lock));
atomic_store_explicit(
&number, atomic_load_explicit(&number, memory_order_relaxed) + 1,
memory_order_relaxed);
ASSERT_EQ(0, pthread_spin_unlock(&lock));
}
return 0;
}
TEST(pthread_spin_lock, torture) {
int i;
number = 0;
ASSERT_EQ(0, pthread_spin_init(&lock, PTHREAD_PROCESS_PRIVATE));
for (i = 0; i < THREADS; ++i) {
ASSERT_EQ(0, pthread_create(th + i, 0, SpinWorker, 0));
}
for (i = 0; i < THREADS; ++i) {
ASSERT_EQ(0, pthread_join(th[i], 0));
}
ASSERT_EQ(0, pthread_spin_destroy(&lock));
ASSERT_EQ(THREADS * ITERATIONS, number);
}
TEST(pthread_spin_lock, macros) {
ASSERT_EQ(0, pthread_spin_init(&lock, PTHREAD_PROCESS_PRIVATE));
ASSERT_EQ(0, pthread_spin_lock(&lock));
ASSERT_EQ(0, pthread_spin_unlock(&lock));
ASSERT_EQ(0, pthread_spin_destroy(&lock));
}
TEST(pthread_spin_lock, linked) {
ASSERT_EQ(0, (pthread_spin_init)(&lock, PTHREAD_PROCESS_PRIVATE));
ASSERT_EQ(0, (pthread_spin_lock)(&lock));
ASSERT_EQ(0, (pthread_spin_unlock)(&lock));
ASSERT_EQ(0, (pthread_spin_destroy)(&lock));
}

View file

@ -100,9 +100,8 @@ TEST(posix_spawn, torture) {
// XXX: NetBSD doesn't seem to let us set the scheduler to itself ;_;
ASSERT_EQ(0, posix_spawnattr_init(&attr));
ASSERT_EQ(0, posix_spawnattr_setflags(
&attr, POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETSIGDEF |
POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETPGROUP |
POSIX_SPAWN_SETSIGMASK |
&attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGDEF |
POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGMASK |
(IsNetbsd() ? 0 : POSIX_SPAWN_SETSCHEDULER)));
ASSERT_EQ(0, posix_spawnattr_setsigmask(&attr, &allsig));
ASSERT_EQ(0, posix_spawnattr_setsigdefault(&attr, &allsig));

View file

@ -32,7 +32,7 @@
int pfds[2];
pthread_cond_t cv;
pthread_mutex_t mu;
atomic_bool gotcleanup;
atomic_int gotcleanup;
char testlib_enable_tmp_setup_teardown;
void SetUp(void) {
@ -198,7 +198,7 @@ TEST(pthread_cancel, condDeferredWaitDelayed) {
char *wouldleak;
pthread_key_t key;
bool key_destructor_was_run;
atomic_bool is_in_infinite_loop;
atomic_int is_in_infinite_loop;
void KeyDestructor(void *arg) {
CheckStackIsAligned();

View file

@ -201,11 +201,11 @@ TEST(pthread_exit, fromMainThread_whenNoThreadsWereCreated) {
EXITS(0);
}
atomic_bool g_cleanup1;
atomic_bool g_cleanup2;
atomic_int g_cleanup1;
atomic_int g_cleanup2;
void OnCleanup(void *arg) {
*(atomic_bool *)arg = true;
*(atomic_int *)arg = true;
}
void *CleanupExit(void *arg) {
@ -263,10 +263,11 @@ static void CreateDetach(void) {
// this is really fast
static void CreateDetached(void) {
pthread_t th;
pthread_attr_t attr;
ASSERT_EQ(0, pthread_attr_init(&attr));
ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
ASSERT_EQ(0, pthread_create(0, &attr, Increment, 0));
ASSERT_EQ(0, pthread_create(&th, &attr, Increment, 0));
ASSERT_EQ(0, pthread_attr_destroy(&attr));
}

View file

@ -58,10 +58,11 @@ TEST(pthread_detach, testCreateReturn) {
}
TEST(pthread_detach, testDetachUponCreation) {
pthread_t th;
pthread_attr_t attr;
ASSERT_EQ(0, pthread_attr_init(&attr));
ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
ASSERT_EQ(0, pthread_create(0, &attr, Increment, 0));
ASSERT_EQ(0, pthread_create(&th, &attr, Increment, 0));
ASSERT_EQ(0, pthread_attr_destroy(&attr));
while (!pthread_orphan_np()) {
pthread_decimate_np();

View file

@ -38,6 +38,7 @@ void *Worker(void *arg) {
}
TEST(pthread_exit, joinableOrphanedChild_runsAtexitHandlers) {
pthread_t th;
pthread_attr_t attr;
SPAWN(fork);
atexit(OnExit);
@ -45,13 +46,14 @@ TEST(pthread_exit, joinableOrphanedChild_runsAtexitHandlers) {
main_thread = pthread_self();
ASSERT_EQ(0, pthread_attr_init(&attr));
ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE));
ASSERT_EQ(0, pthread_create(0, &attr, Worker, 0));
ASSERT_EQ(0, pthread_create(&th, &attr, Worker, 0));
ASSERT_EQ(0, pthread_attr_destroy(&attr));
pthread_exit(0);
EXITS(CHILD);
}
TEST(pthread_exit, detachedOrphanedChild_runsAtexitHandlers) {
pthread_t th;
pthread_attr_t attr;
SPAWN(fork);
atexit(OnExit);
@ -59,7 +61,7 @@ TEST(pthread_exit, detachedOrphanedChild_runsAtexitHandlers) {
main_thread = pthread_self();
ASSERT_EQ(0, pthread_attr_init(&attr));
ASSERT_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
ASSERT_EQ(0, pthread_create(0, &attr, Worker, 0));
ASSERT_EQ(0, pthread_create(&th, &attr, Worker, 0));
ASSERT_EQ(0, pthread_attr_destroy(&attr));
pthread_exit(0);
EXITS(CHILD);