Update of /cvsroot/freenet/freenet/src/freenet/node/states/data
In directory sc8-pr-cvs1:/tmp/cvs-serv17090/src/freenet/node/states/data
Modified Files:
SendData.java TrailerWriteCallbackMessage.java
Log Message:
6162: accurate send queue length. Hopefully.
Index: SendData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/data/SendData.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- SendData.java 14 Oct 2003 23:59:01 -0000 1.27
+++ SendData.java 21 Oct 2003 01:52:37 -0000 1.28
@@ -57,7 +57,7 @@
this.length = length;
this.partSize = partSize;
this.n = n;
- myTWCM = new TrailerWriteCallbackMessage(id, n);
+ myTWCM = new TrailerWriteCallbackMessage(id, n, this);
logDEBUG = n.logger.shouldLog(Logger.DEBUG,this);
if(logDEBUG)
n.logger.log(this, "Creating SendData("+this+")", Logger.DEBUG);
@@ -72,6 +72,13 @@
public final long length() {
return length;
+ }
+
+ public final long bytesAvailable() {
+ if(inPaddingMode)
+ return paddingLength - sentPadding;
+ else
+ return in.realLength() - moved;
}
public final String getName() {
Index: TrailerWriteCallbackMessage.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/data/TrailerWriteCallbackMessage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TrailerWriteCallbackMessage.java 18 Sep 2003 17:48:11 -0000 1.1
+++ TrailerWriteCallbackMessage.java 21 Oct 2003 01:52:37 -0000 1.2
@@ -11,7 +11,8 @@
boolean finished;
boolean success;
Node n;
- public TrailerWriteCallbackMessage(long id, Node n) {
+ SendData st;
+ public TrailerWriteCallbackMessage(long id, Node n, SendData st) {
super(id, false); // Data states are internal, see DataStateInitiator
this.n = n;
reset();
@@ -36,5 +37,9 @@
public String toString() {
return getClass().getName() + ":" + finished + ":" + success;
+ }
+
+ public long bytesAvailable() {
+ return st.bytesAvailable();
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
