Removed the actor from PQRSOSXFrontmostApplicationMonitor to ensure that the order of set_callback and trigger does not get reversed.

Author: tekezo

Diff for: include/pqrs/osx/frontmost_application_monitor/monitor.hpp

@@ -26,16 +26,14 @@ class monitor final : public dispatcher::extra::dispatcher_client {
   monitor(const monitor&) = delete;
 
   monitor(std::weak_ptr<dispatcher::dispatcher> weak_dispatcher) : dispatcher_client(weak_dispatcher) {
-    enqueue_to_dispatcher([] {
-      pqrs_osx_frontmost_application_monitor_set_callback(static_cpp_callback);
-    });
+    pqrs_osx_frontmost_application_monitor_set_callback(static_cpp_callback);
   }
 
 public:
   virtual ~monitor(void) {
-    detach_from_dispatcher([] {
-      pqrs_osx_frontmost_application_monitor_unset_callback();
-    });
+    pqrs_osx_frontmost_application_monitor_unset_callback();
+
+    detach_from_dispatcher();
   }
 
   static void initialize_shared_monitor(std::weak_ptr<dispatcher::dispatcher> weak_dispatcher) {

Diff for: src/pqrs/osx/frontmost_application_monitor/PQRSOSXFrontmostApplicationMonitorImpl.swift

@@ -3,11 +3,13 @@
 // (See https://www.boost.org/LICENSE_1_0.txt)
 
 import AppKit
+import os
 
-private actor PQRSOSXFrontmostApplicationMonitor {
+private class PQRSOSXFrontmostApplicationMonitor {
   static let shared = PQRSOSXFrontmostApplicationMonitor()
 
   var callback: pqrs_osx_frontmost_application_monitor_callback?
+  let lock = OSAllocatedUnfairLock()
 
   init() {
     let sharedWorkspace = NSWorkspace.shared
@@ -34,27 +36,31 @@ private actor PQRSOSXFrontmostApplicationMonitor {
       let bundleIdentifier = runningApplication.bundleIdentifier ?? ""
       let path = runningApplication.executableURL?.path ?? ""
 
-      Task.detached {
-        await self.runCallback(bundleIdentifier: bundleIdentifier, path: path)
-      }
+      self.runCallback(bundleIdentifier: bundleIdentifier, path: path)
     }
   }
 
   func setCallback(_ callback: pqrs_osx_frontmost_application_monitor_callback) {
-    self.callback = callback
+    lock.withLock {
+      self.callback = callback
+    }
   }
 
   func unsetCallback() {
-    callback = nil
+    lock.withLock {
+      callback = nil
+    }
   }
 
   func runCallback(bundleIdentifier: String, path: String) {
-    bundleIdentifier.utf8CString.withUnsafeBufferPointer { bundleIdentifierPtr in
-      path.utf8CString.withUnsafeBufferPointer { pathPtr in
-        callback?(
-          bundleIdentifierPtr.baseAddress,
-          pathPtr.baseAddress
-        )
+    lock.withLock {
+      bundleIdentifier.utf8CString.withUnsafeBufferPointer { bundleIdentifierPtr in
+        path.utf8CString.withUnsafeBufferPointer { pathPtr in
+          callback?(
+            bundleIdentifierPtr.baseAddress,
+            pathPtr.baseAddress
+          )
+        }
       }
     }
   }
@@ -73,21 +79,15 @@ private actor PQRSOSXFrontmostApplicationMonitor {
 func PQRSOSXFrontmostApplicationMonitorSetCallback(
   _ callback: pqrs_osx_frontmost_application_monitor_callback
 ) {
-  Task.detached {
-    await PQRSOSXFrontmostApplicationMonitor.shared.setCallback(callback)
-  }
+  PQRSOSXFrontmostApplicationMonitor.shared.setCallback(callback)
 }
 
 @_cdecl("pqrs_osx_frontmost_application_monitor_unset_callback")
 func PQRSOSXFrontmostApplicationMonitorUnsetCallback() {
-  Task.detached {
-    await PQRSOSXFrontmostApplicationMonitor.shared.unsetCallback()
-  }
+  PQRSOSXFrontmostApplicationMonitor.shared.unsetCallback()
 }
 
 @_cdecl("pqrs_osx_frontmost_application_monitor_trigger")
 func PQRSOSXFrontmostApplicationMonitorTrigger() {
-  Task.detached {
-    await PQRSOSXFrontmostApplicationMonitor.shared.runCallbackWithFrontmostApplication()
-  }
+  PQRSOSXFrontmostApplicationMonitor.shared.runCallbackWithFrontmostApplication()
 }

Diff for: tests/src/monitor_test.hpp

@@ -11,7 +11,6 @@ void run_monitor_test(void) {
     auto dispatcher = std::make_shared<pqrs::dispatcher::dispatcher>(time_source);
 
     for (int i = 0; i < 10000; ++i) {
-      printf("%d\n", i);
       auto wait = pqrs::make_thread_wait();
 
       pqrs::osx::frontmost_application_monitor::monitor::initialize_shared_monitor(dispatcher);