X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46c7e1a1203acb8c85b2f1b0243574634c2afb16..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/unix/execute.h diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h index 25376c0cdd..418fa246d5 100644 --- a/include/wx/unix/execute.h +++ b/include/wx/unix/execute.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/execute.h +// Name: wx/unix/execute.h // Purpose: private details of wxExecute() implementation // Author: Vadim Zeitlin // Id: $Id$ @@ -15,27 +15,22 @@ class WXDLLIMPEXP_FWD_BASE wxProcess; class wxStreamTempInputBuffer; -#if defined(__WXDFB__) || defined(__WXX11__) - #define wxHAS_GENERIC_PROCESS_CALLBACK 1 -#endif - -#ifdef wxHAS_GENERIC_PROCESS_CALLBACK -struct wxEndProcessFDIOHandler; -#endif - -// if pid > 0, the execution is async and the data is freed in the callback -// executed when the process terminates, if pid < 0, the execution is -// synchronous and the caller (wxExecute) frees the data struct wxEndProcessData { + wxEndProcessData() + { + pid = + tag = + exitcode = -1; + process = NULL; + async = false; + } + int pid; // pid of the process int tag; // port dependent value wxProcess *process; // if !NULL: notified on process termination - int exitcode; // the exit code - -#ifdef wxHAS_GENERIC_PROCESS_CALLBACK - wxEndProcessFDIOHandler *fdioHandler; -#endif + int exitcode; // the exit code + bool async; // if true, delete us on process termination }; // struct in which information is passed from wxExecute() to wxAppTraits @@ -52,9 +47,22 @@ struct wxExecuteData #if wxUSE_STREAMS bufOut = bufErr = NULL; + + fdOut = + fdErr = wxPipe::INVALID_FD; #endif // wxUSE_STREAMS } + // get the FD corresponding to the read end of the process end detection + // pipe and close the write one + int GetEndProcReadFD() + { + const int fd = pipeEndProcDetect.Detach(wxPipe::Read); + pipeEndProcDetect.Close(); + return fd; + } + + // wxExecute() flags int flags; @@ -72,6 +80,10 @@ struct wxExecuteData // called bufOut and not bufIn wxStreamTempInputBuffer *bufOut, *bufErr; + + // the corresponding FDs, -1 if not redirected + int fdOut, + fdErr; #endif // wxUSE_STREAMS }; @@ -79,24 +91,4 @@ struct wxExecuteData // callback function and is common to all ports (src/unix/utilsunx.cpp) extern WXDLLIMPEXP_BASE void wxHandleProcessTermination(wxEndProcessData *proc_data); -// This function is called to associate the port-specific callback with the -// child process. The return valus is port-specific. -// -// The file descriptor 'fd' is descriptor of a dummy pipe opened between the -// parent and the child. No data are written to or read from this pipe, its -// sole purpose is that the child process will close it when it terminates and -// the parent will be notified about it if it looks at 'fd' (e.g. using -// select()). -// -// wxAddProcessCallback() does whatever is necessary to ensure that 'fd' is -// periodically (typically every event loop iteration) checked for its status -// and that wxHandleProcessTermination() is called once 'fd' indicates the -// child terminated. -extern WXDLLIMPEXP_CORE int wxAddProcessCallback(wxEndProcessData *proc_data, int fd); - -#if defined(__WXMAC__) || defined(__WXCOCOA__) -// For ports (e.g. DARWIN) which can add callbacks based on the pid -extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid); -#endif - #endif // _WX_UNIX_EXECUTE_H