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
No longer needed
[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
3215d3b
..
89dc9bb
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.23 2004-01-05 11:31:04 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.27 2004-02-26 23:42:27 adam Exp $
*/
#include <assert.h>
#ifdef WIN32
*/
#include <assert.h>
#ifdef WIN32
@@
-141,9
+141,10
@@
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))
{
{
- unsigned timeout_this;
+ int timeout_this;
timeout_this = p->timeout;
if (p->last_activity)
timeout_this -= now - p->last_activity;
timeout_this = p->timeout;
if (p->last_activity)
timeout_this -= now - p->last_activity;
@@
-172,13
+173,18
@@
int Yaz_SocketManager::processEvent()
yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
no, timeout);
yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
no, timeout);
+ int pass = 0;
while ((res = select(max + 1, &in, &out, &except,
timeout== -1 ? 0 : &to)) < 0)
if (errno != EINTR)
{
while ((res = select(max + 1, &in, &out, &except,
timeout== -1 ? 0 : &to)) < 0)
if (errno != EINTR)
{
- yaz_log (LOG_LOG|LOG_WARN, "select");
- return -1;
+ yaz_log(LOG_ERRNO|LOG_WARN, "select");
+ yaz_log(LOG_WARN, "errno=%d max=%d timeout=%d",
+ errno, max, timeout);
+ if (++pass > 10)
+ 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
+209,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);