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
Define YAZ_USE_NEW_LOG=1 if app require YAZ > 2.0.28
[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
..
11d34e9
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.29 2004-11-30 21:10:31 adam Exp $
*/
#include <assert.h>
#ifdef WIN32
*/
#include <assert.h>
#ifdef WIN32
@@
-15,7
+15,7
@@
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include <yaz/log.h>
+#include <yaz/ylog.h>
#include <yaz++/socket-manager.h>
Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
#include <yaz++/socket-manager.h>
Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
@@
-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;
@@
-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(YLOG_ERRNO|YLOG_WARN, "select");
+ yaz_log(YLOG_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,12
+209,12
@@
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 (res == 0 && p->timeout_this == timeout)
{
YazSocketEvent *event = new YazSocketEvent;
assert (p->last_activity);
{
YazSocketEvent *event = new YazSocketEvent;
assert (p->last_activity);
- yaz_log (m_log, "putEvent timeout, now = %ld last_activity=%ld timeout=%d",
- now, p->last_activity, p->timeout);
+ yaz_log (m_log, "putEvent timeout fd=%d, now = %ld last_activity=%ld timeout=%d",
+ p->fd, now, p->last_activity, p->timeout);
p->last_activity = now;
event->observer = p->observer;
event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
p->last_activity = now;
event->observer = p->observer;
event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
@@
-221,7
+227,7
@@
int Yaz_SocketManager::processEvent()
delete event;
return 1;
}
delete event;
return 1;
}
- yaz_log (LOG_WARN, "unhandled event in processEvent");
+ yaz_log(YLOG_WARN, "unhandled event in processEvent res=%d", res);
return 1;
}
return 1;
}
@@
-292,7
+298,7
@@
Yaz_SocketManager::Yaz_SocketManager()
m_observers = 0;
m_queue_front = 0;
m_queue_back = 0;
m_observers = 0;
m_queue_front = 0;
m_queue_back = 0;
- m_log = LOG_DEBUG;
+ m_log = YLOG_DEBUG;
}
Yaz_SocketManager::~Yaz_SocketManager()
}
Yaz_SocketManager::~Yaz_SocketManager()