From fff4865046794e345c40117a8d827ebfeb4d6338 Mon Sep 17 00:00:00 2001 From: Erik Rigtorp Date: Tue, 17 Nov 2026 10:15:25 -0500 Subject: [PATCH] Fix Android build and add Android/iOS CI jobs --- .github/workflows/ci.yml | 28 ++++++++++++++++++++++++++++ CMakeLists.txt | 4 ++-- flake.nix | 2 +- src/SPSCQueueBenchmark.cpp | 12 ++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7fbd84..bd8a4f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,3 +39,31 @@ jobs: cmake --preset coverage cmake --build --preset coverage ctest --preset coverage + + android: + runs-on: ubuntu-latest + strategy: + matrix: + abi: [arm64-v8a, armeabi-v7a] + steps: + - uses: actions/checkout@v4 + - name: Configure and build (Android ${{ matrix.abi }}) + run: | + NDK_TOOLCHAIN="${ANDROID_NDK_HOME:-${ANDROID_NDK_LATEST_HOME}}/build/cmake/android.toolchain.cmake" + cmake -B build-android -G Ninja \ + -DCMAKE_TOOLCHAIN_FILE="${NDK_TOOLCHAIN}" \ + -DANDROID_ABI="${{ matrix.abi }}" \ + -DANDROID_PLATFORM=android-24 + cmake --build build-android + + ios: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - name: Configure and build (iOS simulator) + run: | + cmake -B build-ios \ + -DCMAKE_SYSTEM_NAME=iOS \ + -DCMAKE_OSX_SYSROOT=iphonesimulator \ + -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO + cmake --build build-ios --config Release diff --git a/CMakeLists.txt b/CMakeLists.txt index ba34c86..1492bdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.24...4.3) project(SPSCQueue - VERSION 2.0.0 + VERSION 2.0.1 HOMEPAGE_URL "https://github.com/rigtorp/SPSCQueue" LANGUAGES CXX ) @@ -43,7 +43,7 @@ if(PROJECT_IS_TOP_LEVEL AND BUILD_TESTING) ) endfunction() - if(UNIX AND NOT APPLE) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") spscqueue_executable(SPSCQueueBenchmark src/SPSCQueueBenchmark.cpp) find_library(RTE_RING_LIBRARY rte_ring) if(RTE_RING_LIBRARY) diff --git a/flake.nix b/flake.nix index b1f1329..49c2e79 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ pkgs = nixpkgs.legacyPackages.${system}; benchmark = pkgs.stdenv.mkDerivation { pname = "spscqueue-benchmark"; - version = "2.0.0"; + version = "2.0.1"; src = ./.; hardeningDisable = ["all"]; diff --git a/src/SPSCQueueBenchmark.cpp b/src/SPSCQueueBenchmark.cpp index 9faaf9e..79cbdc6 100644 --- a/src/SPSCQueueBenchmark.cpp +++ b/src/SPSCQueueBenchmark.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -16,6 +17,10 @@ #include #include +#if defined(__ANDROID__) +#include +#endif + #if __has_include( ) #include #endif @@ -69,6 +74,12 @@ void pinThread(int cpu) { cpu_set_t cpuset; CPU_ZERO(&cpuset); CPU_SET(static_cast(cpu), &cpuset); +#if defined(__ANDROID__) + if (sched_setaffinity(0, sizeof(cpu_set_t), &cpuset) != 0) { + std::cerr << "sched_setaffinity: " << std::strerror(errno) << std::endl; + std::exit(EXIT_FAILURE); + } +#else const int error = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset); if (error != 0) { @@ -76,6 +87,7 @@ void pinThread(int cpu) { << std::endl; std::exit(EXIT_FAILURE); } +#endif } template