[libc] move abs_timesout and monotonicity out of linux dir

bojle · bojle · commit fcb81a33cb8e · 2025-11-28T19:43:15.000+05:30
diff --git a/libc/src/__support/threads/linux/futex_utils.h b/libc/src/__support/threads/linux/futex_utils.h
@@ -16,7 +16,7 @@
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/futex_word.h"
-#include "src/__support/time/linux/abs_timeout.h"
+#include "src/__support/time/abs_timeout.h"
 #include <linux/errno.h>
 #include <linux/futex.h>
 
diff --git a/libc/src/__support/threads/linux/rwlock.h b/libc/src/__support/threads/linux/rwlock.h
@@ -35,7 +35,7 @@
 #endif
 
 #if LIBC_COPT_TIMEOUT_ENSURE_MONOTONICITY
-#include "src/__support/time/linux/monotonicity.h"
+#include "src/__support/time/monotonicity.h"
 #endif
 
 namespace LIBC_NAMESPACE_DECL {
diff --git a/libc/src/__support/time/CMakeLists.txt b/libc/src/__support/time/CMakeLists.txt
@@ -28,3 +28,32 @@ if(TARGET libc.src.__support.time.${LIBC_TARGET_OS}.clock_settime)
       libc.src.__support.time.${LIBC_TARGET_OS}.clock_settime
   )
 endif()
+
+add_header_library(
+  abs_timeout
+  HDRS
+    abs_timeout.h
+  DEPENDS
+    libc.hdr.types.struct_timespec
+    libc.src.__support.time.units
+    libc.src.__support.CPP.expected
+)
+
+add_header_library(
+  clock_conversion
+  HDRS
+    clock_conversion.h
+  DEPENDS
+    .clock_gettime
+    libc.src.__support.time.units
+)
+
+add_header_library(
+  monotonicity
+  HDRS
+    monotonicity.h
+  DEPENDS
+    .clock_conversion
+    .abs_timeout
+    libc.hdr.time_macros
+)
diff --git a/libc/src/__support/time/abs_timeout.h b/libc/src/__support/time/abs_timeout.h
@@ -1,13 +1,13 @@
-//===--- Linux absolute timeout ---------------------------------*- C++ -*-===//
+//===--- absolute timeout ---------------------------------*- C++ -*-===//
 //
 // 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
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_ABS_TIMEOUT_H
-#define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_ABS_TIMEOUT_H
+#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_ABS_TIMEOUT_H
+#define LLVM_LIBC_SRC___SUPPORT_TIME_ABS_TIMEOUT_H
 
 #include "hdr/time_macros.h"
 #include "hdr/types/struct_timespec.h"
