Make MacOS (NS) wx use the main thread

4 files changed, 129 insertions, 4 deletions

diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index 17b08a71d4..08a35387f2 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2007-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2011. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -24,6 +24,10 @@
 #include "global.h"
 #include <string.h>
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
 #define ERL_DRV_THR_OPTS_SIZE(LAST_FIELD) \
   (((size_t) &((ErlDrvThreadOpts *) 0)->LAST_FIELD) \
    + sizeof(((ErlDrvThreadOpts *) 0)->LAST_FIELD))
@@ -692,3 +696,56 @@ erl_drv_thread_join(ErlDrvTid tid, void **respp)
 #endif
 }
 
+#if defined(__DARWIN__) && defined(USE_THREADS) && defined(ERTS_SMP)
+extern int erts_darwin_main_thread_pipe[2];
+
+
+int
+erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp)
+{
+    void *dummy;
+    void **x;
+    if (respp == NULL)
+	x = &dummy;
+    else
+	x = respp;
+    read(erts_darwin_main_thread_pipe[0],x,sizeof(void *));
+    return 0;
+}
+
+int
+erl_drv_steal_main_thread(char *name,
+			  ErlDrvTid *tid,
+			  void* (*func)(void*),
+			  void* arg,
+			  ErlDrvThreadOpts *opts)
+{
+    char buff[sizeof(void* (*)(void*)) + sizeof(void *)];
+    int buff_sz = sizeof(void* (*)(void*)) + sizeof(void *);
+    /*struct ErlDrvTid_ *dtid;
+
+    dtid = erts_alloc_fnf(ERTS_ALC_T_DRV_TID,
+			  (sizeof(struct ErlDrvTid_)
+			   + (name ? sys_strlen(name) + 1 : 0)));
+    if (!dtid)
+	return ENOMEM;
+    memset(dtid,0,sizeof(ErlDrvTid_));
+    dtid->tid = (void * ) -1;
+    dtid->drv_thr = 1;
+    dtid->func = func;
+    dtid->arg = arg;
+    dtid->tsd = NULL;
+    dtid->tsd_len = 0;
+    dtid->name = no_name;
+    *tid = (ErlDrvTid) dtid;
+    */
+    *tid = NULL;
+    /* Ignore options and name... */
+    
+    memcpy(buff,&func,sizeof(void* (*)(void*)));
+    memcpy(buff + sizeof(void* (*)(void*)),&arg,sizeof(void *));
+    write(erts_darwin_main_thread_pipe[1],buff,buff_sz);
+    return 0;
+}
+
+#endif
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index bc940d2084..5f38d73359 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -53,6 +53,11 @@
 #define WANT_NONBLOCKING    /* must define this to pull in defs from sys.h */
 #include "sys.h"
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+
 #ifdef USE_THREADS
 #include "erl_threads.h"
 #endif
@@ -2989,11 +2994,25 @@ init_smp_sig_notify(void)
 			NULL,
 			&thr_opts);
 }
+#ifdef __DARWIN__
+
+int erts_darwin_main_thread_pipe[2];
+
+static void initialize_darwin_main_thread_pipe(void) 
+{
+    if (pipe(erts_darwin_main_thread_pipe) < 0) {
+	erl_exit(1,"Fatal error initializing Darwin main thread stealing");
+    }
+}
 
+#endif
 void
 erts_sys_main_thread(void)
 {
     erts_thread_disable_fpe();
+#ifdef __DARWIN__
+    initialize_darwin_main_thread_pipe();
+#endif
     /* Become signal receiver thread... */
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_set_thread_name("signal_receiver");
@@ -3002,6 +3021,27 @@ erts_sys_main_thread(void)
     smp_sig_notify(0); /* Notify initialized */
     while (1) {
 	/* Wait for a signal to arrive... */
+#ifdef __DARWIN__
+	/*
+	 * The wx driver needs to be able to steal the main thread for Cocoa to
+	 * work properly.
+	 */
+	fd_set readfds;
+	int res;
+
+	FD_ZERO(&readfds);
+	FD_SET(erts_darwin_main_thread_pipe[0], &readfds);
+	res = select(erts_darwin_main_thread_pipe[0] + 1, &readfds, NULL, NULL, NULL);
+	if (res > 0 && FD_ISSET(erts_darwin_main_thread_pipe[0],&readfds)) {
+	    void* (*func)(void*);
+	    void* arg;
+	    void *resp;
+	    read(erts_darwin_main_thread_pipe[0],&func,sizeof(void* (*)(void*)));
+	    read(erts_darwin_main_thread_pipe[0],&arg, sizeof(void*));
+	    resp = (*func)(arg);
+	    write(erts_darwin_main_thread_pipe[1],&resp,sizeof(void *));
+	}
+#else
 #ifdef DEBUG
 	int res =
 #else
@@ -3010,6 +3050,7 @@ erts_sys_main_thread(void)
 	    select(0, NULL, NULL, NULL, NULL);
 	ASSERT(res < 0);
 	ASSERT(errno == EINTR);
+#endif
     }
 }
 
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 2a2ec1e40b..365fb691a1 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -78,6 +78,21 @@ extern void erts_thread_disable_fpe(void);
 }
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+#ifdef __DARWIN__
+extern "C" {
+  int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp);
+  int erl_drv_steal_main_thread(char *name,
+				ErlDrvTid *dtid,
+				void* (*func)(void*),
+				void* arg,
+				ErlDrvThreadOpts *opts);
+}
+#endif
+
 void *wxe_main_loop(void * );
 
 /* ************************************************************
@@ -99,8 +114,14 @@ int start_native_gui(wxe_data *sd)
   wxe_batch_locker_c = erl_drv_cond_create((char *)"wxe_batch_locker_c");
   init_caller = driver_connected(sd->port); 
 
-  if((res = erl_drv_thread_create((char *)"wxwidgets",
-				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL)) == 0) {
+#ifdef __DARWIN__
+  res = erl_drv_steal_main_thread((char *)"wxwidgets",
+				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#else
+  res = erl_drv_thread_create((char *)"wxwidgets",
+			      &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#endif
+  if(res == 0) {
     erl_drv_mutex_lock(wxe_status_m);
     for(;wxe_status == WXE_NOT_INITIATED;) {
       erl_drv_cond_wait(wxe_status_c, wxe_status_m);
@@ -120,7 +141,11 @@ void stop_native_gui(wxe_data *sd)
   if(wxe_status == WXE_INITIATED) {
     meta_command(WXE_SHUTDOWN, sd);
   }
+#ifdef __DARWIN__
+  erl_drv_stolen_main_thread_join(wxe_thread, NULL);
+#else
   erl_drv_thread_join(wxe_thread, NULL);
+#endif
   erl_drv_mutex_destroy(wxe_status_m);
   erl_drv_cond_destroy(wxe_status_c);
   erl_drv_mutex_destroy(wxe_batch_locker_m);
@@ -205,7 +230,9 @@ void *wxe_main_loop(void *vpdl)
     /* We are done try to make a clean exit */
     wxe_status = WXE_EXITED;
     driver_pdl_dec_refc(pdl);
+#ifndef __DARWIN__
     erl_drv_thread_exit(NULL);
+#endif
     return NULL;
   } else {
     erl_drv_mutex_lock(wxe_status_m);
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index e787c214bd..a85f751024 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in