[libc] linux/raw_mutex.h -> raw_mutex.h

Author: bojle

libc/src/__support/threads/CndVar.h

@@ -12,8 +12,8 @@
 #include "hdr/stdint_proxy.h" // uint32_t
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/futex_utils.h" // Futex
-#include "src/__support/threads/linux/raw_mutex.h"   // RawMutex
 #include "src/__support/threads/mutex.h"             // Mutex
+#include "src/__support/threads/raw_mutex.h"         // RawMutex
 
 namespace LIBC_NAMESPACE_DECL {
 

libc/src/__support/threads/linux/CMakeLists.txt

@@ -31,29 +31,13 @@ else()
   set(monotonicity_flags -DLIBC_COPT_TIMEOUT_ENSURE_MONOTONICITY=0)
 endif()
 
-add_header_library(
-  raw_mutex
-  HDRS
-    mutex.h
-  DEPENDS
-    .futex_utils
-    libc.src.__support.threads.sleep
-    libc.src.__support.time.abs_timeout
-    libc.src.__support.time.monotonicity
-    libc.src.__support.CPP.optional
-    libc.hdr.types.pid_t
-  COMPILE_OPTIONS
-    -DLIBC_COPT_RAW_MUTEX_DEFAULT_SPIN_COUNT=${LIBC_CONF_RAW_MUTEX_DEFAULT_SPIN_COUNT}
-    ${monotonicity_flags}
-)
-
 add_header_library(
   rwlock
   HDRS
     rwlock.h
   DEPENDS
     .futex_utils
-    .raw_mutex
+    libc.src.__support.threads.raw_mutex
     libc.src.__support.common
     libc.src.__support.OSUtil.osutil
     libc.src.__support.CPP.limits
@@ -63,16 +47,6 @@ add_header_library(
     ${monotonicity_flags}
 )
 
-add_header_library(
-  mutex
-  HDRS
-    mutex.h
-  DEPENDS
-    .futex_utils
-    .raw_mutex
-    libc.src.__support.threads.mutex_common
-)
-
 add_object_library(
   thread
   SRCS
@@ -119,7 +93,7 @@ add_object_library(
     libc.src.__support.OSUtil.osutil
     libc.src.__support.threads.linux.futex_word_type
     libc.src.__support.threads.mutex
-    libc.src.__support.threads.linux.raw_mutex
+    libc.src.__support.threads.raw_mutex
     libc.src.__support.CPP.mutex
 )
 

libc/src/__support/threads/linux/CndVar.cpp

@@ -8,11 +8,11 @@
 
 #include "src/__support/threads/CndVar.h"
 #include "src/__support/CPP/mutex.h"
-#include "src/__support/OSUtil/syscall.h"           // syscall_impl
+#include "src/__support/OSUtil/syscall.h" // syscall_impl
 #include "src/__support/macros/config.h"
 #include "src/__support/threads/linux/futex_word.h" // FutexWordType
-#include "src/__support/threads/linux/raw_mutex.h"  // RawMutex
 #include "src/__support/threads/mutex.h"            // Mutex
+#include "src/__support/threads/raw_mutex.h"        // RawMutex
 
 #include <sys/syscall.h> // For syscall numbers.
 

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

@@ -22,7 +22,7 @@
 #include "src/__support/threads/identifier.h"
 #include "src/__support/threads/linux/futex_utils.h"
 #include "src/__support/threads/linux/futex_word.h"
-#include "src/__support/threads/linux/raw_mutex.h"
+#include "src/__support/threads/raw_mutex.h"
 #include "src/__support/threads/sleep.h"
 
 #ifndef LIBC_COPT_RWLOCK_DEFAULT_SPIN_COUNT

libc/src/__support/threads/raw_mutex.h

@@ -1,10 +1,10 @@
-//===--- Implementation of the RawMutex class ---------------*- C++ -*-===//
+//===--- Implementation of the RawMutex class -------------------*- 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_THREADS_RAW_MUTEX_H
 #define LLVM_LIBC_SRC___SUPPORT_THREADS_RAW_MUTEX_H
 
@@ -136,4 +136,4 @@ class RawMutex {
 };
 } // namespace LIBC_NAMESPACE_DECL
 
-#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_LINUX_RAW_MUTEX_H
+#endif // LLVM_LIBC_SRC___SUPPORT_THREADS_RAW_MUTEX_H

libc/src/__support/threads/unix_mutex.h

@@ -1,4 +1,4 @@
-//===--- Implementation of a Unix mutex class ------------------*- C++ -*-===//
+//===--- Implementation of a Unix mutex class -------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

libc/src/threads/linux/CMakeLists.txt

@@ -9,7 +9,7 @@ add_header_library(
     libc.src.__support.CPP.mutex
     libc.src.__support.OSUtil.osutil
     libc.src.__support.threads.mutex
-    libc.src.__support.threads.linux.raw_mutex
+    libc.src.__support.threads.raw_mutex
     libc.src.__support.threads.linux.futex_utils
 )
 

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

@@ -62,7 +62,7 @@ add_integration_test(
     libc.src.pthread.pthread_rwlockattr_destroy
     libc.src.pthread.pthread_rwlockattr_setpshared
     libc.src.pthread.pthread_rwlockattr_setkind_np
-    libc.src.__support.threads.linux.raw_mutex
+    libc.src.__support.threads.raw_mutex
     libc.src.stdio.printf
     libc.src.stdlib.getenv
     libc.src.sys.mman.mmap

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

@@ -12,8 +12,8 @@
 #include "src/__support/CPP/new.h"
 #include "src/__support/OSUtil/syscall.h"
 #include "src/__support/macros/config.h"
-#include "src/__support/threads/linux/raw_mutex.h"
 #include "src/__support/threads/linux/rwlock.h"
+#include "src/__support/threads/raw_mutex.h"
 #include "src/__support/threads/sleep.h"
 #include "src/pthread/pthread_create.h"
 #include "src/pthread/pthread_join.h"

libc/test/src/__support/threads/darwin/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_libc_test(
+  mutex_test
+  SUITE
+    libc-support-threads-tests
+  SRCS
+    mutex_test.cpp
+  DEPENDS
+    libc.src.__support.threads.mutex
+    libc.src.__support.threads.darwin.futex_utils
+    libc.src.__support.time.darwin.clock_gettime
+)