test and some fix (WIP)

Author: Yifan Zhu

libc/src/__support/threads/linux/rwlock.h

@@ -129,7 +129,7 @@ class State {
   LIBC_INLINE_VAR static constexpr int PENDING_WRITER_SHIFT = 1;
   LIBC_INLINE_VAR static constexpr int ACTIVE_READER_SHIFT = 2;
   LIBC_INLINE_VAR static constexpr int ACTIVE_WRITER_SHIFT =
-      cpp::numeric_limits<int>::digits - 1;
+      cpp::numeric_limits<int>::digits;
 
   // Bitmasks to access the components of the state.
   LIBC_INLINE_VAR static constexpr int PENDING_READER_BIT =
@@ -156,7 +156,7 @@ class State {
   // Utilities to check the state of the RwLock.
   LIBC_INLINE constexpr bool has_active_writer() const { return state < 0; }
   LIBC_INLINE constexpr bool has_active_reader() const {
-    return state > ACTIVE_READER_COUNT_UNIT;
+    return state >= ACTIVE_READER_COUNT_UNIT;
   }
   LIBC_INLINE constexpr bool has_acitve_owner() const {
     return has_active_reader() || has_active_writer();

libc/test/integration/src/pthread/CMakeLists.txt

@@ -17,6 +17,31 @@ add_integration_test(
     libc.src.pthread.pthread_join
 )
 
+add_integration_test(
+  pthread_rwlock_test
+  SUITE
+    libc-pthread-integration-tests
+  SRCS
+    pthread_rwlock_test.cpp
+  DEPENDS
+    libc.include.pthread
+    libc.include.time
+    libc.include.errno
+    libc.src.pthread.pthread_rwlock_destroy
+    libc.src.pthread.pthread_rwlock_init
+    libc.src.pthread.pthread_rwlock_rdlock
+    libc.src.pthread.pthread_rwlock_tryrdlock
+    libc.src.pthread.pthread_rwlock_timedrdlock
+    libc.src.pthread.pthread_rwlock_wrlock
+    libc.src.pthread.pthread_rwlock_trywrlock
+    libc.src.pthread.pthread_rwlock_timedwrlock
+    libc.src.pthread.pthread_rwlock_unlock
+    libc.src.pthread.pthread_create
+    libc.src.pthread.pthread_join
+    libc.src.time.clock_gettime
+    libc.src.unistd.fork
+)
+
 add_integration_test(
   pthread_test
   SUITE

libc/test/integration/src/pthread/pthread_rwlock_test.cpp

@@ -0,0 +1,48 @@
+//===-- Tests for pthread_rwlock ------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/pthread/pthread_rwlock_destroy.h"
+#include "src/pthread/pthread_rwlock_init.h"
+#include "src/pthread/pthread_rwlock_rdlock.h"
+#include "src/pthread/pthread_rwlock_timedrdlock.h"
+#include "src/pthread/pthread_rwlock_timedwrlock.h"
+#include "src/pthread/pthread_rwlock_tryrdlock.h"
+#include "src/pthread/pthread_rwlock_trywrlock.h"
+#include "src/pthread/pthread_rwlock_unlock.h"
+#include "src/pthread/pthread_rwlock_wrlock.h"
+
+#include "src/pthread/pthread_create.h"
+#include "src/pthread/pthread_join.h"
+
+#include "test/IntegrationTest/test.h"
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdint.h> // uintptr_t
+
+static void smoke_test() {
+  pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_init(&rwlock, nullptr), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_rdlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_tryrdlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_trywrlock(&rwlock), EBUSY);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_unlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_unlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_wrlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_rdlock(&rwlock), EDEADLK);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_wrlock(&rwlock), EDEADLK);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_tryrdlock(&rwlock), EBUSY);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_trywrlock(&rwlock), EBUSY);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_unlock(&rwlock), 0);
+  ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlock_destroy(&rwlock), 0);
+}
+
+TEST_MAIN() {
+  smoke_test();
+  return 0;
+}