X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/utilsexc.cpp diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp index 624a9c0524..3136b9fd84 100644 --- a/src/mac/utilsexc.cpp +++ b/src/mac/utilsexc.cpp @@ -1,41 +1,129 @@ ///////////////////////////////////////////////////////////////////////////// // Name: utilsexec.cpp // Purpose: Execution-related utilities -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 +// Author: Stefan Csomor +// Modified by: David Elliott +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation +//#pragma implementation #endif +#include "wx/log.h" #include "wx/utils.h" -#ifdef __UNIX__ +#ifdef __DARWIN__ #include "wx/unix/execute.h" +#include +#include +extern "C" { +#include +} +#include #endif #include #include #include -#ifndef __UNIX__ +#ifndef __DARWIN__ #define wxEXECUTE_WIN_MESSAGE 10000 -long wxExecute(const wxString& command, bool sync, wxProcess *handler) +long wxExecute(const wxString& command, int flags, wxProcess *handler) { // TODO + wxFAIL_MSG( _T("wxExecute() not yet implemented") ); return 0; } #endif -#ifdef __UNIX__ -int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) +#ifdef __DARWIN__ +void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data) { - wxFAIL_MSG(wxT("wxAddProcessCallback() function not ready")); - return 0; + wxEndProcessData *proc_data = (wxEndProcessData*)data; + wxLogDebug(wxT("Wow.. this actually worked!")); + int status = 0; + int rc = waitpid(abs(proc_data->pid), &status, WNOHANG); + if(!rc) + { + wxLogDebug(wxT("Mach port was invalidated, but process hasn't terminated!")); + return; + } + if((rc != -1) && WIFEXITED(status)) + proc_data->exitcode = WEXITSTATUS(status); + else + proc_data->exitcode = -1; + wxHandleProcessTermination(proc_data); } -#endif \ No newline at end of file + +int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid) +{ + if(pid < 1) + return -1; + kern_return_t kernResult; + mach_port_t taskOfOurProcess; + mach_port_t machPortForProcess; + taskOfOurProcess = mach_task_self(); + if(taskOfOurProcess == MACH_PORT_NULL) + { + wxLogDebug(wxT("No mach_task_self()")); + return -1; + } + wxLogDebug(wxT("pid=%d"),pid); + kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess); + if(kernResult != KERN_SUCCESS) + { + wxLogDebug(wxT("no task_for_pid()")); + // try seeing if it is already dead or something + // FIXME: a better method would be to call the callback function + // from idle time until the process terminates. Of course, how + // likely is it that it will take more than 0.1 seconds for the + // mach terminate event to make its way to the BSD subsystem? + usleep(100); // sleep for 0.1 seconds + wxMAC_MachPortEndProcessDetect(NULL, (void*)proc_data); + return -1; + } + CFMachPortContext termcb_contextinfo; + termcb_contextinfo.version = NULL; + termcb_contextinfo.info = (void*)proc_data; + termcb_contextinfo.retain = NULL; + termcb_contextinfo.release = NULL; + termcb_contextinfo.copyDescription = NULL; + CFMachPortRef CFMachPortForProcess; + Boolean ShouldFreePort; + CFMachPortForProcess = CFMachPortCreateWithPort(NULL, machPortForProcess, NULL, &termcb_contextinfo, &ShouldFreePort); + if(!CFMachPortForProcess) + { + wxLogDebug(wxT("No CFMachPortForProcess")); + mach_port_deallocate(taskOfOurProcess, machPortForProcess); + return -1; + } + if(ShouldFreePort) + { + kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess); + if(kernResult!=KERN_SUCCESS) + { + wxLogDebug(wxT("Couldn't deallocate mach port")); + return -1; + } + } + CFMachPortSetInvalidationCallBack(CFMachPortForProcess, &wxMAC_MachPortEndProcessDetect); + CFRunLoopSourceRef runloopsource; + runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0); + if(!runloopsource) + { + wxLogDebug(wxT("Couldn't create runloopsource")); + return -1; + } + + CFRelease(CFMachPortForProcess); + + CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode); + CFRelease(runloopsource); + wxLogDebug(wxT("Successfully added notification to the runloop")); + return 0; +} +#endif