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
Reliable result for connection::option() when returning a null value.
[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
89dc9bb
..
4a75923
100644
(file)
--- a/
src/yaz-socket-manager.cpp
+++ b/
src/yaz-socket-manager.cpp
@@
-1,19
+1,26
@@
/*
/*
- * Copyright (c) 1998-2004, Index Data.
+ * Copyright (c) 1998-2005, Index Data.
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: yaz-socket-manager.cpp,v 1.27 2004-02-26 23:42:27 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.31 2005-01-14 10:13:50 adam Exp $
*/
*/
-#include <assert.h>
#ifdef WIN32
#include <winsock.h>
#ifdef WIN32
#include <winsock.h>
-#else
+#endif
+
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <sys/time.h>
+#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <unistd.h>
#endif
+
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
+#include <assert.h>
#include <yaz/log.h>
#include <yaz++/socket-manager.h>
#include <yaz/log.h>
#include <yaz++/socket-manager.h>
@@
-178,8
+185,8
@@
int Yaz_SocketManager::processEvent()
timeout== -1 ? 0 : &to)) < 0)
if (errno != EINTR)
{
timeout== -1 ? 0 : &to)) < 0)
if (errno != EINTR)
{
- yaz_log(LOG_ERRNO|LOG_WARN, "select");
- yaz_log(LOG_WARN, "errno=%d max=%d timeout=%d",
+ 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;
errno, max, timeout);
if (++pass > 10)
return -1;
@@
-209,16
+216,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 > 0 ||
- (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
- &&
- (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;
@@
-231,7
+234,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;
}
@@
-302,7
+305,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()