Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a bit of cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-07 23:21:23 +00:00
parent c846884b38
commit b956262276
2 changed files with 132 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/cocoa/utilsexc.cpp
View File

@@ -1,42 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: utilsexec.cpp
// Purpose: Execution-related utilities
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation
#endif
#include "wx/utils.h"
#ifdef __DARWIN__
#include "wx/unix/execute.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef __DARWIN__
#define wxEXECUTE_WIN_MESSAGE 10000
long wxExecute(const wxString& command, int flags, wxProcess *handler)
{
// TODO
wxFAIL_MSG( _T("wxExecute() not yet implemented") );
return 0;
}
#endif
#ifdef __DARWIN__
int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
{
wxFAIL_MSG( _T("wxAddProcessCallback() not yet implemented") );
return 0;
}
#endif

136
src/cocoa/utilsexc.mm
View File

@@ -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];
}
}
}
*/