X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb68102796280b3e54979ae95738089914ce842..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/utilsexc.mm

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index 7d01c682fc..d54f8af2f5 100644
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        utilsexec.mm
 // Purpose:     Execution-related utilities for wxCocoa
-// Author:      Ryan Norton
+// Author:      Ryan Norton (carbon darwin version based off of Stefan's code)
 // Modified by:
 // Created:     2004-10-05
 // RCS-ID:      $Id$
@@ -9,6 +9,125 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+//#pragma implementation
+#endif
+
+#include "wx/log.h"
+#include "wx/utils.h"
+#ifdef __DARWIN__
+#include "wx/unix/execute.h"
+#include <unistd.h>
+#include <sys/wait.h>
+extern "C" {
+#include <mach/mach.h>
+}
+#include <CoreFoundation/CFMachPort.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __DARWIN__
+
+long wxExecute(const wxString& command, int flags, wxProcess *WXUNUSED(handler))
+{
+    wxFAIL_MSG( _T("wxExecute() not yet implemented") );
+    return 0;
+}
+
+#endif
+
+#ifdef __DARWIN__
+void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
+{
+	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);
+}
+
+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
+
+/*
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -23,6 +142,13 @@
 #import <Foundation/Foundation.h>
 #import <AppKit/NSWorkspace.h>
 
+//
+// RN:  This is a prelimenary implementation - simple
+// launching and process redirection works,
+// but with the piping tests in the exec sample
+// SIGPIPE is triggered...
+//
+
 class wxPipeInputStream : public wxInputStream
 {
 public:
@@ -119,8 +245,8 @@ protected:
 @end
 
 long wxExecute(const wxString& command, 
-                int sync = wxEXEC_ASYNC, 
-                wxProcess *handle = NULL)
+                int sync, 
+                wxProcess *handle)
 {
     NSTask* theTask = [[NSTask alloc] init];
     
@@ -172,4 +298,6 @@ long wxExecute(const wxString& command,
         
         return [theTask terminationStatus];
     }                      
-}
\ No newline at end of file
+}
+
+*/
\ No newline at end of file