Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Added wxAddProcessCallbackForPid function

Browse Source 
- Don't create pipeEndProcDetect on Darwin
- Initialize the wxEndProcessData before installing the callback
- Implement wxAddProcessCallbackForPid for Darwin, the code started life
  as an example from ADC and certainly has its fair share of race
  conditions, but with a few hacks it seems to be working okay.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-03-26 17:46:14 +00:00
parent 9c712743cb
commit c8023fed76
4 changed files with 213 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/unix/utilsunx.cpp
View File

@@ -544,7 +544,7 @@ long wxExecute(wxChar **argv,
wxChar **mb_argv = argv;
#endif // Unicode/ANSI
#if wxUSE_GUI
#if wxUSE_GUI && !defined(__DARWIN__)
// create pipes
wxPipe pipeEndProcDetect;
if ( !pipeEndProcDetect.Create() )
@@ -555,7 +555,7 @@ long wxExecute(wxChar **argv,
return ERROR_RETURN_CODE;
}
#endif // wxUSE_GUI
#endif // wxUSE_GUI && !defined(__DARWIN__)
// pipes for inter process communication
wxPipe pipeIn, // stdin
@@ -606,9 +606,9 @@ long wxExecute(wxChar **argv,
if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write]
|| fd == pipeErr[wxPipe::Write]
#if wxUSE_GUI
#if wxUSE_GUI && !defined(__DARWIN__)
|| fd == pipeEndProcDetect[wxPipe::Write]
#endif // wxUSE_GUI
#endif // wxUSE_GUI && !defined(__DARWIN__)
)
{
// don't close this one, we still need it
@@ -630,12 +630,12 @@ long wxExecute(wxChar **argv,
}
#endif // !__VMS
#if wxUSE_GUI
#if wxUSE_GUI && !defined(__DARWIN__)
// reading side can be safely closed but we should keep the write one
// opened
pipeEndProcDetect.Detach(wxPipe::Write);
pipeEndProcDetect.Close();
#endif // wxUSE_GUI
#endif // wxUSE_GUI && !defined(__DARWIN__)
// redirect stdin, stdout and stderr
if ( pipeIn.IsOk() )
@@ -714,14 +714,9 @@ long wxExecute(wxChar **argv,
#if wxUSE_GUI && !defined(__WXMICROWIN__)
wxEndProcessData *data = new wxEndProcessData;
data->tag = wxAddProcessCallback
(
data,
pipeEndProcDetect.Detach(wxPipe::Read)
);
pipeEndProcDetect.Close();
// wxAddProcessCallback is now (with DARWIN) allowed to call the
// callback function directly if the process terminates before
// the callback can be added to the run loop. Set up the data.
if ( flags & wxEXEC_SYNC )
{
// we may have process for capturing the program output, but it's
@@ -730,7 +725,31 @@ long wxExecute(wxChar **argv,
// sync execution: indicate it by negating the pid
data->pid = -pid;
}
else
{
// async execution, nothing special to do - caller will be
// notified about the process termination if process != NULL, data
// will be deleted in GTK_EndProcessDetector
data->process = process;
data->pid = pid;
}
#if defined(__DARWIN__)
data->tag = wxAddProcessCallbackForPid(data,pid);
#else
data->tag = wxAddProcessCallback
(
data,
pipeEndProcDetect.Detach(wxPipe::Read)
);
pipeEndProcDetect.Close();
#endif // defined(__DARWIN__)
if ( flags & wxEXEC_SYNC )
{
wxBusyCursor bc;
wxWindowDisabler wd;
@@ -756,12 +775,6 @@ long wxExecute(wxChar **argv,
}
else // async execution
{
// async execution, nothing special to do - caller will be
// notified about the process termination if process != NULL, data
// will be deleted in GTK_EndProcessDetector
data->process = process;
data->pid = pid;
return pid;
}
#else // !wxUSE_GUI