Author: toad
Date: 2005-11-18 22:12:55 +0000 (Fri, 18 Nov 2005)
New Revision: 7568
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/Version.java
Log:
197:
log rotation.
time inserts/requests.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2005-11-18 21:31:20 UTC (rev
7567)
+++ trunk/freenet/src/freenet/node/Node.java 2005-11-18 22:12:55 UTC (rev
7568)
@@ -267,7 +267,7 @@
int port = Integer.parseInt(args[0]);
System.out.println("Port number: "+port);
- FileLoggerHook logger = new FileLoggerHook("freenet-"+port+".log", "d
(c, t, p): m", "MMM dd, yyyy HH:mm:ss:SSS", Logger.MINOR, false, true);
+ FileLoggerHook logger = new FileLoggerHook(true,
"freenet-"+port+".log", "d (c, t, p): m", "MMM dd, yyyy HH:mm:ss:SSS",
Logger.MINOR, false, true);
Logger.setupChain();
Logger.globalSetThreshold(Logger.MINOR);
Logger.globalAddHook(logger);
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-18
21:31:20 UTC (rev 7567)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2005-11-18
22:12:55 UTC (rev 7568)
@@ -163,6 +163,7 @@
return;
}
try {
+ long startTime = System.currentTimeMillis();
FetchResult result = client.fetch(uri);
ClientMetadata cm = result.getMetadata();
System.out.println("Content MIME type:
"+cm.getMIMEType());
@@ -196,6 +197,10 @@
// Ignore
}
}
+ long endTime = System.currentTimeMillis();
+ long sz = data.size();
+ double rate = 1000.0 * sz / (endTime-startTime);
+ System.out.println("Download rate: "+rate+" bytes / second");
} catch (FetchException e) {
System.out.println("Error: "+e.getMessage());
}
@@ -245,6 +250,7 @@
line = line.substring(0, line.length()-2);
File f = new File(line);
System.out.println("Attempting to read file "+line);
+ long startTime = System.currentTimeMillis();
try {
if(!(f.exists() && f.canRead())) {
throw new FileNotFoundException();
@@ -256,19 +262,29 @@
FileBucket fb = new FileBucket(f, true, false, false);
InsertBlock block = new InsertBlock(fb, new
ClientMetadata(mimeType), FreenetURI.EMPTY_CHK_URI);
-
+
+ startTime = System.currentTimeMillis();
FreenetURI uri = client.insert(block, getCHKOnly);
// FIXME depends on CHK's still being renamable
- uri = uri.setDocName(f.getName());
+ //uri = uri.setDocName(f.getName());
System.out.println("URI: "+uri);
+ long endTime = System.currentTimeMillis();
+ long sz = f.length();
+ double rate = 1000.0 * sz / (endTime-startTime);
+ System.out.println("Upload rate: "+rate+" bytes / second");
} catch (FileNotFoundException e1) {
System.out.println("File not found");
} catch (InserterException e) {
System.out.println("Finished insert but: "+e.getMessage());
- if(e.uri != null)
+ if(e.uri != null) {
System.out.println("URI would have been: "+e.uri);
+ long endTime = System.currentTimeMillis();
+ long sz = f.length();
+ double rate = 1000.0 * sz / (endTime-startTime);
+ System.out.println("Upload rate: "+rate+" bytes / second");
+ }
} catch (Throwable t) {
System.out.println("Insert threw: "+t);
t.printStackTrace();
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-18 21:31:20 UTC (rev
7567)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-18 22:12:55 UTC (rev
7568)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 196;
+ public static final int buildNumber = 197;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 196;
