Next attempt on issue #404

eelcocramer · May 27, 2022 · e738fcb · e738fcb
1 parent 1ae137a
commit e738fcb
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/macos/BluetoothWorker.h b/src/macos/BluetoothWorker.h
@@ -39,6 +39,7 @@ BluetoothDeviceResources *res;
     NSLock *writeLock;
     IOReturn writeResult;
     NSTimer *keepAliveTimer;
+    BOOL runLoopIsStopped;
 }
 
 + (id)getInstance: (NSString *) address;

diff --git a/src/macos/BluetoothWorker.mm b/src/macos/BluetoothWorker.mm
@@ -260,6 +260,7 @@ - (void)rfcommChannelWriteComplete:(IOBluetoothRFCOMMChannel*)rfcommChannel refc
 - (void) inquireWithPipe: (pipe_t *)pipe
 {
     @synchronized(self) {
+      runLoopIsStopped = YES;
       inquiryProducer = pipe_producer_new(pipe);
       dispatch_async(worker_queue, ^{
           [self inquiryTask];
@@ -270,11 +271,20 @@ - (void) inquireWithPipe: (pipe_t *)pipe
 /** Worker task to the the inquiry */
 - (void) inquiryTask
 {
+    @autoreleasepool {
   IOBluetoothDeviceInquiry *bdi = [IOBluetoothDeviceInquiry inquiryWithDelegate:self];
-//  bdi.inquiryLength = 30;
+  bdi.inquiryLength = 10;
   [bdi start];
+  fprintf(stderr,"before: %d\n", runLoopIsStopped);
+  NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+  while ( runLoopIsStopped) {
+    NSDate *date = [NSDate distantFuture];
+        [runLoop runMode:NSDefaultRunLoopMode beforeDate:date];
+  }
+  fprintf(stderr,"after\n");
 //  [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 31]];
-//  [bdi stop];
+  [bdi stop];
+    }
 }
 
 /** Get the RFCOMM channel for a given device */
@@ -361,12 +371,14 @@ - (void)rfcommChannelClosed:(IOBluetoothRFCOMMChannel*)rfcommChannel
 /** Called when the device inquiry completes */
 - (void) deviceInquiryComplete: (IOBluetoothDeviceInquiry *) sender error: (IOReturn) error aborted: (BOOL) aborted
 {
+    fprintf(stderr, "complete with aborted = %d\n", aborted);
     @synchronized(self) {
         if (inquiryProducer != NULL) {
             // free the producer so the main thread is signaled that the inquiry has been completed.
             pipe_producer_free(inquiryProducer);
             inquiryProducer = NULL;
         }
+        runLoopIsStopped = NO;
     }
 }