Feature/oals rt shim

.github/workflows/ci.yaml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches: ['**']
+  pull_request:
+    branches: ['**']
+
+jobs:
+  build:
+    name: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install deps (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            cmake ninja-build pkg-config \
+            qt6-base-dev libsndfile1-dev
+
+      - name: Install deps (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew update
+          brew install cmake ninja qt6 libsndfile
+
+      - name: Configure
+        run: |
+          cmake -G Ninja -B build \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_PREFIX_PATH="$(brew --prefix qt6 2>/dev/null || echo /usr)"
+
+      - name: Build
+        run: cmake --build build

.gitignore

@@ -0,0 +1 @@
+**/build/

engine/main.cpp

@@ -18,27 +18,7 @@
 
 #include "OpenAudioNetwork/common/AudioRouter.h"
 #include "OpenAudioNetwork/common/ClockMaster.h"
-
-#include "linux/sched.h"
-
-void set_thread_realtime(uint8_t prio) {
-    sched_param sparams{};
-    sparams.sched_priority = prio;
-
-    if (sched_setscheduler(0, SCHED_FIFO, &sparams) == -1) {
-        std::cerr << "Failed to set thread realtime..." << std::endl;
-    }
-}
-
-void set_running_cpu(int cpu_id) {
-    cpu_set_t cs{};
-    CPU_ZERO(&cs);
-    CPU_SET(cpu_id, &cs);
-
-    if (sched_setaffinity(0, sizeof(cpu_set_t), &cs) != 0) {
-        std::cerr << "Failed to set affinity..." << std::endl;
-    }
-}
+#include <OpenAudioNetwork/netutils/rt.h>
 
 int main(int argc, char* argv[]) {
 
@@ -121,30 +101,26 @@ int main(int argc, char* argv[]) {
     load_plugins(ploader, &plumber, &router, nman.get_net_mapper());
 
     std::thread audiopoll_thread = std::thread([&router]() {
-        set_thread_realtime(25);
-        set_running_cpu(1);
+        oals::rt::set_thread_realtime(25);
+        oals::rt::set_running_cpu(1);
 
         while (true) {
             router.poll_audio_data(false);
         }
     });
 
     std::thread controlpoll_thread = std::thread([&router]() {
-        set_thread_realtime(20);
-        set_running_cpu(1);
+        oals::rt::set_thread_realtime(20);
+        oals::rt::set_running_cpu(1);
 
         while (true) {
             router.poll_control_packets(false);
         }
     });
 
     std::thread pipe_updater = std::thread([&audio_engine, &router]() {
-        set_thread_realtime(80);
-        set_running_cpu(2);
-
-        timespec thread_wait_time{};
-        thread_wait_time.tv_sec = 0;
-        thread_wait_time.tv_nsec = 100;
+        oals::rt::set_thread_realtime(80);
+        oals::rt::set_running_cpu(2);
 
         while (true) {
             router.poll_local_audio_buffer();
@@ -153,20 +129,16 @@ int main(int argc, char* argv[]) {
             // This process is a high-priority realtime process
             // It is a blocking task, to let the other threads run
             // I must add a small wait here
-            clock_nanosleep(CLOCK_MONOTONIC, 0, &thread_wait_time, nullptr);
+            oals::rt::precise_sleep(100);
         }
     });
 
     std::thread clock_syncer = std::thread([&nman]() {
-        set_running_cpu(3);
-
-        timespec thread_wait_time{};
-    thread_wait_time.tv_sec = 0;
-    thread_wait_time.tv_nsec = 10000;
+        oals::rt::set_running_cpu(3);
 
         while (true) {
             nman.clock_master_process();
-            clock_nanosleep(CLOCK_MONOTONIC, 0, &thread_wait_time, nullptr);
+            oals::rt::precise_sleep(10000);
         }
     });
 

io_sim/main.cpp

@@ -8,24 +8,15 @@
 #include <cmath>
 #include <chrono>
 #include <queue>
+#include <ctime>
 
 #include <alsa/asoundlib.h>
 #include <sndfile.h>
 
 #include <OpenAudioNetwork/common/NetworkMapper.h>
 #include <OpenAudioNetwork/common/packet_structs.h>
 #include <OpenAudioNetwork/common/ClockSlave.h>
-
-#include <linux/sched.h>
-
-void set_thread_realtime(uint8_t prio) {
-    sched_param sparams{};
-    sparams.sched_priority = prio;
-
-    if (sched_setscheduler(0, SCHED_FIFO, &sparams) != 0) {
-        std::cerr << "Failed to set thread realtime..." << std::endl;
-    }
-}
+#include <OpenAudioNetwork/netutils/rt.h>
 
 float sig_gen(float f, float gain, int n) {
     constexpr float T = 1.0f / 96000.0f;
@@ -237,11 +228,7 @@ int main(int argc, char* argv[]) {
     playback_thread.detach();
     */
 
-    sched_param params{};
-    params.sched_priority = 99;
-    if (sched_setscheduler(0, SCHED_RR, &params) != 0) {
-        std::cerr << "FAILED TO SET SCHED" << std::endl;
-    }
+    oals::rt::set_process_scheduler_rr(99);
 
     auto wait_base = (long)((AUDIO_DATA_SAMPLES_PER_PACKETS * (1.0f / 96000.0f)) * 1e9);
 
@@ -277,7 +264,7 @@ int main(int argc, char* argv[]) {
         chann++;
     }
 
-    set_thread_realtime(50);
+    oals::rt::set_thread_realtime(50);
 
     std::cout << "START" << std::endl;
 
@@ -301,7 +288,7 @@ int main(int argc, char* argv[]) {
 
         //last_stamp = now;
 
-        clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, nullptr);
+        oals::rt::precise_sleep(ts.tv_nsec);
         ts.tv_nsec = wait_base;
     }