X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=669597a1ab94f946f20cd247c7486ad9d4e98bcc;hb=9a088f6097f4e6d48d6287e0067a5ff899633e6a;hp=37ad03f9bb24ad2806d0a5521c68974c56654a04;hpb=933909a6cfd5dcacc446f45e7217849b917abefd;p=yazpp-moved-to-github.git diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index 37ad03f..669597a 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -3,7 +3,13 @@ * See the file LICENSE for details. * * $Log: yaz-socket-manager.cpp,v $ - * Revision 1.13 2000-11-20 11:27:33 adam + * Revision 1.15 2001-03-26 14:43:49 adam + * New threaded PDU association. + * + * Revision 1.14 2000/11/20 14:17:36 adam + * Yet another WIN32 fix for connect notify. + * + * Revision 1.13 2000/11/20 11:27:33 adam * Fixes for connect operation (timeout and notify fix). * * Revision 1.12 2000/10/24 12:29:57 adam @@ -140,7 +146,7 @@ int Yaz_SocketManager::processEvent() YazSocketEntry *p; YazSocketEvent *event = getEvent(); unsigned timeout = 0; - logf (m_log, "processEvent"); + logf (m_log, "Yaz_SocketManager::processEvent manager=%p", this); if (event) { event->observer->socketNotify(event->event); @@ -164,11 +170,20 @@ int Yaz_SocketManager::processEvent() 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) @@ -197,7 +212,7 @@ int Yaz_SocketManager::processEvent() to.tv_sec = timeout; to.tv_usec = 0; - logf (m_log, "select pending=%d timeout=%d", no, timeout); + logf (m_log, "Yaz_SocketManager::select no=%d timeout=%d", no, timeout); while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0) if (errno != EINTR) return -1;