From 7a138c6d800bf80a6bc60bc5f0f050d2128df9ed Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@gmail.com>
Date: Sun, 29 Jul 2018 15:45:45 +0200
Subject: [PATCH] WIP

---
 lib/libc/gen/arc4random.c       |  2 -
 libexec/ld.elf_so/Makefile      |  2 +-
 minix/lib/libc/sys/_minix_lwp.c | 77 ++++++++++++++++++++++++++++++---
 3 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 33190a62e..b75422736 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -547,12 +547,10 @@ arc4random_initialize(void)
 	if (!arc4random_global.initialized) {
 		if (crypto_core_selftest() != 0)
 			abort();
-#if !defined(__minix)
 		if (pthread_atfork(&arc4random_atfork_prepare,
 			&arc4random_atfork_parent, &arc4random_atfork_child)
 		    != 0)
 			abort();
-#endif /* !defined(__minix) */
 #ifdef _REENTRANT
 		if (thr_keycreate(&arc4random_global.thread_key,
 			&arc4random_tsd_destructor) != 0)
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 0ba3173b6..9281f6d94 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -74,7 +74,7 @@ CLIBOBJ!=	cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
 
 SRCS+=		rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
 		map_object.c load.c search.c headers.c paths.c expand.c \
-		tls.c symver.c diagassert.c
+		tls.c symver.c # diagassert.c
 
 .if ${USE_FORT} == "yes"
 .PATH.c: ${NETBSDSRCDIR}/lib/libc/misc
diff --git a/minix/lib/libc/sys/_minix_lwp.c b/minix/lib/libc/sys/_minix_lwp.c
index 343972b53..2dbf4f007 100644
--- a/minix/lib/libc/sys/_minix_lwp.c
+++ b/minix/lib/libc/sys/_minix_lwp.c
@@ -33,12 +33,18 @@ static int initialized = 0;
 void __minix_setup_main(void);
 void __minix_schedule(int signal __unused);
 
+#define print_dbg(args...) \
+{ \
+	char buffer[200]; \
+	snprintf(buffer, 200, args); \
+	write(2, buffer, strlen(buffer)); \
+}
 #if 0
 #define print(args...) \
 { \
 	char buffer[200]; \
 	snprintf(buffer, 200, args); \
-	write(2, buffer, strlen(buffer)); \
+	write(1, buffer, strlen(buffer)); \
 }
 #else
 #define print(m...) /**/
@@ -113,6 +119,7 @@ _lwp_self(void)
 {
 	return current_thread;
 }
+
 #if 0
 void
 _lwp_makecontext(ucontext_t *context, void (*start_routine)(void *),
@@ -129,6 +136,7 @@ _lwp_makecontext(ucontext_t *context, void (*start_routine)(void *),
 	makecontext(context, start_routine, 1, arg);
 }
 #endif
+
 int
 _lwp_create(const ucontext_t *context, unsigned long flags, lwpid_t *new_lwp)
 {
@@ -174,7 +182,7 @@ _lwp_suspend(lwpid_t lwp)
 	if ((MAX_THREAD_POOL <= lwp) || (lwp < 0)) {
 		return ESRCH;
 	}
-	
+
 	lwp_threads[lwp].flags |= LW_WSUSPEND;
 
 	return 0;
@@ -312,17 +320,76 @@ _lwp_park(clockid_t clock_id, int i, const struct timespec * ts, lwpid_t thread,
 int
 _lwp_wait(lwpid_t wlwp, lwpid_t *rlwp)
 {
+	int nb_lwp = 0;
+	const lwpid_t _lwp = wlwp;
+
 	print("_lwp_wait\n");
+
+	if ((MAX_THREAD_POOL <= wlwp) || (wlwp <= 0)) {
+		errno = ESRCH;
+		return -1;
+	}
+
+	for (size_t i = 0; i < MAX_THREAD_POOL; i++) {
+		if (SLOT_IN_USE == (lwp_threads[i].flags & SLOT_IN_USE)) {
+			nb_lwp++;
+		}
+	}
+
+	if (1 < nb_lwp) {
+		return EDEADLK;
+	}
+
+	if ((0 != wlwp) && (current_thread == wlwp)) {
+		errno = EDEADLK;
+		return -1;
+	}
+
+	if (LWP_DETACHED == (lwp_threads[wlwp].flags & LWP_DETACHED)) {
+		errno = ESRCH;
+		return -1;
+	}
+
+	if (0 == wlwp) {
+		for (size_t i = 0; i < MAX_THREAD_POOL; i++) {
+			if (LWP_DETACHED != (lwp_threads[i].flags & LWP_DETACHED)) {
+				_lwp = i;
+			}
+		}
+	}
+
 	// FIXME
+
+	// Do stuff in _lwp
+	if (NULL != rlwp) {
+		*rlwp = _lwp;
+	}
+
 	return -1;
 }
 
 int
-_lwp_kill(lwpid_t thread, int signal)
+_lwp_kill(lwpid_t lwp, int signal)
 {
 	print("_lwp_kill\n");
-	// FIXME
-	errno = ESRCH;
+
+	if ((MAX_THREAD_POOL <= lwp) || (lwp < 0)) {
+		errno = ESRCH;
+		return -1;
+	}
+
+	if ((0 < signal) || (32 < signal)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (0 == signal) {
+		return 0;
+	}
+
+	// TODO
+	// Need to do something with the signal...
+	errno = EINVAL;
 	return -1;
 }