Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv29253/src/freenet/node
Modified Files:
Main.java
Log Message:
6234:
* Limit the volume of queryrejects sent to a node due to version being too old.
Includes exponential backoff.
* Dump low priority messages (e.g. most QueryRejected's) if we don't have a free conn
(reinstates pre-PH behaviour - bugfix).
* If a node is not contactable, and no free connections, discard the message.
* Bugfixes in PacketMessage.jobDone relating to losing message sent notifications.
* New diagnostics: messageSendTimeContactable, messageSendTimeNonContactable. Not all
old ones restored yet.
* Make sure we close files in FileEventList
* Add count of total files open by NativeFSDir to interesting objects dump.
* Indenting, logging
Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Main.java,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- Main.java 4 Oct 2003 01:16:56 -0000 1.264
+++ Main.java 11 Oct 2003 20:00:22 -0000 1.265
@@ -68,6 +68,7 @@
static Object ARKInserterLock = new Object();
static IPAddressDetector ipDetector = null;
static File tempDir = null;
+ static NativeFSDirectory newDir;
static FileLoggerHook loggerHook = null;
static LossyDirectory dsDir = null;
static long storeSize = -1; // Node.storeSize is per store. Of course we only
have one store now...
@@ -518,7 +519,6 @@
if(name.charAt(name.length()-1) == File.separatorChar)
name = name.substring(0,name.length()-1);
name += "-temp";
- Directory newDir;
try {
newDir = new
NativeFSDirectory(new File(name),
@@ -564,17 +564,18 @@
for(int x=0;x<storeFiles.length;x++)
storeFiles[x].delete();
new File(name).renameTo(storeFiles[0]);
- dir = new NativeFSDirectory
+ dir = newDir = new NativeFSDirectory
(storeFiles[0], Node.storeSize,
Node.storeBlockSize,
Node.useDSIndex,
Node.storeMaxTempFraction);
Core.logger.log(Main.class, "Conversion done",
Core.logger.NORMAL);
- }
+ }
} else {
- dir = new NativeFSDirectory(storeFiles[0], Node.storeSize,
-
Node.storeBlockSize,
-
Node.useDSIndex,
-
Node.storeMaxTempFraction);
+ dir = newDir = new NativeFSDirectory(storeFiles[0],
+
Node.storeSize,
+
Node.storeBlockSize,
+
Node.useDSIndex,
+
Node.storeMaxTempFraction);
Node.storeFile = new String[] { Node.storeFile[0] };
}
@@ -1962,6 +1963,13 @@
messages);
d.registerContinuous("messageSendTime", d.MINUTE,
"The total time taken to send
a message", messages);
+ d.registerContinuous("messageSendTimeContactable", d.MINUTE,
+ "The total time taken to send
a message to a "+
+ "node we have contact details
for", messages);
+ d.registerContinuous("messageSendTimeNonContactable", d.MINUTE,
+ "The total time taken to send
a message to a "+
+ "node we don't have contact
details for",
+ messages);
d.registerContinuous("messageSendTimeRT", d.MINUTE,
"The total time taken to send
a message to a node in the routing table", messages);
d.registerContinuous("messageSendTimeNonRT", d.MINUTE,
@@ -2729,8 +2737,9 @@
FNPmgr.countActivePeers()+
"\ntcpConnection.bufferPool: "+
tcpConnection.bufferPoolSize()+
+ "\nNativeFSDir open files: "+
+ newDir.totalOpenFiles()+
"\n"+tcpConnection.getWSL().analyzeUniqueness();
-
Core.logger.log(Main.class, status, Logger.MINOR);
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
