/////////////////////////////////////////////////////////////////////////////
-// Name: unix/utilsunx.cpp
+// Name: src/unix/utilsunx.cpp
// Purpose: generic Unix implementation of many wx functions
// Author: Vadim Zeitlin
// Id: $Id$
// headers
// ----------------------------------------------------------------------------
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/app.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/app.h"
+#endif
+
+#include "wx/apptrait.h"
+
#include "wx/process.h"
#include "wx/thread.h"
#include "wx/wfstream.h"
+#include "wx/unix/execute.h"
+#include "wx/unix/private.h"
+
+#include <pwd.h>
+
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
+#define HAS_PIPE_INPUT_STREAM (wxUSE_STREAMS && wxUSE_FILE)
+
+#if HAS_PIPE_INPUT_STREAM
+
+// define this to let wxexec.cpp know that we know what we're doing
+#define _WX_USED_BY_WXEXECUTE_
+#include "../common/execcmn.cpp"
+
+#endif // HAS_PIPE_INPUT_STREAM
+
+#if wxUSE_BASE
+
+#if defined(__MWERKS__) && defined(__MACH__)
+ #ifndef WXWIN_OS_DESCRIPTION
+ #define WXWIN_OS_DESCRIPTION "MacOS X"
+ #endif
+ #ifndef HAVE_NANOSLEEP
+ #define HAVE_NANOSLEEP
+ #endif
+ #ifndef HAVE_UNAME
+ #define HAVE_UNAME
+ #endif
+
+ // our configure test believes we can use sigaction() if the function is
+ // available but Metrowekrs with MSL run-time does have the function but
+ // doesn't have sigaction struct so finally we can't use it...
+ #ifdef __MSL__
+ #undef wxUSE_ON_FATAL_EXCEPTION
+ #define wxUSE_ON_FATAL_EXCEPTION 0
+ #endif
+#endif
+
// not only the statfs syscall is called differently depending on platform, but
// one of its incarnations, statvfs(), takes different arguments under
// different platforms and even different versions of the same system (Solaris
#endif // __BSD__/!__BSD__
#define wxStatfs statfs
+
+ #ifndef HAVE_STATFS_DECL
+ // some systems lack statfs() prototype in the system headers (AIX 4)
+ extern "C" int statfs(const char *path, struct statfs *buf);
+ #endif
#endif // HAVE_STATFS
#ifdef HAVE_STATVFS
#define wxStatfs_t WX_STATFS_T
#endif
-#if wxUSE_GUI
- #include "wx/unix/execute.h"
-#endif
-
// SGI signal.h defines signal handler arguments differently depending on
// whether _LANGUAGE_C_PLUS_PLUS is set or not - do set it
#if defined(__SGI__) && !defined(_LANGUAGE_C_PLUS_PLUS)
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <unistd.h>
#include <sys/wait.h>
-#include <pwd.h>
+#include <unistd.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
#include <sys/utsname.h> // for uname()
#endif // HAVE_UNAME
+// Used by wxGetFreeMemory().
+#ifdef __SGI__
+ #include <sys/sysmp.h>
+ #include <sys/sysinfo.h> // for SAGET and MINFO structures
+#endif
+
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
// headers - please add your system here if it is the case for your OS.
// SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
#if !defined(HAVE_USLEEP) && \
- (defined(__SUN__) && !defined(__SunOs_5_6) && \
+ ((defined(__SUN__) && !defined(__SunOs_5_6) && \
!defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
- defined(__osf__) || defined(__EMX__)
+ defined(__osf__) || defined(__EMX__))
extern "C"
{
- #ifdef __SUN__
+ #ifdef __EMX__
+ /* I copied this from the XFree86 diffs. AV. */
+ #define INCL_DOSPROCESS
+ #include <os2.h>
+ inline void usleep(unsigned long delay)
+ {
+ DosSleep(delay ? (delay/1000l) : 1l);
+ }
+ #else // Unix
int usleep(unsigned int usec);
- #else // !Sun
- #ifdef __EMX__
- /* I copied this from the XFree86 diffs. AV. */
- #define INCL_DOSPROCESS
- #include <os2.h>
- inline void usleep(unsigned long delay)
- {
- DosSleep(delay ? (delay/1000l) : 1l);
- }
- #else // !Sun && !EMX
- void usleep(unsigned long usec);
- #endif
- #endif // Sun/EMX/Something else
+ #endif // __EMX__/Unix
};
#define HAVE_USLEEP 1
sleep(nSecs);
}
-void wxUsleep(unsigned long milliseconds)
+void wxMicroSleep(unsigned long microseconds)
{
#if defined(HAVE_NANOSLEEP)
timespec tmReq;
- tmReq.tv_sec = (time_t)(milliseconds / 1000);
- tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
+ tmReq.tv_sec = (time_t)(microseconds / 1000000);
+ tmReq.tv_nsec = (microseconds % 1000000) * 1000;
// we're not interested in remaining time nor in return value
(void)nanosleep(&tmReq, (timespec *)NULL);
#error "usleep() cannot be used in MT programs under Solaris."
#endif // Sun
- usleep(milliseconds * 1000); // usleep(3) wants microseconds
+ usleep(microseconds);
#elif defined(HAVE_SLEEP)
// under BeOS sleep() takes seconds (what about other platforms, if any?)
- sleep(milliseconds * 1000);
+ sleep(microseconds * 1000000);
#else // !sleep function
- #error "usleep() or nanosleep() function required for wxUsleep"
+ #error "usleep() or nanosleep() function required for wxMicroSleep"
#endif // sleep function
}
+void wxMilliSleep(unsigned long milliseconds)
+{
+ wxMicroSleep(milliseconds*1000);
+}
+
// ----------------------------------------------------------------------------
// process management
// ----------------------------------------------------------------------------
-int wxKill(long pid, wxSignal sig, wxKillError *rc)
+int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
{
- int err = kill((pid_t)pid, (int)sig);
+ int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig);
if ( rc )
{
- switch ( errno )
+ switch ( err ? errno : 0 )
{
case 0:
*rc = wxKILL_OK;
#define WXEXECUTE_NARGS 127
+#if defined(__DARWIN__)
+long wxMacExecute(wxChar **argv,
+ int flags,
+ wxProcess *process);
+#endif
+
long wxExecute( const wxString& command, int flags, wxProcess *process )
{
- wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
+ wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") );
+ wxLogDebug(wxString(wxT("Launching: ")) + command);
#if wxUSE_THREADS
// fork() doesn't mix well with POSIX threads: on many systems the program
wxString argument;
const wxChar *cptr = command.c_str();
wxChar quotechar = wxT('\0'); // is arg quoted?
- bool escaped = FALSE;
+ bool escaped = false;
// split the command line in arguments
do
{
- argument=wxT("");
+ argument = wxEmptyString;
quotechar = wxT('\0');
// eat leading whitespace:
{
if ( *cptr == wxT('\\') && ! escaped )
{
- escaped = TRUE;
+ escaped = true;
cptr++;
continue;
}
// all other characters:
argument += *cptr++;
- escaped = FALSE;
+ escaped = false;
// have we reached the end of the argument?
if ( (*cptr == quotechar && ! escaped)
} while(*cptr);
argv[argc] = NULL;
+ long lRc;
+#if defined(__DARWIN__)
+ // wxMacExecute only executes app bundles.
+ // It returns an error code if the target is not an app bundle, thus falling
+ // through to the regular wxExecute for non app bundles.
+ lRc = wxMacExecute(argv, flags, process);
+ if( lRc != ((flags & wxEXEC_SYNC) ? -1 : 0))
+ return lRc;
+#endif
+
// do execute the command
- long lRc = wxExecute(argv, flags, process);
+ lRc = wxExecute(argv, flags, process);
// clean up
argc = 0;
bool wxShell(const wxString& command, wxArrayString& output)
{
- wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );
+ wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );
return wxExecute(wxMakeShellCommand(command), output);
}
default:
wxFAIL_MSG( _T("unknown wxShutdown() flag") );
- return FALSE;
+ return false;
}
return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
}
-
-#if wxUSE_GUI
-
-void wxHandleProcessTermination(wxEndProcessData *proc_data)
-{
- // notify user about termination if required
- if ( proc_data->process )
- {
- proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);
- }
-
- // clean up
- if ( proc_data->pid > 0 )
- {
- delete proc_data;
- }
- else
- {
- // let wxExecute() know that the process has terminated
- proc_data->pid = 0;
- }
-}
-
-#endif // wxUSE_GUI
-
// ----------------------------------------------------------------------------
// wxStream classes to support IO redirection in wxExecute
// ----------------------------------------------------------------------------
-#if wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// wxPipeInputStream: stream for reading from a pipe
-// ----------------------------------------------------------------------------
-
-class wxPipeInputStream : public wxFileInputStream
-{
-public:
- wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
-
- // return TRUE if the pipe is still opened
- bool IsOpened() const { return !Eof(); }
-
- // return TRUE if we have anything to read, don't block
- virtual bool CanRead() const;
-};
+#if HAS_PIPE_INPUT_STREAM
bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
- return FALSE;
+ return false;
// check if there is any input available
struct timeval tv;
const int fd = m_file->fd();
fd_set readfds;
- FD_ZERO(&readfds);
- FD_SET(fd, &readfds);
+
+ wxFD_ZERO(&readfds);
+ wxFD_SET(fd, &readfds);
+
switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
{
case -1:
// fall through
case 0:
- return FALSE;
+ return false;
default:
wxFAIL_MSG(_T("unexpected select() return value"));
}
}
-// define this to let wxexec.cpp know that we know what we're doing
-#define _WX_USED_BY_WXEXECUTE_
-#include "../common/execcmn.cpp"
-
-#endif // wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// wxPipe: this encapsulates pipe() system call
-// ----------------------------------------------------------------------------
-
-class wxPipe
-{
-public:
- // the symbolic names for the pipe ends
- enum Direction
- {
- Read,
- Write
- };
-
- enum
- {
- INVALID_FD = -1
- };
-
- // default ctor doesn't do anything
- wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; }
-
- // create the pipe, return TRUE if ok, FALSE on error
- bool Create()
- {
- if ( pipe(m_fds) == -1 )
- {
- wxLogSysError(_("Pipe creation failed"));
-
- return FALSE;
- }
-
- return TRUE;
- }
-
- // return TRUE if we were created successfully
- bool IsOk() const { return m_fds[Read] != INVALID_FD; }
-
- // return the descriptor for one of the pipe ends
- int operator[](Direction which) const
- {
- wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
- _T("invalid pipe index") );
-
- return m_fds[which];
- }
-
- // detach a descriptor, meaning that the pipe dtor won't close it, and
- // return it
- int Detach(Direction which)
- {
- wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
- _T("invalid pipe index") );
-
- int fd = m_fds[which];
- m_fds[which] = INVALID_FD;
-
- return fd;
- }
-
- // close the pipe descriptors
- void Close()
- {
- for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
- {
- if ( m_fds[n] != INVALID_FD )
- close(m_fds[n]);
- }
- }
-
- // dtor closes the pipe descriptors
- ~wxPipe() { Close(); }
-
-private:
- int m_fds[2];
-};
+#endif // HAS_PIPE_INPUT_STREAM
// ----------------------------------------------------------------------------
// wxExecute: the real worker function
// ----------------------------------------------------------------------------
-#ifdef __VMS
- #pragma message disable codeunreachable
-#endif
-
-long wxExecute(wxChar **argv,
- int flags,
- wxProcess *process)
+long wxExecute(wxChar **argv, int flags, wxProcess *process)
{
// for the sync execution, we return -1 to indicate failure, but for async
// case we return 0 which is never a valid PID
wxChar **mb_argv = argv;
#endif // Unicode/ANSI
-#if wxUSE_GUI
+ // we want this function to work even if there is no wxApp so ensure that
+ // we have a valid traits pointer
+ wxConsoleAppTraits traitsConsole;
+ wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ if ( !traits )
+ traits = &traitsConsole;
+
+ // this struct contains all information which we pass to and from
+ // wxAppTraits methods
+ wxExecuteData execData;
+ execData.flags = flags;
+ execData.process = process;
+
// create pipes
- wxPipe pipeEndProcDetect;
- if ( !pipeEndProcDetect.Create() )
+ if ( !traits->CreateEndProcessPipe(execData) )
{
wxLogError( _("Failed to execute '%s'\n"), *argv );
return ERROR_RETURN_CODE;
}
-#endif // wxUSE_GUI
// pipes for inter process communication
wxPipe pipeIn, // stdin
// start an xterm executing it.
if ( !(flags & wxEXEC_SYNC) )
{
- for ( int fd = 0; fd < FD_SETSIZE; fd++ )
+ // FD_SETSIZE is unsigned under BSD, signed under other platforms
+ // so we need a cast to avoid warnings on all platforms
+ for ( int fd = 0; fd < (int)FD_SETSIZE; fd++ )
{
if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write]
|| fd == pipeErr[wxPipe::Write]
-#if wxUSE_GUI
- || fd == pipeEndProcDetect[wxPipe::Write]
-#endif // wxUSE_GUI
- )
+ || traits->IsWriteFDOfEndProcessPipe(execData, fd) )
{
// don't close this one, we still need it
continue;
}
#endif // !__VMS
-#if wxUSE_GUI
// reading side can be safely closed but we should keep the write one
// opened
- pipeEndProcDetect.Detach(wxPipe::Write);
- pipeEndProcDetect.Close();
-#endif // wxUSE_GUI
+ traits->DetachWriteFDOfEndProcessPipe(execData);
// redirect stdin, stdout and stderr
if ( pipeIn.IsOk() )
execvp (*mb_argv, mb_argv);
fprintf(stderr, "execvp(");
- for ( char **ppc = mb_argv; *ppc; ppc++ )
- fprintf(stderr, "%s%s", ppc == mb_argv ? "" : ", ", *ppc);
+ // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O
+ for ( char **ppc_ = mb_argv; *ppc_; ppc_++ )
+ fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_);
fprintf(stderr, ") failed with error %d!\n", errno);
// there is no return after successful exec()
{
ARGS_CLEANUP;
+ // save it for WaitForChild() use
+ execData.pid = pid;
+
// prepare for IO redirection
-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM
// the input buffer bufOut is connected to stdout, this is why it is
// called bufOut and not bufIn
wxStreamTempInputBuffer bufOut,
bufErr;
-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM
if ( process && process->IsRedirected() )
{
-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM
wxOutputStream *inStream =
new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
bufOut.Init(outStream);
bufErr.Init(errStream);
-#endif // wxUSE_STREAMS
+
+ execData.bufOut = &bufOut;
+ execData.bufErr = &bufErr;
+#endif // HAS_PIPE_INPUT_STREAM
}
if ( pipeIn.IsOk() )
pipeErr.Close();
}
-#if wxUSE_GUI && !defined(__WXMICROWIN__)
- wxEndProcessData *data = new wxEndProcessData;
-
- data->tag = wxAddProcessCallback
- (
- data,
- pipeEndProcDetect.Detach(wxPipe::Read)
- );
-
- pipeEndProcDetect.Close();
-
- if ( flags & wxEXEC_SYNC )
- {
- // we may have process for capturing the program output, but it's
- // not used in wxEndProcessData in the case of sync execution
- data->process = NULL;
-
- // sync execution: indicate it by negating the pid
- data->pid = -pid;
-
- wxBusyCursor bc;
- wxWindowDisabler wd;
-
- // data->pid will be set to 0 from GTK_EndProcessDetector when the
- // process terminates
- while ( data->pid != 0 )
- {
-#if wxUSE_STREAMS
- bufOut.Update();
- bufErr.Update();
-#endif // wxUSE_STREAMS
-
- // give GTK+ a chance to call GTK_EndProcessDetector here and
- // also repaint the GUI
- wxYield();
- }
-
- int exitcode = data->exitcode;
-
- delete data;
-
- return exitcode;
- }
- else // async execution
- {
- // async execution, nothing special to do - caller will be
- // notified about the process termination if process != NULL, data
- // will be deleted in GTK_EndProcessDetector
- data->process = process;
- data->pid = pid;
-
- return pid;
- }
-#else // !wxUSE_GUI
-
- wxASSERT_MSG( flags & wxEXEC_SYNC,
- wxT("async execution not supported yet") );
-
- int exitcode = 0;
- if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
- {
- wxLogSysError(_("Waiting for subprocess termination failed"));
- }
-
- return exitcode;
-#endif // wxUSE_GUI
+ return traits->WaitForChild(execData);
}
+#if !defined(__VMS) && !defined(__INTEL_COMPILER)
return ERROR_RETURN_CODE;
-}
-
-#ifdef __VMS
- #pragma message enable codeunreachable
#endif
+}
#undef ERROR_RETURN_CODE
#undef ARGS_CLEANUP
const wxChar* wxGetHomeDir( wxString *home )
{
- *home = wxGetUserHome( wxString() );
+ *home = wxGetUserHome( wxEmptyString );
wxString tmp;
- if ( home->IsEmpty() )
+ if ( home->empty() )
*home = wxT("/");
#ifdef __VMS
tmp = *home;
// network and user id routines
// ----------------------------------------------------------------------------
+// private utility function which returns output of the given command, removing
+// the trailing newline
+static wxString wxGetCommandOutput(const wxString &cmd)
+{
+ FILE *f = popen(cmd.ToAscii(), "r");
+ if ( !f )
+ {
+ wxLogSysError(_T("Executing \"%s\" failed"), cmd.c_str());
+ return wxEmptyString;
+ }
+
+ wxString s;
+ char buf[256];
+ while ( !feof(f) )
+ {
+ if ( !fgets(buf, sizeof(buf), f) )
+ break;
+
+ s += wxString::FromAscii(buf);
+ }
+
+ pclose(f);
+
+ if ( !s.empty() && s.Last() == _T('\n') )
+ s.RemoveLast();
+
+ return s;
+}
+
// retrieve either the hostname or FQDN depending on platform (caller must
// check whether it's one or the other, this is why this function is for
// private use only)
static bool wxGetHostNameInternal(wxChar *buf, int sz)
{
- wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") );
+ wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") );
*buf = wxT('\0');
#else // no uname, no gethostname
wxFAIL_MSG(wxT("don't know host name for this machine"));
- bool ok = FALSE;
+ bool ok = false;
#endif // uname/gethostname
if ( !ok )
{
wxLogSysError(_("Cannot get the official hostname"));
- ok = FALSE;
+ ok = false;
}
else
{
if ((who = getpwuid(getuid ())) != NULL)
{
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGetUserName(wxChar *buf, int sz)
#else // !HAVE_PW_GECOS
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-#ifndef __WXMAC__
-wxString wxGetOsDescription()
+bool wxIsPlatform64Bit()
{
-#ifndef WXWIN_OS_DESCRIPTION
- #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
- return wxString::FromAscii( WXWIN_OS_DESCRIPTION );
-#endif
+ wxString machine = wxGetCommandOutput(wxT("uname -m"));
+
+ // NOTE: these tests are not 100% reliable!
+ return machine.Contains(wxT("AMD64")) ||
+ machine.Contains(wxT("IA64")) ||
+ machine.Contains(wxT("x64")) ||
+ machine.Contains(wxT("X64")) ||
+ machine.Contains(wxT("alpha")) ||
+ machine.Contains(wxT("hppa64")) ||
+ machine.Contains(wxT("ppc64"));
}
-#endif
-// this function returns the GUI toolkit version in GUI programs, but OS
-// version in non-GUI ones
-#if !wxUSE_GUI
+// these functions are in mac/utils.cpp for wxMac
+#ifndef __WXMAC__
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
+ // get OS version
int major, minor;
- char name[256];
-
- if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
+ wxString release = wxGetCommandOutput(wxT("uname -r"));
+ if ( !release.empty() && wxSscanf(release, wxT("%d.%d"), &major, &minor) != 2 )
{
- // unreckognized uname string format
- major = minor = -1;
+ // unrecognized uname string format
+ major =
+ minor = -1;
}
- if ( majorVsn )
- *majorVsn = major;
- if ( minorVsn )
- *minorVsn = minor;
+ if ( verMaj )
+ *verMaj = major;
+ if ( verMin )
+ *verMin = minor;
+
+ // try to understand which OS are we running
+ wxString kernel = wxGetCommandOutput(wxT("uname -s"));
+ if ( kernel.empty() )
+ kernel = wxGetCommandOutput(wxT("uname -o"));
+
+ if ( kernel.empty() )
+ return wxOS_UNKNOWN;
+
+ return wxPlatformInfo::GetOperatingSystemId(kernel);
+}
- return wxUNIX;
+wxString wxGetOsDescription()
+{
+ return wxGetCommandOutput(wxT("uname -s -r -m"));
}
-#endif // !wxUSE_GUI
+#endif // !__WXMAC__
unsigned long wxGetProcessId()
{
return (unsigned long)getpid();
}
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
#if defined(__LINUX__)
// get it from /proc/meminfo
char buf[1024];
if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
{
- long memTotal, memUsed;
- sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+ // /proc/meminfo changed its format in kernel 2.6
+ if ( wxPlatformInfo().CheckOSVersion(2, 6) )
+ {
+ unsigned long cached, buffers;
+ sscanf(buf, "MemFree: %ld", &memFree);
+
+ fgets(buf, WXSIZEOF(buf), fp);
+ sscanf(buf, "Buffers: %lu", &buffers);
+
+ fgets(buf, WXSIZEOF(buf), fp);
+ sscanf(buf, "Cached: %lu", &cached);
+
+ // add to "MemFree" also the "Buffers" and "Cached" values as
+ // free(1) does as otherwise the value never makes sense: for
+ // kernel 2.6 it's always almost 0
+ memFree += buffers + cached;
+
+ // values here are always expressed in kB and we want bytes
+ memFree *= 1024;
+ }
+ else // Linux 2.4 (or < 2.6, anyhow)
+ {
+ long memTotal, memUsed;
+ sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+ }
}
fclose(fp);
- return memFree;
+ return (wxMemorySize)memFree;
}
#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
- return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
+ return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
+#elif defined(__SGI__)
+ struct rminfo realmem;
+ if ( sysmp(MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0 )
+ return ((wxMemorySize)realmem.physmem * sysconf(_SC_PAGESIZE));
//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
#endif
return -1;
}
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
{
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
// the case to "char *" is needed for AIX 4.3
{
wxLogSysError( wxT("Failed to get file system statistics") );
- return FALSE;
+ return false;
}
// under Solaris we also have to use f_frsize field instead of f_bsize
// which is in general a multiple of f_frsize
#ifdef HAVE_STATVFS
- wxLongLong blockSize = fs.f_frsize;
+ wxDiskspaceSize_t blockSize = fs.f_frsize;
#else // HAVE_STATFS
- wxLongLong blockSize = fs.f_bsize;
+ wxDiskspaceSize_t blockSize = fs.f_bsize;
#endif // HAVE_STATVFS/HAVE_STATFS
if ( pTotal )
{
- *pTotal = wxLongLong(fs.f_blocks) * blockSize;
+ *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize;
}
if ( pFree )
{
- *pFree = wxLongLong(fs.f_bavail) * blockSize;
+ *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize;
}
- return TRUE;
+ return true;
#else // !HAVE_STATFS && !HAVE_STATVFS
- return FALSE;
+ return false;
#endif // HAVE_STATFS
}
// wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var);
if ( !p )
- return FALSE;
+ return false;
if ( value )
{
*value = p;
}
- return TRUE;
+ return true;
}
bool wxSetEnv(const wxString& variable, const wxChar *value)
s << _T('=') << value;
// transform to ANSI
- const char *p = s.mb_str();
+ const wxWX2MBbuf p = s.mb_str();
// the string will be free()d by libc
char *buf = (char *)malloc(strlen(p) + 1);
return putenv(buf) == 0;
#else // no way to set an env var
- return FALSE;
+ return false;
#endif
}
bool wxHandleFatalExceptions(bool doit)
{
// old sig handlers
- static bool s_savedHandlers = FALSE;
+ static bool s_savedHandlers = false;
static struct sigaction s_handlerFPE,
s_handlerILL,
s_handlerBUS,
s_handlerSEGV;
- bool ok = TRUE;
+ bool ok = true;
if ( doit && !s_savedHandlers )
{
// install the signal handler
wxLogDebug(_T("Failed to install our signal handler."));
}
- s_savedHandlers = TRUE;
+ s_savedHandlers = true;
}
else if ( s_savedHandlers )
{
wxLogDebug(_T("Failed to uninstall our signal handler."));
}
- s_savedHandlers = FALSE;
+ s_savedHandlers = false;
}
//else: nothing to do
#endif // wxUSE_ON_FATAL_EXCEPTION
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
// ----------------------------------------------------------------------------
-// error and debug output routines (deprecated, use wxLog)
+// wxExecute support
// ----------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY_2_2
+// Darwin doesn't use the same process end detection mechanisms so we don't
+// need wxExecute-related helpers for it
+#if !(defined(__DARWIN__) && defined(__WXMAC__))
+
+bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
+{
+ return execData.pipeEndProcDetect.Create();
+}
+
+bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
+{
+ return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
+}
+
+void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)
+{
+ execData.pipeEndProcDetect.Detach(wxPipe::Write);
+ execData.pipeEndProcDetect.Close();
+}
+
+#else // !Darwin
+
+bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+{
+ return true;
+}
-void wxDebugMsg( const char *format, ... )
+bool
+wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData),
+ int WXUNUSED(fd))
{
- va_list ap;
- va_start( ap, format );
- vfprintf( stderr, format, ap );
- fflush( stderr );
- va_end(ap);
+ return false;
}
-void wxError( const wxString &msg, const wxString &title )
+void
+wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData))
{
- wxFprintf( stderr, _("Error ") );
- if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
- if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
- wxFprintf( stderr, wxT(".\n") );
+ // nothing to do here, we don't use the pipe
}
-void wxFatalError( const wxString &msg, const wxString &title )
+#endif // !Darwin/Darwin
+
+int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
{
- wxFprintf( stderr, _("Error ") );
- if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
- if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
- wxFprintf( stderr, wxT(".\n") );
- exit(3); // the same exit code as for abort()
+ wxEndProcessData *endProcData = new wxEndProcessData;
+
+ const int flags = execData.flags;
+
+ // wxAddProcessCallback is now (with DARWIN) allowed to call the
+ // callback function directly if the process terminates before
+ // the callback can be added to the run loop. Set up the endProcData.
+ if ( flags & wxEXEC_SYNC )
+ {
+ // we may have process for capturing the program output, but it's
+ // not used in wxEndProcessData in the case of sync execution
+ endProcData->process = NULL;
+
+ // sync execution: indicate it by negating the pid
+ endProcData->pid = -execData.pid;
+ }
+ else
+ {
+ // async execution, nothing special to do -- caller will be
+ // notified about the process termination if process != NULL, endProcData
+ // will be deleted in GTK_EndProcessDetector
+ endProcData->process = execData.process;
+ endProcData->pid = execData.pid;
+ }
+
+
+#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
+ endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
+#else
+ endProcData->tag = wxAddProcessCallback
+ (
+ endProcData,
+ execData.pipeEndProcDetect.Detach(wxPipe::Read)
+ );
+
+ execData.pipeEndProcDetect.Close();
+#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
+
+ if ( flags & wxEXEC_SYNC )
+ {
+ wxBusyCursor bc;
+ wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL
+ : new wxWindowDisabler;
+
+ // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
+ // process terminates
+ while ( endProcData->pid != 0 )
+ {
+ bool idle = true;
+
+#if HAS_PIPE_INPUT_STREAM
+ if ( execData.bufOut )
+ {
+ execData.bufOut->Update();
+ idle = false;
+ }
+
+ if ( execData.bufErr )
+ {
+ execData.bufErr->Update();
+ idle = false;
+ }
+#endif // HAS_PIPE_INPUT_STREAM
+
+ // don't consume 100% of the CPU while we're sitting in this
+ // loop
+ if ( idle )
+ wxMilliSleep(1);
+
+ // give GTK+ a chance to call GTK_EndProcessDetector here and
+ // also repaint the GUI
+ wxYield();
+ }
+
+ int exitcode = endProcData->exitcode;
+
+ delete wd;
+ delete endProcData;
+
+ return exitcode;
+ }
+ else // async execution
+ {
+ return execData.pid;
+ }
}
-#endif // WXWIN_COMPATIBILITY_2_2
+#endif // wxUSE_GUI
+#if wxUSE_BASE
+
+void wxHandleProcessTermination(wxEndProcessData *proc_data)
+{
+ // notify user about termination if required
+ if ( proc_data->process )
+ {
+ proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);
+ }
+
+ // clean up
+ if ( proc_data->pid > 0 )
+ {
+ delete proc_data;
+ }
+ else
+ {
+ // let wxExecute() know that the process has terminated
+ proc_data->pid = 0;
+ }
+}
+#endif // wxUSE_BASE
projects / wxWidgets.git / blobdiff