Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv9444/src/freenet/node/states/FCP
Modified Files:
NewInfo.java NewHello.java
Log Message:
some completely trivial code housekeeping
Index: NewInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInfo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NewInfo.java 30 Oct 2003 01:34:02 -0000 1.10
+++ NewInfo.java 30 Oct 2003 15:27:38 -0000 1.11
@@ -32,64 +32,64 @@
throw new BadStateException("expecting ClientInfo");
FieldSet fs = new FieldSet();
- fs.add("EstimatedLoad", Fields.longToHex((long)(n.estimatedLoad() *
100)));
+ fs.put("EstimatedLoad", Fields.longToHex((long)(n.estimatedLoad() *
100)));
- fs.add("IsTransient", n.isTransient() ? "true" : "false");
+ fs.put("IsTransient", n.isTransient() ? "true" : "false");
// Place all of these in their own try/catch set, so they the
parameters which are
// available to us will still be returned
try {
- fs.add("Architecture", System.getProperty("os.arch"));
+ fs.put("Architecture", System.getProperty("os.arch"));
} catch (Throwable e) { }
try {
- fs.add("Processors",
(String)Runtime.getRuntime().getClass().getMethod("availableProcessors",
null).invoke(Runtime.getRuntime(), null));
+ fs.put("Processors",
(String)Runtime.getRuntime().getClass().getMethod("availableProcessors",
null).invoke(Runtime.getRuntime(), null));
} catch (Throwable e) { }
try {
- fs.add("OperatingSystem", System.getProperty("os.name"));
+ fs.put("OperatingSystem", System.getProperty("os.name"));
} catch (Throwable e) { }
try {
- fs.add("OperatingSystemVersion",
System.getProperty("os.version"));
+ fs.put("OperatingSystemVersion",
System.getProperty("os.version"));
} catch (Throwable e) { }
try {
- fs.add("JavaVendor", System.getProperty("java.vendor.url"));
+ fs.put("JavaVendor", System.getProperty("java.vendor.url"));
} catch (Throwable e) { }
try {
- fs.add("JavaName", System.getProperty("java.vm.name"));
+ fs.put("JavaName", System.getProperty("java.vm.name"));
} catch (Throwable e) { }
try {
- fs.add("JavaVersion", System.getProperty("java.vm.version"));
+ fs.put("JavaVersion", System.getProperty("java.vm.version"));
} catch (Throwable e) { }
try {
- fs.add("MaximumMemory",
(String)Runtime.getRuntime().getClass().getMethod("maxMemory",
null).invoke(Runtime.getRuntime(), null));
+ fs.put("MaximumMemory",
(String)Runtime.getRuntime().getClass().getMethod("maxMemory",
null).invoke(Runtime.getRuntime(), null));
} catch (Throwable e) { }
try {
- fs.add("AllocatedMemory",
Fields.longToHex((long)(Runtime.getRuntime().totalMemory())));
+ fs.put("AllocatedMemory",
Fields.longToHex((long)(Runtime.getRuntime().totalMemory())));
} catch (Throwable e) { }
try {
- fs.add("FreeMemory",
Fields.longToHex((long)(Runtime.getRuntime().freeMemory())));
+ fs.put("FreeMemory",
Fields.longToHex((long)(Runtime.getRuntime().freeMemory())));
} catch (Throwable e) { }
- fs.add("DatastoreMax",
Fields.longToHex((long)(n.storeSize*n.storeFile.length)));
- fs.add("DatastoreFree", Fields.longToHex((long)(n.dir.available())));
- fs.add("DatastoreUsed",
Fields.longToHex((long)(n.storeSize*n.storeFile.length - n.dir.available())));
- fs.add("MaxFileSize",
Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
- fs.add("MostRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).mostRecentlyUsedTime()));
- fs.add("LeastRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).leastRecentlyUsedTime()));
+ fs.put("DatastoreMax",
Fields.longToHex((long)(n.storeSize*n.storeFile.length)));
+ fs.put("DatastoreFree", Fields.longToHex((long)(n.dir.available())));
+ fs.put("DatastoreUsed",
Fields.longToHex((long)(n.storeSize*n.storeFile.length - n.dir.available())));
+ fs.put("MaxFileSize",
Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
+ fs.put("MostRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).mostRecentlyUsedTime()));
+ fs.put("LeastRecentTimestamp",
Fields.longToHex((long)((NativeFSDirectory)n.dir).leastRecentlyUsedTime()));
- fs.add("RoutingTime",
Fields.longToHex((long)(n.diagnostics.getValue("routingTime", Diagnostics.MINUTE,
Diagnostics.MEAN_VALUE))));
+ fs.put("RoutingTime",
Fields.longToHex((long)(n.diagnostics.getValue("routingTime", Diagnostics.MINUTE,
Diagnostics.MEAN_VALUE))));
- fs.add("AvailableThreads", Fields.longToHex(n.availableThreads()));
- fs.add("ActiveJobs", Fields.longToHex(n.activeJobs()));
+ fs.put("AvailableThreads", Fields.longToHex(n.availableThreads()));
+ fs.put("ActiveJobs", Fields.longToHex(n.activeJobs()));
tcpAddress tcp = Main.getTcpAddress();
if(tcp!=null) {
@@ -101,8 +101,8 @@
Core.logger.ERROR);
addr = tcp.getValName();
}
- fs.add("NodeAddress", addr);
- fs.add("NodePort", Fields.longToHex((long)tcp.getPort()));
+ fs.put("NodeAddress", addr);
+ fs.put("NodePort", Fields.longToHex((long)tcp.getPort()));
}
// FIXME: add thread stats stuff here when I work it out ^_^
Index: NewHello.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewHello.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NewHello.java 18 Oct 2003 00:17:56 -0000 1.7
+++ NewHello.java 30 Oct 2003 15:27:38 -0000 1.8
@@ -25,11 +25,11 @@
Core.logger.log(this, "Running ClientHello: "+mo+" on "+this,
Logger.DEBUG);
FieldSet fs = new FieldSet();
- fs.add("Node", Version.getVersionString());
- fs.add("Protocol", "1.2");
- fs.add("MaxFileSize", Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
+ fs.put("Node", Version.getVersionString());
+ fs.put("Protocol", "1.2");
+ fs.put("MaxFileSize", Fields.longToHex(((FSDataStore)(n.ds)).maxDataSize));
if (Version.highestSeenBuild > Version.buildNumber) {
- fs.add("HighestSeenBuild", ""+Version.highestSeenBuild);
+ fs.put("HighestSeenBuild", ""+Version.highestSeenBuild);
}
sendMessage(new NodeHello(id, fs));
if(logDEBUG) Core.logger.log(this, "Finished running ClientHello "+
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
