macOS Support (#3)

* macos
* fix linux build
* combine ci jobs
* no macos-xlarge :/
* fix path
* readme

Author: TheNumbat

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: Build
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+  pull_request:
+jobs:
+  windows:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Configure
+      run: cmake -S . -B build -DRPP_TEST=ON
+    - name: Build
+      run: cmake --build build --config Release
+    - name: Test
+      run: ctest --test-dir build -C Release --output-on-failure
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Install Clang 17
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 17
+    - name: Configure
+      run: CXX=clang++-17 cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DRPP_TEST=ON
+    - name: Build
+      run: cmake --build build -- -j
+    - name: Test
+      run: ctest --test-dir build --output-on-failure
+  macos:
+    runs-on: macos-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Install Clang 17
+      run: brew install llvm@17
+    - name: Configure
+      run: CXX=/usr/local/opt/llvm/bin/clang++ cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DRPP_TEST=ON
+    - name: Build
+      run: cmake --build build -- -j
+    - name: Test
+      run: ctest --test-dir build --output-on-failure

.github/workflows/ubuntu.yml

@@ -33,16 +33,17 @@ To use rpp with another build system, add `rpp` to your include path, add `rpp/r
 
 ## Platform Support
 
-Only the following configurations are supported:
+The following configurations are supported:
 
-| OS      | Compiler    | Arch |
-|---------|-------------|------|
-| Windows | MSVC 19.37+ | x64  |
-| Linux   | Clang 17+   | Any  |
+| OS      | Compiler    | Arch         |
+|---------|-------------|--------------|
+| Windows | MSVC 19.37+ | x64          |
+| Linux   | Clang 17+   | Any          |
+| macOS   | Clang 17+   | x64, aarch64 |
 
 Note that aside from MSVC on Windows, the [gcc vector extensions](https://gcc.gnu.org/onlinedocs/gcc/Vector-Extensions.html) (which are [implemented by clang](https://clang.llvm.org/docs/LanguageExtensions.html#vectors-and-extended-vectors)) are used to implement the SIMD operations. See `rpp/rpp/impl/simd.cpp`.
 
-Other configurations (macOS, GCC, etc.) may be added in the future.
+Other configurations (GCC, etc.) may be added in the future.
 
 ## Examples
 

.github/workflows/windows.yml

@@ -54,10 +54,10 @@ endif()
 
 if(WIN32)
     set(SOURCES_RPP ${SOURCES_RPP} "w32/w32_util.h" "w32/unify.cpp")
-elseif(LINUX)
+elseif(LINUX OR APPLE)
     set(SOURCES_RPP ${SOURCES_RPP} "pos/unify.cpp")
 else()
-    message(FATAL_ERROR "Unsupported platform: only Windows and Linux are supported.")
+    message(FATAL_ERROR "Unsupported OS: only Windows, Linux, and macOS are supported.")
 endif()
 
 add_library(rpp STATIC ${SOURCES_RPP})
@@ -76,7 +76,8 @@ set_property(TARGET rpp PROPERTY INTERPROCEDURAL_OPTIMIZATION
     $<$<CONFIG:Release>:TRUE>
     $<$<CONFIG:MinSizeRel>:TRUE>)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR 
+   CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
     set(CLANG TRUE)
 endif()
 
@@ -103,7 +104,8 @@ if(MSVC)
     target_compile_options(rpp PRIVATE /MP /W4 /GR- /GS- /EHa- /wd4201)
 
 elseif(CLANG)
-    if(CLANG_VERSION_MAJOR LESS 17)
+    if((LINUX AND CLANG_VERSION_MAJOR LESS 17) OR
+       (APPLE AND CMAKE_CXX_COMPILER_VERSION LESS 17))
         message(FATAL_ERROR "Unsupported Clang version: only 17+ is supported.")
     endif()
 

README.md

@@ -251,20 +251,28 @@ struct Event {
 
 #ifdef RPP_OS_WINDOWS
     [[nodiscard]] static Event of_sys(void* event) noexcept;
-#else
+#elif defined RPP_OS_LINUX
     [[nodiscard]] static Event of_sys(i32 fd, i32 mask) noexcept;
+#elif defined RPP_OS_MACOS
+    [[nodiscard]] static Event of_sys(i32 fd, i16 mask) noexcept;
 #endif
 
 private:
 #ifdef RPP_OS_WINDOWS
     Event(void* event) noexcept : event_{event} {
     }
     void* event_ = null;
-#else
+#elif defined RPP_OS_LINUX
     Event(i32 fd, i32 mask) noexcept : fd{fd}, mask{mask} {
     }
     i32 fd = -1;
     i32 mask = 0;
+#elif defined RPP_OS_MACOS
+    Event(i32 fd, i16 mask) noexcept : fd{fd}, mask{mask} {
+    }
+    i32 fd = -1;
+    i32 signal_fd = -1;
+    i16 mask = 0;
 #endif
 };
 

rpp/CMakeLists.txt

@@ -51,8 +51,13 @@
 #define RPP_OS_LINUX
 #include <pthread.h>
 
+#elif defined __APPLE__
+
+#define RPP_OS_MACOS
+#include <pthread.h>
+
 #else
-#error "Unsupported OS: only Windows and Linux are supported."
+#error "Unsupported OS: only Windows, Linux, and macOS are supported."
 #endif
 
 #if defined __x86_64__ || defined _M_X64

rpp/async.h

@@ -11,7 +11,7 @@
 #include <windows.h>
 #endif
 
-#ifdef RPP_OS_LINUX
+#if defined RPP_OS_LINUX || defined RPP_OS_MACOS
 #include <errno.h>
 #include <signal.h>
 #endif
@@ -82,7 +82,12 @@ void debug_break() noexcept {
 [[nodiscard]] String_View sys_error() noexcept {
     constexpr int buffer_size = 256;
     static thread_local char buffer[buffer_size];
+#ifdef RPP_OS_MACOS
+    assert(strerror_r(errno, buffer, buffer_size) == 0);
+    return String_View{buffer};
+#else
     return String_View{strerror_r(errno, buffer, buffer_size)};
+#endif
 }
 
 void debug_break() noexcept {

rpp/base.h

@@ -212,8 +212,7 @@ void Profile::finalize() noexcept {
         }
         finalizers.~Vec();
     }
-    unregister_thread();
-    this_thread.~Thread_Profile();
+    this_thread.finalize();
     {
         Thread::Lock lock(allocs_lock);
         for(auto& prof : allocs) {

rpp/impl/log.cpp

@@ -3,7 +3,7 @@
 
 #include "base.h"
 
-#ifdef RPP_OS_LINUX
+#if defined RPP_OS_LINUX || defined RPP_OS_MACOS 
 #include <netinet/in.h>
 #include <sys/socket.h>
 #endif