Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv20062/src/freenet
Modified Files:
ConnectionHandler.java Ticker.java Version.java
Log Message:
if we time out sending a message, and it's still on the ConnectionHandler queue,
delete it from the queue. Also comment out some useless logging.
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ConnectionHandler.java 9 Sep 2003 16:06:02 -0000 1.153
+++ ConnectionHandler.java 11 Sep 2003 01:17:15 -0000 1.154
@@ -2288,6 +2288,31 @@
}
}
+ public void unsendMessageAsync(MessageSendCallback cb) {
+ if(sendClosed.state()) return;
+ synchronized(sendLock) {
+ for(Iterator i=sendingQueue.listIterator(0);i.hasNext();) {
+ MessageSend m = (MessageSend)(i.next());
+ if(m.cb == cb) {
+ if(m.hasTrailing)
+ trailingPresent = false; // we hope!
+ i.remove();
+ sendingCount--;
+ synchronized(sendingQueueBytesLock) {
+ sendingQueueBytes -= m.toSend.length;
+ if (logDEBUG)
+ Core.logger.log(this, "Removed
(E) message of "+
+
"size "+m.toSend.length+" to "+
+
"sendingQueue: now "+
+
sendingQueueBytes+" bytes for "+
+
this, Logger.DEBUG);
+ }
+ return; // Hopefully there isn't more than
one...
+ }
+ }
+ }
+ }
+
protected MessageSend innerSendMessageAsync(Message m, RawMessage raw,
MessageSendCallback cb)
//no other way really
Index: Ticker.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Ticker.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Ticker.java 30 Aug 2003 23:16:50 -0000 1.18
+++ Ticker.java 11 Sep 2003 01:17:15 -0000 1.19
@@ -115,16 +115,10 @@
synchronized (this) {
if(logDEBUG) timeLog("Synchronized in Ticker loop");
// prepare ready events for immediate execution
- int count=0;
while (events.size() > 0 &&
((Event) events.top()).time() <= System.currentTimeMillis()) {
if(logDEBUG) timeLog("Popping events from
Ticker loop");
Event e = (Event) events.pop();
- if(logDEBUG) {
- Core.logger.log(this, "Popped event
"+count+": "+e,
-
Logger.DEBUG);
- count++;
- }
jobs.addElement(e);
}
if(logDEBUG) timeLog("No more events");
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- Version.java 10 Sep 2003 21:19:51 -0000 1.382
+++ Version.java 11 Sep 2003 01:17:15 -0000 1.383
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6189;
+ public static final int buildNumber = 6190;
// 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
