Rewrite wxExecute() implementation under Unix.
This commit changes wxExecute() to handle SIGCHLD to be notified about the child process termination instead of detecting when the file descriptor corresponding to the other end of a pipe opened in the parent process was closed in the child as this was not reliable and could (and did) result in not detecting the termination of the child processes that closed all their file descriptors before exiting. This commit also removes a lot of platform-specific code duplicating the generic event loop sources support and reuses it for wxExecute() purposes too. Final big change is that wxEndProcessData was merged into wxExecuteData and we don't have two similar but quite different classes any more but just one, which is used both to pass the information from wxExecute() to wxAppTraits methods and to store this information until the child termination. Closes #10258. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,9 +21,6 @@
|
||||
#include "wx/apptrait.h"
|
||||
#include "wx/process.h"
|
||||
#include "wx/sysopt.h"
|
||||
#ifdef __UNIX__
|
||||
#include "wx/unix/execute.h"
|
||||
#endif
|
||||
|
||||
#include "wx/gtk/private/timer.h"
|
||||
#include "wx/evtloop.h"
|
||||
@@ -186,39 +183,6 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
|
||||
#endif
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// subprocess routines
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __UNIX__
|
||||
|
||||
extern "C" {
|
||||
static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
|
||||
{
|
||||
wxEndProcessData * const
|
||||
proc_data = static_cast<wxEndProcessData *>(data);
|
||||
|
||||
// child exited, end waiting
|
||||
close(g_io_channel_unix_get_fd(source));
|
||||
|
||||
wxHandleProcessTermination(proc_data);
|
||||
|
||||
// don't call us again!
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
|
||||
{
|
||||
GIOChannel* channel = g_io_channel_unix_new(fd);
|
||||
GIOCondition cond = GIOCondition(G_IO_IN | G_IO_HUP | G_IO_ERR);
|
||||
unsigned id = g_io_add_watch(channel, cond, EndProcessDetector, proc_data);
|
||||
g_io_channel_unref(channel);
|
||||
return int(id);
|
||||
}
|
||||
|
||||
#endif // __UNIX__
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxPlatformInfo-related
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user