[PATCH v6 12/12] ntdll: Use CFRunLoopRun to implement sched_run on macOS.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/ntdll/unix/loader.c | 50 ----------------------------------------
 dlls/ntdll/unix/sched.c  | 20 ++++++++++++++++
 2 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index e3316b5a138..f3046f99945 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1999,45 +1999,8 @@ jint JNI_OnLoad( JavaVM *vm, void *reserved )
 #endif  /* __ANDROID__ */
 
 #ifdef __APPLE__
-static void *apple_wine_thread( void *arg )
-{
-    start_main_thread();
-    return NULL;
-}
-
-/***********************************************************************
- *           apple_create_wine_thread
- *
- * Spin off a secondary thread to complete Wine initialization, leaving
- * the original thread for the Mac frameworks.
- *
- * Invoked as a CFRunLoopSource perform callback.
- */
-static void apple_create_wine_thread( void *arg )
-{
-    pthread_t thread;
-    pthread_attr_t attr;
-
-    pthread_attr_init( &attr );
-    pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE );
-    if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1);
-    pthread_attr_destroy( &attr );
-}
-
-
-/***********************************************************************
- *           apple_main_thread
- *
- * Park the process's original thread in a Core Foundation run loop for
- * use by the Mac frameworks, especially receiving and handling
- * distributed notifications.  Spin off a new thread for the rest of the
- * Wine initialization.
- */
 static void apple_main_thread(void)
 {
-    CFRunLoopSourceContext source_context = { 0 };
-    CFRunLoopSourceRef source;
-
     if (!pthread_main_np()) return;
 
 #pragma clang diagnostic push
@@ -2052,19 +2015,6 @@ static void apple_main_thread(void)
      * center scheduled on this thread's run loop.  In theory, it's scheduled
      * in the first thread to ask for it. */
     CFNotificationCenterGetDistributedCenter();
-
-    /* We use this run loop source for two purposes.  First, a run loop exits
-     * if it has no more sources scheduled.  So, we need at least one source
-     * to keep the run loop running.  Second, although it's not critical, it's
-     * preferable for the Wine initialization to not proceed until we know
-     * the run loop is running.  So, we signal our source immediately after
-     * adding it and have its callback spin off the Wine thread. */
-    source_context.perform = apple_create_wine_thread;
-    source = CFRunLoopSourceCreate( NULL, 0, &source_context );
-    CFRunLoopAddSource( CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes );
-    CFRunLoopSourceSignal( source );
-    CFRelease( source );
-    CFRunLoopRun(); /* Should never return, except on error. */
 }
 #endif  /* __APPLE__ */
 
diff --git a/dlls/ntdll/unix/sched.c b/dlls/ntdll/unix/sched.c
index 583f7dee1fe..960187730fc 100644
--- a/dlls/ntdll/unix/sched.c
+++ b/dlls/ntdll/unix/sched.c
@@ -29,7 +29,27 @@
 
 #include "unix_private.h"
 
+#ifdef __APPLE__
+
+#include <CoreFoundation/CoreFoundation.h>
+
+void sched_run(void)
+{
+/*
+    CFRunLoopSourceRef source = CFRunLoopSourceCreate( NULL, 0, NULL );
+    CFRunLoopAddSource( CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes );
+    CFRelease( source );
+*/
+
+    CFRunLoopRun(); /* Should never return, except on error. */
+    assert( 0 );
+}
+
+#else
+
 void sched_run(void)
 {
     for (;;) poll( NULL, 0, -1 );
 }
+
+#endif
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10058