diff options
| author | Patrik Nyblom <[email protected]> | 2011-03-02 11:59:26 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-03-02 11:59:36 +0100 |
| commit | 6daf9097abb20ae9fef69f60eb1b994aeaac0baf (patch) | |
| tree | f525c2c564335d9fa7ff4f6677e1ce780fbc498b /lib | |
| parent | aa0552cdf9098742f1998ec174fc9fed749e6f6d (diff) | |
| parent | e12038dc74b081e6b5dfd2b3f266dc01a09ed523 (diff) | |
| download | otp-6daf9097abb20ae9fef69f60eb1b994aeaac0baf.tar.gz otp-6daf9097abb20ae9fef69f60eb1b994aeaac0baf.tar.bz2 otp-6daf9097abb20ae9fef69f60eb1b994aeaac0baf.zip | |
Merge branch 'pan/wx_macos_main_thread' into dev
* pan/wx_macos_main_thread:
Make MacOS (NS) wx use the main thread
OTP-9081
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 31 | ||||
| -rw-r--r-- | lib/wx/c_src/wxe_ps_init.c | 2 |
2 files changed, 30 insertions, 3 deletions
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 |