/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.1 1999-01-28 09:41:07 adam
- * Initial revision
- *
+ * $Id: yaz-socket-manager.cpp,v 1.18 2001-12-21 10:50:22 adam Exp $
*/
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <winsock.h>
#else
#include <sys/time.h>
#include <unistd.h>
#endif
#include <errno.h>
+#include <string.h>
-#include <log.h>
-#include <yaz-socket-manager.h>
-
+#include <yaz/log.h>
+#include <yaz++/yaz-socket-manager.h>
Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver(
IYazSocketObserver *observer)
}
se->fd = fd;
se->mask = 0;
+ se->last_activity = 0;
+ se->timeout = 0;
}
void Yaz_SocketManager::deleteObserver(IYazSocketObserver *observer)
int Yaz_SocketManager::processEvent()
{
+ YazSocketEntry *p;
YazSocketEvent *event = getEvent();
+ unsigned timeout = 0;
+ yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
if (event)
{
event->observer->socketNotify(event->event);
+ delete event;
return 1;
}
int res;
int max = 0;
int no = 0;
- struct timeval to;
- struct timeval *timeout = &to;
FD_ZERO(&in);
FD_ZERO(&out);
FD_ZERO(&except);
- timeout = &to; /* hang on select */
- to.tv_sec = 5*60;
- to.tv_usec = 0;
-
- for (YazSocketEntry *p = m_observers; p; p = p->next)
+ time_t now = time(0);
+ for (p = m_observers; p; p = p->next)
{
int fd = p->fd;
- logf (LOG_LOG, "fd = %d mask=%d", fd, p->mask);
if (p->mask)
no++;
if (p->mask & YAZ_SOCKET_OBSERVE_READ)
+ {
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd);
FD_SET(fd, &in);
+ }
if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
+ {
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d write", fd);
FD_SET(fd, &out);
+ }
if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
+ {
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d except", fd);
FD_SET(fd, &except);
+ }
if (fd > max)
max = fd;
+ if (p->timeout)
+ {
+ unsigned timeout_this;
+ timeout_this = p->timeout;
+ if (p->last_activity)
+ timeout_this -= now - p->last_activity;
+ else
+ p->last_activity = now;
+ if (timeout_this < 1 || timeout_this > 2147483646)
+ timeout_this = 1;
+ if (!timeout || timeout_this < timeout)
+ timeout = timeout_this;
+ p->timeout_this = timeout_this;
+ yaz_log (m_log, "Yaz_SocketManager::select timeout_this=%d",
+ p->timeout_this);
+ }
}
if (!no)
+ {
+ yaz_log (m_log, "no pending events return 0");
+ if (!m_observers)
+ yaz_log (m_log, "no observers");
return 0;
- while ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
+ }
+
+ struct timeval to;
+ to.tv_sec = timeout;
+ to.tv_usec = 0;
+
+ yaz_log (m_log, "Yaz_SocketManager::select begin no=%d timeout=%d",
+ no, timeout);
+ while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
if (errno != EINTR)
+ {
+ yaz_log (LOG_LOG|LOG_WARN, "select");
return -1;
-
- for (YazSocketEntry * p = m_observers; p; p = p->next)
+ }
+ now = time(0);
+ for (p = m_observers; p; p = p->next)
{
int fd = p->fd;
int mask = 0;
if (mask)
{
YazSocketEvent *event = new YazSocketEvent;
+ p->last_activity = now;
event->observer = p->observer;
event->event = mask;
putEvent (event);
}
+ else if (res == 0 && p->timeout && p->timeout_this == timeout)
+ {
+ YazSocketEvent *event = new YazSocketEvent;
+ assert (p->last_activity);
+ yaz_log (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
+ now, p->last_activity, p->timeout);
+ p->last_activity = now;
+ event->observer = p->observer;
+ event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;
+ putEvent (event);
+ }
}
if ((event = getEvent()))
{
event->observer->socketNotify(event->event);
+ delete event;
return 1;
}
- return 0;
+ yaz_log (LOG_WARN, "unhandled event in processEvent");
+ return 1;
}
+
+// n p n p ...... n p n p
+// front back
+
void Yaz_SocketManager::putEvent(YazSocketEvent *event)
{
- logf (LOG_LOG, "putEvent p=%p event=%d", event, event->event);
// put in back of queue
if (m_queue_back)
{
m_observers = 0;
m_queue_front = 0;
m_queue_back = 0;
+ m_log = LOG_DEBUG;
}
Yaz_SocketManager::~Yaz_SocketManager()