X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ccfebab0925dd4bd5ad1671ad290ebc3141d782..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/unix/wakeuppipe.cpp diff --git a/src/unix/wakeuppipe.cpp b/src/unix/wakeuppipe.cpp index b8ff1f12a6..1bd33d6021 100644 --- a/src/unix/wakeuppipe.cpp +++ b/src/unix/wakeuppipe.cpp @@ -3,7 +3,6 @@ // Purpose: Implementation of wxWakeUpPipe class. // Author: Vadim Zeitlin // Created: 2013-06-09 (extracted from src/unix/evtloopunix.cpp) -// RCS-ID: $Id$ // Copyright: (c) 2013 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -69,10 +68,8 @@ wxWakeUpPipe::wxWakeUpPipe() // wakeup handling // ---------------------------------------------------------------------------- -void wxWakeUpPipe::WakeUp() +void wxWakeUpPipe::WakeUpNoLock() { - wxCriticalSectionLocker lock(m_pipeLock); - // No need to do anything if the pipe already contains something. if ( !m_pipeIsEmpty ) return; @@ -95,8 +92,6 @@ void wxWakeUpPipe::OnReadWaiting() // got wakeup from child thread, remove the data that provoked it from the // pipe - wxCriticalSectionLocker lock(m_pipeLock); - char buf[4]; for ( ;; ) { @@ -130,8 +125,4 @@ void wxWakeUpPipe::OnReadWaiting() // The pipe is empty now, so future calls to WakeUp() would need to write // to it again. m_pipeIsEmpty = true; - - // writing to the wake up pipe will make wxConsoleEventLoop return from - // wxFDIODispatcher::Dispatch() it might be currently blocking in, nothing - // else needs to be done }