ugly fix for warnings when wxUSE_STL==0 not breaking compilation when wxUSE_STL==1

[wxWidgets.git] / src / mac / utilsexc.cpp

diff --git a/src/mac/utilsexc.cpp b/src/mac/utilsexc.cpp
index 699008b38b885ef5d60aaef6a49a932cf51f52ef..dc05dbab9c4cd21e158400eab27d5b6df8ed7018 100644 (file)
--- a/src/mac/utilsexc.cpp
+++ b/src/mac/utilsexc.cpp
@@ -1,21 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        utilsexec.cpp
 // Purpose:     Execution-related utilities
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+//#pragma implementation

 #endif
 
 #endif
 

+#include "wx/log.h"

 #include "wx/utils.h"
 #ifdef __DARWIN__
 #include "wx/unix/execute.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>
 #endif
 
 #include <stdio.h>


@@ -28,14 +35,95 @@
 long wxExecute(const wxString& command, int flags, wxProcess *handler)
 {
     // TODO
 long wxExecute(const wxString& command, int flags, wxProcess *handler)
 {
     // TODO

+    wxFAIL_MSG( _T("wxExecute() not yet implemented") );

     return 0;
 }
 #endif
 
 #ifdef __DARWIN__
     return 0;
 }
 #endif
 
 #ifdef __DARWIN__

-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+void wxMAC_MachPortEndProcessDetect(CFMachPortRef port, void *data)
+{
+       wxEndProcessData *proc_data = (wxEndProcessData*)data;
+       wxLogDebug("Wow.. this actually worked!");
+       int status = 0;
+       int rc = waitpid(abs(proc_data->pid), &status, WNOHANG);
+       if(!rc)
+       {
+               wxLogDebug("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)

 {
 {

-   wxFAIL_MSG( _T("wxAddProcessCallback() function not yet implemented") );
-   return 0;
+    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("No mach_task_self()");
+        return -1;
+    }
+    wxLogDebug("pid=%d",pid);
+    kernResult = task_for_pid(taskOfOurProcess,pid, &machPortForProcess);
+    if(kernResult != KERN_SUCCESS)
+    {
+        wxLogDebug("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("No CFMachPortForProcess");
+        mach_port_deallocate(taskOfOurProcess, machPortForProcess);
+        return -1;
+    }
+    if(ShouldFreePort)
+    {
+        kernResult = mach_port_deallocate(taskOfOurProcess, machPortForProcess);
+        if(kernResult!=KERN_SUCCESS)
+        {
+            wxLogDebug("Couldn't deallocate mach port");
+            return -1;
+        }
+    }
+    CFMachPortSetInvalidationCallBack(CFMachPortForProcess, &wxMAC_MachPortEndProcessDetect);
+    CFRunLoopSourceRef    runloopsource;
+    runloopsource = CFMachPortCreateRunLoopSource(NULL,CFMachPortForProcess, (CFIndex)0);
+    if(!runloopsource)
+    {
+        wxLogDebug("Couldn't create runloopsource");
+        return -1;
+    }
+    
+    CFRelease(CFMachPortForProcess);
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(),runloopsource,kCFRunLoopDefaultMode);
+    CFRelease(runloopsource);
+    wxLogDebug("Successfully added notification to the runloop");
+    return 0;

 }
 #endif
 }
 #endif