Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv31561/src/freenet/message
Modified Files:
Accepted.java AnnouncementComplete.java
AnnouncementExecute.java AnnouncementFailed.java
AnnouncementReply.java DataNotFound.java DataRequest.java
DataSend.java Identify.java InsertReply.java
NodeAnnouncement.java QueryAborted.java QueryRejected.java
QueryRestarted.java Request.java StoreData.java
VoidMessage.java
Log Message:
6225:
Iakin:
* Logging fixes
* Fix a common, nasty NullPointerException introduced recently.
Me:
* Calculate total bytes queued in trailers, including what is sending and what is
queued, across all PeerHandlers. Use this for a reasonably accurate queue length in
OCM infolet.
- Message.trailerLength()
- PeerHandler.queuedBytes()
- OCM.totalSendQueueSize()
* Try to find error in ConnectionOpener causing stack track starting on Random.getInt
* Logging improvements.
Index: Accepted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Accepted.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Accepted.java 8 Oct 2003 22:54:18 -0000 1.2
+++ Accepted.java 9 Oct 2003 00:23:39 -0000 1.3
@@ -34,4 +34,8 @@
public final boolean hasTrailer() {
return false;
}
+
+ public final long trailerLength() {
+ return 0;
+ }
}
Index: AnnouncementComplete.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementComplete.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnnouncementComplete.java 8 Oct 2003 22:54:18 -0000 1.2
+++ AnnouncementComplete.java 9 Oct 2003 00:23:39 -0000 1.3
@@ -45,6 +45,10 @@
return keys.streamLength() != 0;
}
+ public long trailerLength() {
+ return keys.streamLength();
+ }
+
public String getMessageName() {
return messageName;
}
Index: AnnouncementExecute.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementExecute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnnouncementExecute.java 8 Oct 2003 22:54:18 -0000 1.2
+++ AnnouncementExecute.java 9 Oct 2003 00:23:39 -0000 1.3
@@ -61,6 +61,10 @@
return vals.streamLength() != 0;
}
+ public long trailerLength() {
+ return vals.streamLength();
+ }
+
public String getMessageName() {
return messageName;
}
Index: AnnouncementFailed.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementFailed.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AnnouncementFailed.java 8 Oct 2003 22:54:18 -0000 1.5
+++ AnnouncementFailed.java 9 Oct 2003 00:23:39 -0000 1.6
@@ -69,8 +69,12 @@
return raw;
}
- public boolean hasTrailer() {
+ public final boolean hasTrailer() {
return false;
+ }
+
+ public final long trailerLength() {
+ return 0;
}
public String getMessageName() {
Index: AnnouncementReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnnouncementReply.java 8 Oct 2003 22:54:18 -0000 1.2
+++ AnnouncementReply.java 9 Oct 2003 00:23:39 -0000 1.3
@@ -44,8 +44,12 @@
return raw;
}
- public boolean hasTrailer() {
+ public final boolean hasTrailer() {
return false;
+ }
+
+ public final long trailerLength() {
+ return 0;
}
public String getMessageName() {
Index: DataNotFound.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataNotFound.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataNotFound.java 8 Oct 2003 22:54:18 -0000 1.3
+++ DataNotFound.java 9 Oct 2003 00:23:39 -0000 1.4
@@ -50,8 +50,12 @@
return raw;
}
- public boolean hasTrailer() {
+ public final boolean hasTrailer() {
return false;
+ }
+
+ public final long trailerLength() {
+ return 0;
}
public String getMessageName() {
Index: DataRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DataRequest.java 8 Oct 2003 22:54:18 -0000 1.5
+++ DataRequest.java 9 Oct 2003 00:23:39 -0000 1.6
@@ -47,6 +47,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: DataSend.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataSend.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DataSend.java 8 Oct 2003 22:54:18 -0000 1.7
+++ DataSend.java 9 Oct 2003 00:23:40 -0000 1.8
@@ -60,6 +60,10 @@
return length != 0;
}
+ public long trailerLength() {
+ return length;
+ }
+
public RawMessage toRawMessage(Presentation t) {
RawMessage raw=super.toRawMessage(t);
Index: Identify.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Identify.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Identify.java 8 Oct 2003 22:54:18 -0000 1.2
+++ Identify.java 9 Oct 2003 00:23:40 -0000 1.3
@@ -43,6 +43,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: InsertReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InsertReply.java 8 Oct 2003 22:54:18 -0000 1.2
+++ InsertReply.java 9 Oct 2003 00:23:40 -0000 1.3
@@ -27,6 +27,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: NodeAnnouncement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeAnnouncement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeAnnouncement.java 8 Oct 2003 22:54:18 -0000 1.4
+++ NodeAnnouncement.java 9 Oct 2003 00:23:40 -0000 1.5
@@ -101,6 +101,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: QueryAborted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryAborted.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QueryAborted.java 8 Oct 2003 22:54:18 -0000 1.2
+++ QueryAborted.java 9 Oct 2003 00:23:40 -0000 1.3
@@ -28,6 +28,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- QueryRejected.java 8 Oct 2003 22:54:18 -0000 1.7
+++ QueryRejected.java 9 Oct 2003 00:23:40 -0000 1.8
@@ -117,8 +117,12 @@
return raw;
}
- public boolean hasTrailer() {
+ public final boolean hasTrailer() {
return false;
+ }
+
+ public final long trailerLength() {
+ return 0;
}
public int hopsToLive() {
Index: QueryRestarted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRestarted.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QueryRestarted.java 8 Oct 2003 22:54:18 -0000 1.2
+++ QueryRestarted.java 9 Oct 2003 00:23:40 -0000 1.3
@@ -34,8 +34,12 @@
return raw;
}
- public boolean hasTrailer() {
+ public final boolean hasTrailer() {
return false;
+ }
+
+ public final long trailerLength() {
+ return 0;
}
public String getMessageName() {
Index: Request.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Request.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Request.java 8 Oct 2003 22:54:18 -0000 1.8
+++ Request.java 9 Oct 2003 00:23:40 -0000 1.9
@@ -79,6 +79,10 @@
return false;
}
+ public long trailerLength() {
+ return 0;
+ }
+
public int hopsToLive() {
return (int) hopsToLive;
}
Index: StoreData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/StoreData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StoreData.java 8 Oct 2003 22:54:18 -0000 1.8
+++ StoreData.java 9 Oct 2003 00:23:40 -0000 1.9
@@ -88,6 +88,10 @@
return false;
}
+ public final long trailerLength() {
+ return 0;
+ }
+
public int hopsSinceReset() {
return hopsSinceReset;
}
Index: VoidMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/VoidMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VoidMessage.java 8 Oct 2003 22:54:18 -0000 1.2
+++ VoidMessage.java 9 Oct 2003 00:23:40 -0000 1.3
@@ -74,6 +74,10 @@
return dataLength > 0;
}
+ public final long trailerLength() {
+ return dataLength;
+ }
+
public String getMessageName() {
return messageName;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
