X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eebb848a8516e14cb6c23e1c7b9db56af375733f..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/process.cpp diff --git a/src/common/process.cpp b/src/common/process.cpp index 2469953ed2..e57f66688b 100644 --- a/src/common/process.cpp +++ b/src/common/process.cpp @@ -2,13 +2,21 @@ // Name: process.cpp // Purpose: Process termination classes // Author: Guilhem Lavaux -// Modified by: +// Modified by: Vadim Zeitlin to check error codes, added Detach() method // Created: 24/06/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "process.h" #endif @@ -20,26 +28,115 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #include "wx/process.h" +// ---------------------------------------------------------------------------- +// event tables and such +// ---------------------------------------------------------------------------- + +DEFINE_EVENT_TYPE(wxEVT_END_PROCESS) + IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) -wxProcess::wxProcess(wxEvtHandler *parent, int id) +// ============================================================================ +// wxProcess implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxProcess creation +// ---------------------------------------------------------------------------- + +void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect) { - if (parent) - SetNextHandler(parent); + if ( parent ) + SetNextHandler(parent); + + m_id = id; + m_redirect = redirect; - m_id = id; +#if wxUSE_STREAMS + m_inputStream = NULL; + m_errorStream = NULL; + m_outputStream = NULL; +#endif // wxUSE_STREAMS +} + +// ---------------------------------------------------------------------------- +// wxProcess termination +// ---------------------------------------------------------------------------- + +wxProcess::~wxProcess() +{ +#if wxUSE_STREAMS + delete m_inputStream; + delete m_errorStream; + delete m_outputStream; +#endif // wxUSE_STREAMS } void wxProcess::OnTerminate(int pid, int status) { - wxProcessEvent event(m_id, pid, status); + wxProcessEvent event(m_id, pid, status); - ProcessEvent(event); + if ( !ProcessEvent(event) ) + delete this; + //else: the object which processed the event is responsible for deleting + // us! } + +void wxProcess::Detach() +{ + SetNextHandler(NULL); +} + +// ---------------------------------------------------------------------------- +// process IO redirection +// ---------------------------------------------------------------------------- + +#if wxUSE_STREAMS + +void wxProcess::SetPipeStreams(wxInputStream *inputSstream, + wxOutputStream *outputStream, + wxInputStream *errorStream) +{ + m_inputStream = inputSstream; + m_errorStream = errorStream; + m_outputStream = outputStream; +} + +#endif // wxUSE_STREAMS + +// ---------------------------------------------------------------------------- +// process killing +// ---------------------------------------------------------------------------- + +/* static */ +wxKillError wxProcess::Kill(int pid, wxSignal sig) +{ + wxKillError rc; + (void)wxKill(pid, sig, &rc); + + return rc; +} + +/* static */ +bool wxProcess::Exists(int pid) +{ + switch ( wxProcess::Kill(pid, wxSIGNONE) ) + { + case wxKILL_OK: + case wxKILL_ACCESS_DENIED: + return TRUE; + + default: + case wxKILL_ERROR: + case wxKILL_BAD_SIGNAL: + wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") ); + // fall through + + case wxKILL_NO_PROCESS: + return FALSE; + } +} +