Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv6656/src/freenet
Modified Files:
ConnectionHandler.java PeerHandler.java Version.java
Log Message:
logging, remove minor unused code, error out after a blocking message send takes more
than 5 minutes, no functional changes
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ConnectionHandler.java 9 Oct 2003 15:57:09 -0000 1.173
+++ ConnectionHandler.java 10 Oct 2003 18:05:27 -0000 1.174
@@ -399,6 +399,9 @@
try {
synchronized(sentPacketLock) {
sentPacket = peerHandler.getPacket(link, p, identity,
i, false);
+ if(logDEBUG)
+ Core.logger.log(this, "Sending "+sentPacket+"
on "+this,
+ Logger.DEBUG);
}
} catch (IOException e) {
logDEBUG("Caught "+e+" in getPacket in registerOCM");
@@ -1163,6 +1166,10 @@
sentPacket =
peerHandler.getPacket(link, p,
identity,
cm, true);
+ if(logDEBUG)
+ Core.logger.log(this,
"Sending "+sentPacket+
+
" ("+cm+") on "+this,
+
Logger.DEBUG);
} catch (IOException e) {
sentPacket = null;
logDEBUG("Caught "+e+
@@ -1173,6 +1180,9 @@
} else {
try {
sentPacket =
peerHandler.getPacket(link, p);
+ if(logDEBUG)
+ Core.logger.log(this, "Sending
"+sentPacket+
+
" on "+this, Logger.DEBUG);
} catch (IOException e) {
sentPacket = null;
logDEBUG("Caught "+e+" in getPacket in
jobDone");
@@ -2188,6 +2198,9 @@
return false;
}
this.sentPacket = packet;
+ if(logDEBUG)
+ Core.logger.log(this, "sendPacket sending
"+sentPacket+" on "+
+ this, Logger.DEBUG);
}
innerSendPacket(prio, sentPacket);
return true;
@@ -2580,6 +2593,10 @@
try {
sentPacket =
peerHandler.getPacket(link, p, identity,
cm, true);
+ if(logDEBUG)
+ Core.logger.log(this, "Sending
"+sentPacket+
+
" ("+cm+") on "+this+" (close())",
+
Logger.DEBUG);
} catch (IOException e) {
logDEBUG("Caught "+e+" in getPacket in
close()");
sentPacket = null;
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PeerHandler.java 9 Oct 2003 18:28:26 -0000 1.11
+++ PeerHandler.java 10 Oct 2003 18:05:28 -0000 1.12
@@ -28,6 +28,8 @@
final LinkedList connectionHandlers;
final Node node;
+
+ boolean logDEBUG;
int maxPacketSize;
@@ -228,6 +230,7 @@
messages = new LinkedList();
messagesWithTrailers = new LinkedList();
connectionHandlers = new LinkedList();
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
}
/**
@@ -251,7 +254,7 @@
* 3. No Idle ConnectionHandlers
* Strategy: wait for one to ask us for a packet
*/
- boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
if(logDEBUG) Core.logger.log(this, "Sending "+pm+" on "+this,
Logger.DEBUG);
int handlersSendingPackets = 0;
@@ -358,9 +361,10 @@
* @throws IOException if the connection is already closed
*/
public PeerPacket getPacket(Link link, Presentation p,
-
Identity i, Message m,
-
boolean onlyGivenMsg)
+ Identity i, Message m,
+ boolean onlyGivenMsg)
throws IOException {
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
Core.diagnostics.occurrenceContinuous("messageSendQueueSize",
messages.size()+
messagesWithTrailers.size());
@@ -373,6 +377,9 @@
*/
int packetLength = 0;
LinkedList packetMessages = new LinkedList();
+ if(logDEBUG)
+ Core.logger.log(this, "getPacket("+link+","+p+","+i+","+m+","+
+ onlyGivenMsg+" on "+this,
Logger.DEBUG);
if(m != null) {
packetMessages.add(new PeerPacketMessage(i, m, null, NORMAL));
}
@@ -392,29 +399,42 @@
msg.resolve(p); // we need the length
if((msg.getLength() > maxPacketSize) ||
msg.hasTrailer()) {
+ if(logDEBUG)
+ Core.logger.log(this, "Adding
"+msg+
+
" to packet for "+
+
this, Logger.DEBUG);
packetMessages.addLast(msg);
packetLength += msg.getLength();
break;
}
if(msg.getLength() + packetLength >
maxPacketSize &&
(!packetMessages.isEmpty())) {
- if(msg.hasTrailer())
-
messagesWithTrailers.addFirst(msg);
- else
- messages.addFirst(msg);
+ messages.addFirst(msg);
break;
}
+ if(logDEBUG)
+ Core.logger.log(this, "Adding "+msg+
+ " to
packet for "+this,
+
Logger.DEBUG);
packetMessages.addLast(msg);
packetLength += msg.getLength();
}
}
}
- if(packetMessages.isEmpty()) return null;
- else {
+ if(packetMessages.isEmpty()) {
+ if(logDEBUG)
+ Core.logger.log(this, "Returning null from getPacket
("+
+ this+")",
Logger.DEBUG);
+ return null;
+ } else {
PeerPacketMessage[] msgs =
new PeerPacketMessage[packetMessages.size()];
packetMessages.toArray(msgs);
- return new PeerPacket(msgs, link, p);
+ PeerPacket packet = new PeerPacket(msgs, link, p);
+ if(logDEBUG)
+ Core.logger.log(this, "Returning "+packet+" from
getPacket ("+
+ this+")",
Logger.DEBUG);
+ return packet;
}
}
@@ -429,22 +449,33 @@
*/
public TrailerWriter sendMessage(Message r, long timeout,
int msgPrio)
throws SendFailedException {
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
MyMessageSendCallback cb =
new MyMessageSendCallback();
PeerPacketMessage pm = new PeerPacketMessage(id, r, cb, msgPrio);
innerSendMessageAsync(pm);
Core.logger.log(this, "Sent "+pm+" async", Logger.DEBUG);
- long timeoutAt = System.currentTimeMillis() + timeout;
+ long startAt = System.currentTimeMillis();
+ long timeoutAt = startAt + timeout;
+ long maxTimeoutAt = startAt + 300*1000; // 5 mins hardcoded FIXME
specific to fast protocols
+ if(maxTimeoutAt < timeoutAt) maxTimeoutAt = -1;
synchronized(cb) {
Core.logger.log(this, "Synced", Logger.DEBUG);
while(!cb.finished) {
Core.logger.log(this, "Waiting...", Logger.DEBUG);
+ if(maxTimeoutAt != -1 &&
+ System.currentTimeMillis() > maxTimeoutAt) {
+ Core.logger.log(this, "Took more than 5
minutes to send "+
+ pm+"!!",
Logger.ERROR);
+ break;
+ }
try {
long waitTime;
if(timeout > 0) {
waitTime = timeoutAt -
System.currentTimeMillis();
if(waitTime < 0) break;
} else waitTime = 0;
+ if(waitTime <= 0) waitTime = 2000;
cb.wait(waitTime);
} catch (InterruptedException e) {}
}
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- Version.java 9 Oct 2003 00:52:11 -0000 1.419
+++ Version.java 10 Oct 2003 18:05:28 -0000 1.420
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6226;
+ public static final int buildNumber = 6227;
// 6028: may 3; ARK retrieval fix
public static final int ignoreBuildsAfter = 6500;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
