Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv19278/src/freenet/node/states/request
Modified Files:
Tag: ngrouting
TransferInsert.java TransferInsertPending.java
Log Message:
7049:
Logging.
Add new diag var, messageSuccessRatio.
Fix obscure (I hope...) NPE.
Schedule a new conn opener in NGRouting's check-for-open-conn when we need one.
Make count of RT nodes with open conns only include nodes with open conns *NOW*.
Change reporting of inserts, hopefully fix insertReplyTime not set errors.
Set acceptedTime when we set accepted, even if we don't actually get an Accepted.
Also zab's ASL work, and edward j. huff's typo fixes
Index: TransferInsert.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/TransferInsert.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- TransferInsert.java 29 Aug 2003 18:58:06 -0000 1.9.2.5
+++ TransferInsert.java 30 Aug 2003 01:23:01 -0000 1.9.2.6
@@ -262,9 +262,16 @@
case Presentation.CB_OK:
n.logger.log(this, "Insert transferred successfully! for "+this,
Logger.MINOR);
+ if(acceptedTime <= 0) {
+ n.logger.log(this, "acceptedTime not set yet!: "+this,
+ Logger.NORMAL);
+ terminateRouting(false, false);
+ break;
+ }
if(insertReplyTime <= 0) {
n.logger.log(this, "insertReplyTime not set yet!: "+this,
Logger.NORMAL);
+ terminateRouting(false, false);
break;
}
// FIXME: inserts are not the same. Search time will be longer.
@@ -273,9 +280,11 @@
", routedTime = "+routedTime+
", endTransferTime = "+endTransferTime,
Logger.DEBUG);
- routes.transferSucceeded(insertReplyTime - routedTime, hopsToLive,
+ routes.transferSucceeded(acceptedTime - routedTime, hopsToLive,
sendingData.length(),
- endTransferTime - insertReplyTime);
+ endTransferTime - acceptedTime);
+ // Of course, NGR doesn't know about the time between insertReply and
Accepted
+ // FIXME! - but the whole Insert system needs rewriting at the behaviour
level
break;
// receivingData will be caught by checkTransition
Index: TransferInsertPending.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/request/TransferInsertPending.java,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -r1.14.2.4 -r1.14.2.5
--- TransferInsertPending.java 29 Aug 2003 18:58:06 -0000 1.14.2.4
+++ TransferInsertPending.java 30 Aug 2003 01:23:01 -0000 1.14.2.5
@@ -208,6 +208,7 @@
if (!approved) {
cancelRestart();
accepted = true;
+ acceptedTime = insertReplyTime;
approved = true;
try {
n.logger.log(this, "Got InsertReply " +
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
