PatchSet 5511
Date: 2005/02/10 22:23:46
Author: robilad
Branch: HEAD
Tag: (none)
Log:
small accept debug code improvement
2005-02-10 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/net/PlainSocketImpl.c
(gnu_java_net_PlainSocketImpl_socketAccept):
Improved debug code.
Members:
ChangeLog:1.3555->1.3556
libraries/clib/net/PlainSocketImpl.c:1.52->1.53
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3555 kaffe/ChangeLog:1.3556
--- kaffe/ChangeLog:1.3555 Thu Feb 10 21:48:28 2005
+++ kaffe/ChangeLog Thu Feb 10 22:23:46 2005
@@ -1,5 +1,10 @@
2005-02-10 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/clib/net/PlainSocketImpl.c
(gnu_java_net_PlainSocketImpl_socketAccept):
+ Improved debug code.
+
+2005-02-10 Dalibor Topic <[EMAIL PROTECTED]>
+
* kaffe/kaffevm/systems/unix-pthreads/syscalls.c (jthreadedAccept):
Fixed accept again for the case that select was interrupted.
Index: kaffe/libraries/clib/net/PlainSocketImpl.c
diff -u kaffe/libraries/clib/net/PlainSocketImpl.c:1.52
kaffe/libraries/clib/net/PlainSocketImpl.c:1.53
--- kaffe/libraries/clib/net/PlainSocketImpl.c:1.52 Tue Dec 21 08:06:34 2004
+++ kaffe/libraries/clib/net/PlainSocketImpl.c Thu Feb 10 22:23:49 2005
@@ -400,8 +400,8 @@
addr.sin_addr.s_addr = INADDR_ANY;
DBG(NATIVENET,
- dprintf("socketAccept(%p, localport=%d, addr=%s)\n",
- this, ntohs(addr.sin_port), ip2str(addr.sin_addr.s_addr));
+ dprintf("socketAccept(%p, localport=%d, addr=%s, timeout=%d)\n",
+ this, ntohs(addr.sin_port), ip2str(addr.sin_addr.s_addr),
unhand(this)->timeout);
);
alen = sizeof(addr);
@@ -410,6 +410,10 @@
(struct sockaddr*)&addr, &alen,
unhand(this)->timeout, &r);
} while (rc == EINTR);
if (rc == ETIMEDOUT) {
+ DBG(NATIVENET,
+ dprintf("socketAcceptTimedOut(%p, localport=%d,
addr=%s, timeout=%d)\n",
+ this, ntohs(addr.sin_port),
ip2str(addr.sin_addr.s_addr), unhand(this)->timeout);
+ );
SignalError("java.net.SocketTimeoutException",
"Accept timed out");
}
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
