From c7b175fc0c42960eae63114458e0cccf8a90dea8 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 22 Apr 2008 11:20:50 +0000 Subject: [PATCH] 2008-04-22 Marcus Brinkmann * w32-qt-io.cpp, kdpipeiodevice.cpp: New versions from Frank Osterfeld, implement blocking select. --- trunk/gpgme/ChangeLog | 5 +++++ trunk/gpgme/kdpipeiodevice.cpp | 4 ++-- trunk/gpgme/w32-qt-io.cpp | 14 +++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 35af33a..219d482 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2008-04-22 Marcus Brinkmann + + * w32-qt-io.cpp, kdpipeiodevice.cpp: New versions from Frank + Osterfeld, implement blocking select. + 2008-03-11 Marcus Brinkmann * data.c (gpgme_data_read, gpgme_data_write): Retry on EINTR. diff --git a/trunk/gpgme/kdpipeiodevice.cpp b/trunk/gpgme/kdpipeiodevice.cpp index c4dd9f7..5661790 100644 --- a/trunk/gpgme/kdpipeiodevice.cpp +++ b/trunk/gpgme/kdpipeiodevice.cpp @@ -480,8 +480,8 @@ bool KDPipeIODevice::waitForReadyRead( int msecs ) { KDAB_CHECK_THIS; LOCKED( r ); if ( r->bytesInBuffer() != 0 || r->eof || r->error ) return true; - assert( false ); - return r->bufferNotEmptyCondition.wait( &r->mutex, msecs ) ; + + return msecs >= 0 ? r->bufferNotEmptyCondition.wait( &r->mutex, msecs ) : r->bufferNotEmptyCondition.wait( &r->mutex ); } template diff --git a/trunk/gpgme/w32-qt-io.cpp b/trunk/gpgme/w32-qt-io.cpp index 9ccdff9..264d729 100644 --- a/trunk/gpgme/w32-qt-io.cpp +++ b/trunk/gpgme/w32-qt-io.cpp @@ -573,9 +573,6 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock) TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_select", fds, "nfds=%u, nonblock=%u", nfds, nonblock); - /* We only implement the special case of nonblock == true. */ - assert (nonblock); - int count = 0; TRACE_SEQ (dbg_help, "select on [ "); @@ -587,9 +584,12 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock) } else if (fds[i].for_read ) { - const KDPipeIODevice * const chan = find_channel (fds[i].fd, 0); - assert (chan); - fds[i].signaled = chan->readWouldBlock() ? 0 : 1; + KDPipeIODevice * const chan = find_channel (fds[i].fd, 0); + assert (chan); + if ( nonblock ) + fds[i].signaled = chan->readWouldBlock() ? 0 : 1; + else + fds[i].signaled = chan->waitForReadyRead( 1000 ) ? 1 : 0; TRACE_ADD1 (dbg_help, "w0x%x ", fds[i].fd); if ( fds[i].signaled ) count++; @@ -598,7 +598,7 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock) { const KDPipeIODevice * const chan = find_channel (fds[i].fd, 0); assert (chan); - fds[i].signaled = chan->writeWouldBlock() ? 0 : 1; + fds[i].signaled = nonblock ? ( chan->writeWouldBlock() ? 0 : 1 ) : 1; TRACE_ADD1 (dbg_help, "w0x%x ", fds[i].fd); if ( fds[i].signaled ) count++; -- 2.26.2