Move r_cleanup_for_tests() to Unix file

Author: lionel-

crates/ark/src/fixtures/dummy_frontend.rs

@@ -10,7 +10,6 @@ use amalthea::fixtures::dummy_frontend::DummyConnection;
 use amalthea::fixtures::dummy_frontend::DummyFrontend;
 
 use crate::interface::SessionMode;
-use crate::interface::CLEANUP_SIGNAL;
 use crate::repos::DefaultRepos;
 
 // There can be only one frontend per process. Needs to be in a mutex because
@@ -66,8 +65,11 @@ impl DummyArkFrontend {
 
     /// Wait for R cleanup to start (indicating shutdown has been initiated).
     /// Panics if cleanup doesn't start within the timeout.
+    #[cfg(unix)]
     #[track_caller]
     pub fn wait_for_cleanup() {
+        use crate::sys::interface::CLEANUP_SIGNAL;
+
         let (lock, cvar) = &CLEANUP_SIGNAL;
         let result = cvar
             .wait_timeout_while(lock.lock().unwrap(), Duration::from_secs(3), |started| {

crates/ark/src/interface.rs

@@ -2616,28 +2616,6 @@ pub unsafe extern "C-unwind" fn r_polled_events() {
     };
 }
 
-// For integration tests
-use std::sync::Condvar;
-pub static CLEANUP_SIGNAL: (Mutex<bool>, Condvar) = (Mutex::new(false), Condvar::new());
-
-#[no_mangle]
-pub extern "C-unwind" fn r_cleanup_for_tests(_save_act: i32, _status: i32, _run_last: i32) {
-    // Signal that cleanup has started
-    let (lock, cvar) = &CLEANUP_SIGNAL;
-
-    let mut started = lock.lock().unwrap();
-    *started = true;
-
-    cvar.notify_all();
-    drop(started);
-
-    // Sleep to give tests time to complete before we panic
-    std::thread::sleep(std::time::Duration::from_secs(5));
-
-    // Fallthrough to R which will call `exit()`. Note that panicking from here
-    // would be UB, we can't panic over a C stack.
-}
-
 // This hook is called like a user onLoad hook but for every package to be
 // loaded in the session
 #[harp::register]

crates/ark/src/sys/unix/interface.rs

@@ -7,6 +7,8 @@
 
 use std::ffi::CStr;
 use std::os::raw::c_char;
+use std::sync::Condvar;
+use std::sync::Mutex;
 
 use libr::ptr_R_Busy;
 use libr::ptr_R_ReadConsole;
@@ -38,6 +40,9 @@ use crate::interface::r_write_console;
 use crate::interface::RMain;
 use crate::signals::initialize_signal_handlers;
 
+// For shutdown signal in integration tests
+pub static CLEANUP_SIGNAL: (Mutex<bool>, Condvar) = (Mutex::new(false), Condvar::new());
+
 pub fn setup_r(args: &Vec<String>) {
     unsafe {
         // Before `Rf_initialize_R()`
@@ -78,10 +83,7 @@ pub fn setup_r(args: &Vec<String>) {
         // condition variable sends a notification, which occurs in this cleanup method
         // that is called during R's shutdown process.
         if stdext::IS_TESTING {
-            libr::set(
-                libr::ptr_R_CleanUp,
-                Some(crate::interface::r_cleanup_for_tests),
-            );
+            libr::set(libr::ptr_R_CleanUp, Some(r_cleanup_for_tests));
         }
 
         // In tests R may be run from various threads. This confuses R's stack
@@ -133,3 +135,21 @@ pub fn run_activity_handlers() {
         }
     }
 }
+
+#[no_mangle]
+pub extern "C-unwind" fn r_cleanup_for_tests(_save_act: i32, _status: i32, _run_last: i32) {
+    // Signal that cleanup has started
+    let (lock, cvar) = &CLEANUP_SIGNAL;
+
+    let mut started = lock.lock().unwrap();
+    *started = true;
+
+    cvar.notify_all();
+    drop(started);
+
+    // Sleep to give tests time to complete before we panic
+    std::thread::sleep(std::time::Duration::from_secs(5));
+
+    // Fallthrough to R which will call `exit()`. Note that panicking from here
+    // would be UB, we can't panic over a C stack.
+}