projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added zlint
[yazpp-moved-to-github.git]
/
src
/
yaz-socket-manager.cpp
diff --git
a/src/yaz-socket-manager.cpp
b/src/yaz-socket-manager.cpp
index
3398090
..
5fd8743
100644
(file)
--- a/
src/yaz-socket-manager.cpp
+++ b/
src/yaz-socket-manager.cpp
@@
-2,7
+2,7
@@
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-socket-manager.cpp,v 1.24 2004-01-07 13:40:06 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.26 2004-02-02 11:17:45 adam Exp $
*/
#include <assert.h>
#ifdef WIN32
*/
#include <assert.h>
#ifdef WIN32
@@
-141,7
+141,8
@@
int Yaz_SocketManager::processEvent()
}
if (fd > max)
max = fd;
}
if (fd > max)
max = fd;
- if (p->timeout >= 0)
+ if (p->timeout > 0 ||
+ (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
{
int timeout_this;
timeout_this = p->timeout;
{
int timeout_this;
timeout_this = p->timeout;
@@
-179,6
+180,7
@@
int Yaz_SocketManager::processEvent()
yaz_log (LOG_LOG|LOG_WARN, "select");
return -1;
}
yaz_log (LOG_LOG|LOG_WARN, "select");
return -1;
}
+ yaz_log(m_log, "select returned res=%d", res);
now = time(0);
for (p = m_observers; p; p = p->next)
{
now = time(0);
for (p = m_observers; p; p = p->next)
{
@@
-203,7
+205,11
@@
int Yaz_SocketManager::processEvent()
yaz_log (m_log, "putEvent I/O mask=%d", mask);
}
yaz_log (m_log, "putEvent I/O mask=%d", mask);
}
- else if (p->timeout && (now - p->last_activity) >= p->timeout)
+ else if (
+ (p->timeout > 0 ||
+ (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
+ &&
+ (now - p->last_activity) >= p->timeout)
{
YazSocketEvent *event = new YazSocketEvent;
assert (p->last_activity);
{
YazSocketEvent *event = new YazSocketEvent;
assert (p->last_activity);