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
Lib paths etc
[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
a64b9bc
..
d951926
100644
(file)
--- 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 $
* See the file LICENSE for details.
*
* $Log: yaz-socket-manager.cpp,v $
- * Revision 1.14 2000-11-20 14:17:36 adam
+ * Revision 1.16 2001-08-13 16:39:12 adam
+ * PDU_Assoc keeps track of children. Using yaz_log instead of logf.
+ *
+ * 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
* Yet another WIN32 fix for connect notify.
*
* Revision 1.13 2000/11/20 11:27:33 adam
@@
-143,7
+149,7
@@
int Yaz_SocketManager::processEvent()
YazSocketEntry *p;
YazSocketEvent *event = getEvent();
unsigned timeout = 0;
YazSocketEntry *p;
YazSocketEvent *event = getEvent();
unsigned timeout = 0;
- logf (m_log, "processEvent");
+ yaz_log (m_log, "Yaz_SocketManager::processEvent manager=%p", this);
if (event)
{
event->observer->socketNotify(event->event);
if (event)
{
event->observer->socketNotify(event->event);
@@
-168,17
+174,17
@@
int Yaz_SocketManager::processEvent()
no++;
if (p->mask & YAZ_SOCKET_OBSERVE_READ)
{
no++;
if (p->mask & YAZ_SOCKET_OBSERVE_READ)
{
- yaz_log (m_log, "select fd=%d: read fd", fd);
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d read", fd);
FD_SET(fd, &in);
}
if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
{
FD_SET(fd, &in);
}
if (p->mask & YAZ_SOCKET_OBSERVE_WRITE)
{
- yaz_log (m_log, "select fd=%d: write fd", fd);
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d write", fd);
FD_SET(fd, &out);
}
if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
{
FD_SET(fd, &out);
}
if (p->mask & YAZ_SOCKET_OBSERVE_EXCEPT)
{
- yaz_log (m_log, "select fd=%d: except fd", fd);
+ yaz_log (m_log, "Yaz_SocketManager::select fd=%d except", fd);
FD_SET(fd, &except);
}
if (fd > max)
FD_SET(fd, &except);
}
if (fd > max)
@@
-199,9
+205,9
@@
int Yaz_SocketManager::processEvent()
}
if (!no)
{
}
if (!no)
{
- logf (m_log, "no pending events return 0");
+ yaz_log (m_log, "no pending events return 0");
if (!m_observers)
if (!m_observers)
- logf (m_log, "no observers");
+ yaz_log (m_log, "no observers");
return 0;
}
return 0;
}
@@
-209,7
+215,7
@@
int Yaz_SocketManager::processEvent()
to.tv_sec = timeout;
to.tv_usec = 0;
to.tv_sec = timeout;
to.tv_usec = 0;
- logf (m_log, "select pending=%d timeout=%d", no, timeout);
+ yaz_log (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;
while ((res = select(max + 1, &in, &out, &except, timeout ? &to : 0)) < 0)
if (errno != EINTR)
return -1;
@@
-239,7
+245,7
@@
int Yaz_SocketManager::processEvent()
now >= p->last_activity + (int) (p->timeout))
{
YazSocketEvent *event = new YazSocketEvent;
now >= p->last_activity + (int) (p->timeout))
{
YazSocketEvent *event = new YazSocketEvent;
- logf (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
+ 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;
now, p->last_activity, p->timeout);
p->last_activity = now;
event->observer = p->observer;