fix(leaks): see if other queue reference fixes memleak

doom-fish · Nov 17, 2024 · 471263d · 471263d
1 parent 4959762
commit 471263d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,4 +22,4 @@ jobs:
         run: cargo build --verbose --features ci
       - name: Run Tests
         run: |
-          cargo test
+          cargo test --verbose --features ci
diff --git a/src/stream/content_filter.rs b/src/stream/content_filter.rs
@@ -88,9 +88,9 @@ mod internal {
         }
     }
 }
-pub use internal::SCContentFilterRef;
 #[allow(clippy::module_name_repetitions)]
 pub use internal::SCContentFilter;
+pub use internal::SCContentFilterRef;
 
 use crate::shareable_content::{SCDisplay, SCRunningApplication, SCWindow};
 

diff --git a/src/stream/internal/stream.rs b/src/stream/internal/stream.rs
@@ -1,5 +1,3 @@
-use std::{ffi::c_void, ptr};
-
 use crate::{
     stream::{
         configuration::SCStreamConfiguration, content_filter::SCContentFilter,
@@ -16,7 +14,8 @@ use core_foundation::{
     base::{CFTypeID, TCFType},
     impl_TCFType,
 };
-use dispatch::{Queue, QueuePriority};
+use dispatch::ffi::{dispatch_get_global_queue, DISPATCH_QUEUE_PRIORITY_DEFAULT};
+use std::{ffi::c_void, ptr};
 
 use objc::{class, declare::ClassDecl, msg_send, runtime::Object, sel, sel_impl};
 
@@ -107,14 +106,13 @@ impl SCStream {
         unsafe {
             let error: *mut Object = ptr::null_mut();
             let handler = output_handler::get_handler(handler);
-            let stream_queue = Queue::global(QueuePriority::Low);
-
+            let queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
             let success: bool = match of_type {
                 SCStreamOutputType::Screen => {
-                    msg_send![self.as_CFTypeRef().cast::<Object>(), addStreamOutput: handler type: SCStreamOutputType::Screen sampleHandlerQueue: stream_queue error: error]
+                    msg_send![self.as_CFTypeRef().cast::<Object>(), addStreamOutput: handler type: SCStreamOutputType::Screen sampleHandlerQueue: queue error: error]
                 }
                 SCStreamOutputType::Audio => {
-                    msg_send![self.as_CFTypeRef().cast::<Object>(), addStreamOutput: handler type: SCStreamOutputType::Audio sampleHandlerQueue: stream_queue error: error]
+                    msg_send![self.as_CFTypeRef().cast::<Object>(), addStreamOutput: handler type: SCStreamOutputType::Audio sampleHandlerQueue: queue error: error]
                 }
             };
 

diff --git a/tests/leak_test.rs b/tests/leak_test.rs
@@ -38,7 +38,7 @@ mod leak_tests {
     }
 
     #[test]
-    #[cfg_attr(feature = "ci", ignore)]
+    // #[cfg_attr(feature = "ci", ignore)]
     fn test_if_program_leaks() -> Result<(), Box<dyn Error>> {
         for _ in 0..4 {
             // Create and immediately drop streams