@@ -47,4 +47,4 @@ class AbsTimeout {
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_ABS_TIMEOUT_H
+#endif // LLVM_LIBC_SRC___SUPPORT_TIME_ABS_TIMEOUT_H
diff --git a/libc/src/__support/time/linux/CMakeLists.txt b/libc/src/__support/time/linux/CMakeLists.txt
@@ -28,32 +28,3 @@ add_object_library(
     libc.src.__support.error_or
     libc.src.__support.OSUtil.osutil
 )
-
-add_header_library(
-  clock_conversion
-  HDRS
-    clock_conversion.h
-  DEPENDS
-    .clock_gettime
-    libc.src.__support.time.units
-)
-
-add_header_library(
-  abs_timeout
-  HDRS
-    abs_timeout.h
-  DEPENDS
-    libc.hdr.types.struct_timespec
-    libc.src.__support.time.units
-    libc.src.__support.CPP.expected
-)
-
-add_header_library(
-  monotonicity
-  HDRS
-    monotonicity.h
-  DEPENDS
-    .clock_conversion
-    .abs_timeout
-    libc.hdr.time_macros
-)
diff --git a/libc/src/__support/time/monotonicity.h b/libc/src/__support/time/monotonicity.h
@@ -1,19 +1,19 @@
-//===--- timeout linux implementation ---------------------------*- C++ -*-===//
+//===--- timeout implementation ---------------------------*- C++ -*-===//
 //
 // 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
 //
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_MONOTONICITY_H
-#define LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_MONOTONICITY_H
+#ifndef LLVM_LIBC_SRC___SUPPORT_TIME_MONOTONICITY_H
+#define LLVM_LIBC_SRC___SUPPORT_TIME_MONOTONICITY_H
 
 #include "hdr/time_macros.h"
 #include "src/__support/libc_assert.h"
 #include "src/__support/macros/config.h"
+#include "src/__support/time/abs_timeout.h"
 #include "src/__support/time/clock_conversion.h"
-#include "src/__support/time/linux/abs_timeout.h"
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 // This function is separated from abs_timeout.
@@ -41,4 +41,4 @@ LIBC_INLINE void ensure_monotonicity(AbsTimeout &timeout) {
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif // LLVM_LIBC_SRC___SUPPORT_TIME_LINUX_MONOTONICITY_H
+#endif // LLVM_LIBC_SRC___SUPPORT_TIME_MONOTONICITY_H
diff --git a/libc/src/pthread/pthread_rwlock_clockwrlock.cpp b/libc/src/pthread/pthread_rwlock_clockwrlock.cpp
@@ -12,7 +12,7 @@
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/rwlock.h"
-#include "src/__support/time/linux/abs_timeout.h"
+#include "src/__support/time/abs_timeout.h"
 
 #include <pthread.h>
 
diff --git a/libc/src/pthread/pthread_rwlock_timedrdlock.cpp b/libc/src/pthread/pthread_rwlock_timedrdlock.cpp
@@ -13,7 +13,7 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h"
 #include "src/__support/threads/linux/rwlock.h"
-#include "src/__support/time/linux/abs_timeout.h"
+#include "src/__support/time/abs_timeout.h"
 
 #include <pthread.h>
 
diff --git a/libc/src/pthread/pthread_rwlock_timedwrlock.cpp b/libc/src/pthread/pthread_rwlock_timedwrlock.cpp
@@ -13,7 +13,7 @@
 #include "src/__support/macros/config.h"
 #include "src/__support/macros/optimization.h"
 #include "src/__support/threads/linux/rwlock.h"
-#include "src/__support/time/linux/abs_timeout.h"
+#include "src/__support/time/abs_timeout.h"
 
 #include <pthread.h>
 
diff --git a/libc/test/src/__support/threads/darwin/CMakeLists.txt b/libc/test/src/__support/threads/darwin/CMakeLists.txt
@@ -5,5 +5,7 @@ add_libc_test(
   SRCS
     mutex_test.cpp
   DEPENDS
-    libc.src.__support.threads.darwin.mutex
+    libc.src.__support.threads.mutex
+    libc.src.__support.threads.darwin.futex_utils
+    libc.src.__support.time.darwin.clock_gettime
 )
diff --git a/libc/test/src/__support/threads/darwin/mutex_test.cpp b/libc/test/src/__support/threads/darwin/mutex_test.cpp
@@ -6,12 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/threads/darwin/mutex.h"
+#include "src/__support/threads/mutex.h"
+#include "src/__support/threads/raw_mutex.h"
 #include "src/__support/threads/mutex_common.h"
 #include "test/UnitTest/Test.h"
 
 TEST(LlvmLibcSupportThreadsMutexTest, SmokeTest) {
-  LIBC_NAMESPACE::Mutex mutex;
+  LIBC_NAMESPACE::Mutex mutex(0,0,0,0);;
   ASSERT_EQ(mutex.lock(), LIBC_NAMESPACE::MutexError::NONE);
   ASSERT_EQ(mutex.unlock(), LIBC_NAMESPACE::MutexError::NONE);
   ASSERT_EQ(mutex.try_lock(), LIBC_NAMESPACE::MutexError::NONE);
@@ -20,59 +21,4 @@ TEST(LlvmLibcSupportThreadsMutexTest, SmokeTest) {
   ASSERT_EQ(mutex.unlock(), LIBC_NAMESPACE::MutexError::UNLOCK_WITHOUT_LOCK);
 }
 
-// TEST(LlvmLibcSupportThreadsRawMutexTest, Timeout) {
-//   LIBC_NAMESPACE::RawMutex mutex;
-//   ASSERT_TRUE(mutex.lock());
-//   timespec ts;
-//   LIBC_NAMESPACE::internal::clock_gettime(CLOCK_MONOTONIC, &ts);
-//   ts.tv_sec += 1;
-//   // Timeout will be respected when deadlock happens.
-//   auto timeout = LIBC_NAMESPACE::internal::AbsTimeout::from_timespec(ts,
-//   false); ASSERT_TRUE(timeout.has_value());
-//   // The following will timeout
-//   ASSERT_FALSE(mutex.lock(*timeout));
-//   ASSERT_TRUE(mutex.unlock());
-//   // Test that the mutex works after the timeout.
-//   ASSERT_TRUE(mutex.lock());
-//   ASSERT_TRUE(mutex.unlock());
-//   // If a lock can be acquired directly, expired timeout will not count.
-//   // Notice that the timeout is already reached during preivous deadlock.
-//   ASSERT_TRUE(mutex.lock(*timeout));
-//   ASSERT_TRUE(mutex.unlock());
-// }
-//
-// TEST(LlvmLibcSupportThreadsRawMutexTest, PSharedLock) {
-//   struct SharedData {
-//     LIBC_NAMESPACE::RawMutex mutex;
-//     LIBC_NAMESPACE::cpp::Atomic<size_t> finished;
-//     int data;
-//   };
-//   void *addr =
-//       LIBC_NAMESPACE::mmap(nullptr, sizeof(SharedData), PROT_READ |
-//       PROT_WRITE,
-//                            MAP_ANONYMOUS | MAP_SHARED, -1, 0);
-//   ASSERT_NE(addr, MAP_FAILED);
-//   auto *shared = reinterpret_cast<SharedData *>(addr);
-//   shared->data = 0;
-//   LIBC_NAMESPACE::RawMutex::init(&shared->mutex);
-//   // Avoid pull in our own implementation of pthread_t.
-// #ifdef SYS_fork
-//   long pid = LIBC_NAMESPACE::syscall_impl<long>(SYS_fork);
-// #elif defined(SYS_clone)
-//   long pid = LIBC_NAMESPACE::syscall_impl<long>(SYS_clone, SIGCHLD, 0);
-// #endif
-//   for (int i = 0; i < 10000; ++i) {
-//     shared->mutex.lock(LIBC_NAMESPACE::cpp::nullopt, true);
-//     shared->data++;
-//     shared->mutex.unlock(true);
-//   }
-//   // Mark the thread as finished.
-//   shared->finished.fetch_add(1);
-//   // let the child exit early to avoid output pollution
-//   if (pid == 0)
-//     LIBC_NAMESPACE::exit(0);
-//   while (shared->finished.load() != 2)
-//     LIBC_NAMESPACE::sleep_briefly();
-//   ASSERT_EQ(shared->data, 20000);
-//   LIBC_NAMESPACE::munmap(addr, sizeof(SharedData));
-// }
+// TODO(bojle): add other tests a la linux

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ add_libc_test(`
`5`	`5`	`SRCS`
`6`	`6`	`mutex_test.cpp`
`7`	`7`	`DEPENDS`
`8`		`- libc.src.__support.threads.darwin.mutex`
	`8`	`+ libc.src.__support.threads.mutex`
	`9`	`+ libc.src.__support.threads.darwin.futex_utils`
	`10`	`+ libc.src.__support.time.darwin.clock_gettime`
`9`	`11`	`)`