X-Git-Url: https://git.saurik.com/apple/libpthread.git/blobdiff_plain/2546420a235d38941a7eed560a8cb61403ecb8e2..c1f56ec94c29e576da2d6d7164bee1bdb2f02471:/tests/pthread_threadid_np.c

diff --git a/tests/pthread_threadid_np.c b/tests/pthread_threadid_np.c
index b8a3f72..9529f26 100644
--- a/tests/pthread_threadid_np.c
+++ b/tests/pthread_threadid_np.c
@@ -1,15 +1,17 @@
 #include <pthread.h>
 #include <pthread/private.h>
 #include <dispatch/dispatch.h>
+#include <sys/wait.h>
+#include <stdlib.h>
 
-#include <darwintest.h>
+#include "darwintest_defaults.h"
 
 extern __uint64_t __thread_selfid( void );
 
-static void *do_test(void * __unused arg)
+static void *do_test(void * arg)
 {
 	uint64_t threadid = __thread_selfid();
-	T_ASSERT_NOTNULL(threadid, NULL);
+	T_ASSERT_NE(threadid, (uint64_t)0, "__thread_selfid()");
 
 	uint64_t pth_threadid = 0;
 	T_ASSERT_POSIX_ZERO(pthread_threadid_np(NULL, &pth_threadid), NULL);
@@ -19,6 +21,9 @@ static void *do_test(void * __unused arg)
 	pth_threadid = _pthread_threadid_self_np_direct();
 	T_EXPECT_EQ(threadid, pth_threadid, "pthread_threadid_np_direct()");
 
+	if (arg) {
+		*(uint64_t *)arg = pth_threadid;
+	}
 	return NULL;
 }
 
@@ -29,9 +34,14 @@ T_DECL(pthread_threadid_np, "pthread_threadid_np",
 	do_test(NULL);
 
 	T_LOG("Pthread");
-	pthread_t pth;
-	T_ASSERT_POSIX_ZERO(pthread_create(&pth, NULL, do_test, NULL), NULL);
-	T_ASSERT_POSIX_ZERO(pthread_join(pth, NULL), NULL);
+	for (int i = 0; i < 100; i++) {
+		uint64_t tid1 = 0, tid2 = 0;
+		pthread_t pth;
+		T_ASSERT_POSIX_ZERO(pthread_create(&pth, NULL, do_test, &tid1), NULL);
+		T_EXPECT_POSIX_ZERO(pthread_threadid_np(pth, &tid2), NULL);
+		T_ASSERT_POSIX_ZERO(pthread_join(pth, NULL), NULL);
+		T_EXPECT_EQ(tid1, tid2, "parent and child agree");
+	}
 
 	T_LOG("Workqueue Thread");
 	dispatch_queue_t dq = dispatch_queue_create("myqueue", NULL);
@@ -42,3 +52,41 @@ T_DECL(pthread_threadid_np, "pthread_threadid_np",
 	dispatch_async(dq, ^{ do_test(NULL); });
 	dispatch_sync(dq, ^{});
 }
+
+T_DECL(pthread_threadid_fork, "pthread_threadid_np post-fork test")
+{
+	uint64_t tid = __thread_selfid();
+	T_ASSERT_NE(tid, (uint64_t)0, "__thread_selfid()");
+
+	uint64_t ptid = 0;
+	T_ASSERT_POSIX_ZERO(pthread_threadid_np(NULL, &ptid), NULL);
+	T_ASSERT_EQ(ptid, tid, NULL);
+
+	pid_t pid = fork();
+	if (pid == 0) {
+		// child
+		uint64_t ntid = __thread_selfid();
+		if (ntid == tid) {
+			T_LOG("FAIL: forked child tid is equal to parent tid");
+			exit(1);
+		}
+
+		uint64_t nptid = 0;
+		if (pthread_threadid_np(NULL, &nptid) != 0) {
+			T_LOG("FAIL: pthread_threadid_np: %d", errno);
+			exit(1);
+		}
+
+		if (nptid != ntid) {
+			T_LOG("FAIL: pthread_threadid_np == tid (expected: %lld == %lld)",
+					nptid, ntid);
+			exit(1);
+		}
+		exit(0);
+	} else {
+		int status;
+		T_ASSERT_EQ(waitpid(pid, &status, 0), pid, NULL);
+		int exitstatus = WEXITSTATUS(status);
+		T_ASSERT_EQ(exitstatus, 0, NULL);
+	}
+}