X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1cb41536a6106968b546cdba8d3d89805f802bc..68698f0308f5c46966b7de12b34f68ec23dd3ec8:/src/unix/utilsunx.cpp?ds=inline diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index a455399ffd..d0cb4c4ae2 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsunx.cpp +// Name: unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -26,23 +26,35 @@ #include "wx/process.h" #include "wx/thread.h" -#include "wx/stream.h" +#include "wx/wfstream.h" +// 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 +// 7 and 8): if you want to test for this, don't forget that the problems only +// appear if the large files support is enabled #ifdef HAVE_STATFS -# ifdef __BSD__ -# include -# include -# else -# include -# endif + #ifdef __BSD__ + #include + #include + #else // !__BSD__ + #include + #endif // __BSD__/!__BSD__ + + #define wxStatfs statfs #endif // HAVE_STATFS #ifdef HAVE_STATVFS #include - #define statfs statvfs + #define wxStatfs statvfs #endif // HAVE_STATVFS +#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) + // WX_STATFS_T is detected by configure + #define wxStatfs_t WX_STATFS_T +#endif + #if wxUSE_GUI #include "wx/unix/execute.h" #endif @@ -191,6 +203,16 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) { wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); +#if wxUSE_THREADS + // fork() doesn't mix well with POSIX threads: on many systems the program + // deadlocks or crashes for some reason. Probably our code is buggy and + // doesn't do something which must be done to allow this to work, but I + // don't know what yet, so for now just warn the user (this is the least we + // can do) about it + wxASSERT_MSG( wxThread::IsMain(), + _T("wxExecute() can be called only from the main thread") ); +#endif // wxUSE_THREADS + int argc = 0; wxChar *argv[WXEXECUTE_NARGS]; wxString argument; @@ -343,203 +365,148 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) #if wxUSE_STREAMS -class wxProcessFileInputStream : public wxInputStream -{ -public: - wxProcessFileInputStream(int fd) { m_fd = fd; } - ~wxProcessFileInputStream() { close(m_fd); } - - virtual bool Eof() const; - -protected: - size_t OnSysRead(void *buffer, size_t bufsize); - -protected: - int m_fd; -}; +// ---------------------------------------------------------------------------- +// wxPipeInputStream: stream for reading from a pipe +// ---------------------------------------------------------------------------- -class wxProcessFileOutputStream : public wxOutputStream +class wxPipeInputStream : public wxFileInputStream { public: - wxProcessFileOutputStream(int fd) { m_fd = fd; } - ~wxProcessFileOutputStream() { close(m_fd); } + wxPipeInputStream(int fd) : wxFileInputStream(fd) { } -protected: - size_t OnSysWrite(const void *buffer, size_t bufsize); + // return TRUE if the pipe is still opened + bool IsOpened() const { return !Eof(); } -protected: - int m_fd; + // return TRUE if we have anything to read, don't block + virtual bool CanRead() const; }; -bool wxProcessFileInputStream::Eof() const +bool wxPipeInputStream::CanRead() const { if ( m_lasterror == wxSTREAM_EOF ) - return TRUE; + return FALSE; // check if there is any input available struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; + const int fd = m_file->fd(); + fd_set readfds; FD_ZERO(&readfds); - FD_SET(m_fd, &readfds); - switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) ) + FD_SET(fd, &readfds); + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { case -1: wxLogSysError(_("Impossible to get child process input")); // fall through case 0: - return TRUE; + return FALSE; default: wxFAIL_MSG(_T("unexpected select() return value")); // still fall through case 1: - // input available: check if there is any - return wxInputStream::Eof(); - } -} - -size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize) -{ - int ret = read(m_fd, buffer, bufsize); - if ( ret == 0 ) - { - m_lasterror = wxSTREAM_EOF; - } - else if ( ret == -1 ) - { - m_lasterror = wxSTREAM_READ_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; + // input available -- or maybe not, as select() returns 1 when a + // read() will complete without delay, but it could still not read + // anything + return !Eof(); } - - return ret; } -size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize) -{ - int ret = write(m_fd, buffer, bufsize); - if ( ret == -1 ) - { - m_lasterror = wxSTREAM_WRITE_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; - } +// define this to let wxexec.cpp know that we know what we're doing +#define _WX_USED_BY_WXEXECUTE_ +#include "../common/execcmn.cpp" - return ret; -} +#endif // wxUSE_STREAMS // ---------------------------------------------------------------------------- -// wxStreamTempBuffer +// wxPipe: this encapsulates pipe() system call // ---------------------------------------------------------------------------- -/* - Extract of a mail to wx-users to give the context of the problem we are - trying to solve here: - - MC> If I run the command: - MC> find . -name "*.h" -exec grep linux {} \; - MC> in the exec sample synchronously from the 'Capture command output' - MC> menu, wxExecute never returns. I have to xkill it. Has anyone - MC> else encountered this? - - Yes, I can reproduce it too. - - I even think I understand why it happens: before launching the external - command we set up a pipe with a valid file descriptor on the reading side - when the output is redirected. So the subprocess happily writes to it ... - until the pipe buffer (which is usually quite big on Unix, I think the - default is 4Mb) is full. Then the writing process stops and waits until we - read some data from the pipe to be able to continue writing to it but we - never do it because we wait until it terminates to start reading and so we - have a classical deadlock. - - Here is the fix: we now read the output as soon as it appears into a temp - buffer (wxStreamTempBuffer object) and later just stuff it back into the - stream when the process terminates. See supporting code in wxExecute() - itself as well. -*/ - -class wxStreamTempBuffer +class wxPipe { public: - wxStreamTempBuffer(); + // the symbolic names for the pipe ends + enum Direction + { + Read, + Write + }; - // call to associate a stream with this buffer, otherwise nothing happens - // at all - void Init(wxInputStream *stream); + enum + { + INVALID_FD = -1 + }; - // check for input on our stream and cache it in our buffer if any - void Update(); + // default ctor doesn't do anything + wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; } - ~wxStreamTempBuffer(); + // create the pipe, return TRUE if ok, FALSE on error + bool Create() + { + if ( pipe(m_fds) == -1 ) + { + wxLogSysError(_("Pipe creation failed")); -private: - // the stream we're buffering, if NULL we don't do anything at all - wxInputStream *m_stream; + return FALSE; + } - // the buffer of size m_size (NULL if m_size == 0) - void *m_buffer; + return TRUE; + } - // the size of the buffer - size_t m_size; -}; + // return TRUE if we were created successfully + bool IsOk() const { return m_fds[Read] != INVALID_FD; } -wxStreamTempBuffer::wxStreamTempBuffer() -{ - m_stream = NULL; - m_buffer = NULL; - m_size = 0; -} + // 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") ); -void wxStreamTempBuffer::Init(wxInputStream *stream) -{ - m_stream = stream; -} + return m_fds[which]; + } -void wxStreamTempBuffer::Update() -{ - if ( m_stream && !m_stream->Eof() ) + // detach a descriptor, meaning that the pipe dtor won't close it, and + // return it + int Detach(Direction which) { - // realloc in blocks of 1Kb - surely not the best strategy but which - // one is? - static const size_t incSize = 1024; + wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds), + _T("invalid pipe index") ); - void *buf = realloc(m_buffer, m_size + incSize); - if ( !buf ) - { - // don't read any more, we don't have enough memory to do it - m_stream = NULL; - } - else // got memory for the buffer - { - m_buffer = buf; - m_stream->Read((char *)m_buffer + m_size, incSize); - m_size += incSize; - } + int fd = m_fds[which]; + m_fds[which] = INVALID_FD; + + return fd; } -} -wxStreamTempBuffer::~wxStreamTempBuffer() -{ - if ( m_buffer ) + // close the pipe descriptors + void Close() { - m_stream->Ungetch(m_buffer, m_size); - free(m_buffer); + for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ ) + { + if ( m_fds[n] != INVALID_FD ) + close(m_fds[n]); + } } -} -#endif // wxUSE_STREAMS + // dtor closes the pipe descriptors + ~wxPipe() { Close(); } + +private: + int m_fds[2]; +}; + +// ---------------------------------------------------------------------------- +// wxExecute: the real worker function +// ---------------------------------------------------------------------------- + +#ifdef __VMS + #pragma message disable codeunreachable +#endif long wxExecute(wxChar **argv, int flags, @@ -577,40 +544,28 @@ long wxExecute(wxChar **argv, wxChar **mb_argv = argv; #endif // Unicode/ANSI -#if wxUSE_GUI +#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) // create pipes - int end_proc_detect[2]; - if ( pipe(end_proc_detect) == -1 ) + wxPipe pipeEndProcDetect; + if ( !pipeEndProcDetect.Create() ) { - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; return ERROR_RETURN_CODE; } -#endif // wxUSE_GUI +#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) // pipes for inter process communication - int pipeIn[2], // stdin - pipeOut[2], // stdout - pipeErr[2]; // stderr - - pipeIn[0] = pipeIn[1] = - pipeOut[0] = pipeOut[1] = - pipeErr[0] = pipeErr[1] = -1; + wxPipe pipeIn, // stdin + pipeOut, // stdout + pipeErr; // stderr if ( process && process->IsRedirected() ) { - if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -1 ) + if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() ) { -#if wxUSE_GUI - // free previously allocated resources - close(end_proc_detect[0]); - close(end_proc_detect[1]); -#endif // wxUSE_GUI - - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; @@ -620,25 +575,18 @@ long wxExecute(wxChar **argv, } // fork the process -#ifdef HAVE_VFORK - pid_t pid = vfork(); + // + // NB: do *not* use vfork() here, it completely breaks this code for some + // reason under Solaris (and maybe others, although not under Linux) + // But on OpenVMS we do not have fork so we have to use vfork and + // cross our fingers that it works. +#ifdef __VMS + pid_t pid = vfork(); #else - pid_t pid = fork(); + pid_t pid = fork(); #endif - - if ( pid == -1 ) // error? + if ( pid == -1 ) // error? { -#if wxUSE_GUI - close(end_proc_detect[0]); - close(end_proc_detect[1]); - close(pipeIn[0]); - close(pipeIn[1]); - close(pipeOut[0]); - close(pipeOut[1]); - close(pipeErr[0]); - close(pipeErr[1]); -#endif // wxUSE_GUI - wxLogSysError( _("Fork failed") ); ARGS_CLEANUP; @@ -647,10 +595,6 @@ long wxExecute(wxChar **argv, } else if ( pid == 0 ) // we're in child { -#if wxUSE_GUI - close(end_proc_detect[0]); // close reading side -#endif // wxUSE_GUI - // These lines close the open file descriptors to to avoid any // input/output which might block the process or irritate the user. If // one wants proper IO for the subprocess, the right thing to do is to @@ -659,54 +603,71 @@ long wxExecute(wxChar **argv, { for ( int fd = 0; fd < FD_SETSIZE; fd++ ) { - if ( fd == pipeIn[0] || fd == pipeOut[1] || fd == pipeErr[1] -#if wxUSE_GUI - || fd == end_proc_detect[1] -#endif // wxUSE_GUI + if ( fd == pipeIn[wxPipe::Read] + || fd == pipeOut[wxPipe::Write] + || fd == pipeErr[wxPipe::Write] +#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) + || fd == pipeEndProcDetect[wxPipe::Write] +#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) ) { // don't close this one, we still need it continue; } - // leave stderr opened too, it won't do any hurm + // leave stderr opened too, it won't do any harm if ( fd != STDERR_FILENO ) close(fd); } + } -#ifndef __VMS - if ( flags & wxEXEC_MAKE_GROUP_LEADER ) - { - // Set process group to child process' pid. Then killing -pid - // of the parent will kill the process and all of its children. - setsid(); - } -#endif +#if !defined(__VMS) && !defined(__EMX__) + if ( flags & wxEXEC_MAKE_GROUP_LEADER ) + { + // Set process group to child process' pid. Then killing -pid + // of the parent will kill the process and all of its children. + setsid(); } +#endif // !__VMS + +#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) + // reading side can be safely closed but we should keep the write one + // opened + pipeEndProcDetect.Detach(wxPipe::Write); + pipeEndProcDetect.Close(); +#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__)) - // redirect stdio, stdout and stderr - if ( pipeIn[0] != -1 ) + // redirect stdin, stdout and stderr + if ( pipeIn.IsOk() ) { - if ( dup2(pipeIn[0], STDIN_FILENO) == -1 || - dup2(pipeOut[1], STDOUT_FILENO) == -1 || - dup2(pipeErr[1], STDERR_FILENO) == -1 ) + if ( dup2(pipeIn[wxPipe::Read], STDIN_FILENO) == -1 || + dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 || + dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 ) { wxLogSysError(_("Failed to redirect child process input/output")); } - close(pipeIn[0]); - close(pipeOut[1]); - close(pipeErr[1]); + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } execvp (*mb_argv, mb_argv); + fprintf(stderr, "execvp("); + 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() _exit(-1); // some compilers complain about missing return - of course, they // should know that exit() doesn't return but what else can we do if // they don't? + // + // and, sure enough, other compilers complain about unreachable code + // after exit() call, so we can just always have return here... #if defined(__VMS) || defined(__INTEL_COMPILER) return 0; #endif @@ -715,33 +676,47 @@ long wxExecute(wxChar **argv, { ARGS_CLEANUP; - // pipe initialization: construction of the wxStreams + // prepare for IO redirection + #if wxUSE_STREAMS - wxStreamTempBuffer bufIn, bufErr; + // the input buffer bufOut is connected to stdout, this is why it is + // called bufOut and not bufIn + wxStreamTempInputBuffer bufOut, + bufErr; #endif // wxUSE_STREAMS if ( process && process->IsRedirected() ) { #if wxUSE_STREAMS - // in/out for subprocess correspond to our out/in - wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]); - wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]); - wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]); + wxOutputStream *inStream = + new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); + + wxPipeInputStream *outStream = + new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); + + wxPipeInputStream *errStream = + new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); - process->SetPipeStreams(inStream, outStream, errStream); + process->SetPipeStreams(outStream, inStream, errStream); - bufIn.Init(inStream); - bufErr.Init(inStream); + bufOut.Init(outStream); + bufErr.Init(errStream); #endif // wxUSE_STREAMS + } - close(pipeIn[0]); // close reading side - close(pipeOut[1]); // close writing side - close(pipeErr[1]); // close writing side + if ( pipeIn.IsOk() ) + { + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } #if wxUSE_GUI && !defined(__WXMICROWIN__) wxEndProcessData *data = new wxEndProcessData; + // 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 data. if ( flags & wxEXEC_SYNC ) { // we may have process for capturing the program output, but it's @@ -750,10 +725,31 @@ long wxExecute(wxChar **argv, // sync execution: indicate it by negating the pid data->pid = -pid; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); + } + else + { + // 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; + } + + +#if defined(__DARWIN__) && defined(__WXMAC__) + data->tag = wxAddProcessCallbackForPid(data,pid); +#else + data->tag = wxAddProcessCallback + ( + data, + pipeEndProcDetect.Detach(wxPipe::Read) + ); - close(end_proc_detect[1]); // close writing side + pipeEndProcDetect.Close(); +#endif // defined(__DARWIN__) && defined(__WXMAC__) + if ( flags & wxEXEC_SYNC ) + { wxBusyCursor bc; wxWindowDisabler wd; @@ -762,7 +758,7 @@ long wxExecute(wxChar **argv, while ( data->pid != 0 ) { #if wxUSE_STREAMS - bufIn.Update(); + bufOut.Update(); bufErr.Update(); #endif // wxUSE_STREAMS @@ -779,15 +775,6 @@ long wxExecute(wxChar **argv, } 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; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); - - close(end_proc_detect[1]); // close writing side - return pid; } #else // !wxUSE_GUI @@ -804,8 +791,14 @@ long wxExecute(wxChar **argv, return exitcode; #endif // wxUSE_GUI } + + return ERROR_RETURN_CODE; } +#ifdef __VMS + #pragma message enable codeunreachable +#endif + #undef ERROR_RETURN_CODE #undef ARGS_CLEANUP @@ -816,13 +809,13 @@ long wxExecute(wxChar **argv, const wxChar* wxGetHomeDir( wxString *home ) { *home = wxGetUserHome( wxString() ); - wxString tmp; + wxString tmp; if ( home->IsEmpty() ) *home = wxT("/"); #ifdef __VMS - tmp = *home; - if ( tmp.Last() != wxT(']')) - if ( tmp.Last() != wxT('/')) *home << wxT('/'); + tmp = *home; + if ( tmp.Last() != wxT(']')) + if ( tmp.Last() != wxT('/')) *home << wxT('/'); #endif return home->c_str(); } @@ -841,7 +834,12 @@ char *wxGetUserHome( const wxString &user ) if ((ptr = wxGetenv(wxT("HOME"))) != NULL) { +#if wxUSE_UNICODE + wxWCharBuffer buffer( ptr ); + return buffer; +#else return ptr; +#endif } if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { @@ -988,7 +986,7 @@ wxString wxGetOsDescription() #ifndef WXWIN_OS_DESCRIPTION #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure #else - return WXWIN_OS_DESCRIPTION; + return wxString::FromAscii( WXWIN_OS_DESCRIPTION ); #endif } #endif @@ -1056,31 +1054,36 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { #if defined(HAVE_STATFS) || defined(HAVE_STATVFS) // the case to "char *" is needed for AIX 4.3 - struct statfs fs; - if ( statfs((char *)path.fn_str(), &fs) != 0 ) + wxStatfs_t fs; + if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 ) { - wxLogSysError("Failed to get file system statistics"); + wxLogSysError( wxT("Failed to get file system statistics") ); return FALSE; } - // under Solaris we might have to use fs.f_frsize instead as I think it - // may be a multiple of the block size in general (TODO) + // 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; +#else // HAVE_STATFS + wxLongLong blockSize = fs.f_bsize; +#endif // HAVE_STATVFS/HAVE_STATFS if ( pTotal ) { - *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize; + *pTotal = wxLongLong(fs.f_blocks) * blockSize; } if ( pFree ) { - *pFree = wxLongLong(fs.f_bavail) * fs.f_bsize; + *pFree = wxLongLong(fs.f_bavail) * blockSize; } return TRUE; -#endif // HAVE_STATFS - +#else // !HAVE_STATFS && !HAVE_STATVFS return FALSE; +#endif // HAVE_STATFS } // ----------------------------------------------------------------------------