Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv10578/node
Modified Files:
Node.java
Log Message:
Cleanup descriptions shown by --config
setExpert on three options someone added without descriptions.
Fix an NPE in the old RandomAccessFilePool
Reimplement RandomAccessFilePool to support OSs that don't limit FDs
Index: Node.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Node.java,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -w -r1.244 -r1.245
--- Node.java 8 Nov 2003 18:30:18 -0000 1.244
+++ Node.java 10 Nov 2003 09:48:38 -0000 1.245
@@ -136,7 +136,6 @@
config.addOption("averageOutputBandwidthLimit", 1, 0, 1205); // disabled
sysName = sysName.toLowerCase();
- maxFileDefault = 256;
int rtMaxNodesDefault = 50;
if(sysName.startsWith("windows")) {
maxFileDefault = 1024; //
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/html/_crt__setmaxstdio.asp
@@ -167,6 +166,12 @@
isOSX = true;
} else isOSX = false;
+ if(sysName.startsWith("netware")) {
+ // supports unlimited FDs
+ maxConnDefault = 0;
+ maxFileDefault = 0;
+ }
+
config.addOption("rtMaxNodes", 1, rtMaxNodesDefault, 1301);
config.addOption("maxNodeConnections", 1, maxConnDefault, 1224);
@@ -628,6 +633,9 @@
"The number keys that failed to be retrieved the node
should key track of."
);
+ //failureTableItems
+ config.setExpert ("failureTableItems", true);
+
// failureTableTime
config.setExpert ("failureTableTime", true);
config.argDesc ("failureTableTime", "<milliseconds>");
@@ -651,13 +659,28 @@
config.argDesc ("inputBandwidthLimit", "<bytes/sec>");
config.shortDesc ("inputBandwidthLimit", "incoming bandwidth limit");
config.longDesc ("inputBandwidthLimit",
- "If nonzero, specifies an independent limit for incoming
data only, in bytes per second. A 512kbps broadband (DSL or cable) connection is
32kB/sec, but you may want to use other things than Freenet on it. However, Freenet's
background usage should be close to the output limit most of the time.");
+ "If nonzero, specifies an independent limit for incoming
data only, in bytes",
+ "per second. A 512kbps broadband (DSL or cable) connection
is 32kB/sec, but",
+ "you may want to use other things than Freenet on it.
However, Freenet's",
+ "background usage should be close to the output limit most
of the time."
+ );
// outputBandwidthLimit
config.argDesc ("outputBandwidthLimit", "<bytes/sec>");
config.shortDesc ("outputBandwidthLimit", "if enabled, outgoing bandwidth
limit");
config.longDesc ("outputBandwidthLimit",
- "If doLowLevelOutputLimiting, and if outputBandwidthLimit
is nonzero, specifies an independent limit for outgoing data only. Not entirely
accurate. If you need exact limiting, do it at the OS level. A typical broadband
connection has either a 128kbps or a 256kbps uplink, this equates to 16kB/sec and
32kB/sec respectively. You will need to keep some bandwidth back for other apps and
for downloads (yes, downloading uses a small amount of upload bandwidth). We suggest
therefore limits of 12000 for a 128kbps upload connection, or 24000 for a 256kbps
upload connection. Most broadband connections have far more download bandwidth than
upload bandwidth... just because you have 1Mbps download, does not mean you have 1Mbps
upload; if you do not know what your connection's upload speed is, use one of the
above options.");
+ "If nonzero, specifies an independent limit for outgoing
data only, in bytes",
+ "per second. Not entirely accurate. If you need exact
limiting, do it at the",
+ "OS level. A typical broadband connection has either a
128kbps or a 256kbps",
+ "uplink, this equates to 16kB/sec and 32kB/sec
respectively. You will need to",
+ "keep some bandwidth back for other apps and for downloads
(yes, downloading",
+ "uses a small amount of upload bandwidth). We suggest
therefore limits of",
+ "12000 for a 128kbps upload connection, or 24000 for a
256kbps upload",
+ "connection. Most broadband connections have far more
download bandwidth than",
+ "upload bandwidth... just because you have 1Mbps download,
does not mean you",
+ "have 1Mbps upload; if you do not know what your
connection's upload speed is,",
+ "use one of the above options."
+ );
// averageBandwidthLimit
config.setExpert ("averageBandwidthLimit", true);
@@ -1272,6 +1295,12 @@
config.argDesc ("lowLevelBWLimitMultiplier", "<floating point number over
0>");
config.longDesc ("lowLevelBWLimitMultiplier", "Freenet has 2 separate
bandwidth limiting mechanisms. The low level bandwidth limiter is more accurate, but
can cause bad things to happeen and is quite expensive in terms of CPU time, and works
by delaying messages, which may not be desirable. So by default limiting is done
mainly by the high level limiter (see outLimitCutoff and outLimitConnectCutoff), and
the low level limiter is set to a higher value to ensure that the node's usage does
not get completely out of control when something unusual happens. Set the factor to
multiply the bandwidth limits by before feeding them to the low level limiter here.");
+ // doLowLevelOutputLimiting
+ config.setExpert ("doLowLevelOutputLimiting", true);
+
+ // doLowLevelInputLimiting
+ config.setExpert ("doLowLevelInputLimiting", true);
+
// // doCPULoad
// config.setExpert ("doCPULoad", true);
// config.argDesc ("doCPULoad", "<true|false>");
@@ -1803,7 +1832,11 @@
// mainport.params.servlet.7.params.sfDefaultSaveDir
config.setExpert("mainport.params.servlet.7.params.sfDefaultSaveDir", false);
config.argDesc ("mainport.params.servlet.7.params.sfDefaultSaveDir", "path
to folder");
- config.shortDesc("mainport.params.servlet.7.params.sfDefaultSaveDir",
"Default folder to save large downloaded files to. Defaults to a folder called
\"freenet-downloads\" in your home directory.");
+ config.shortDesc("mainport.params.servlet.7.params.sfDefaultSaveDir",
"Default folder to save large downloaded files to.");
+ config.longDesc ("mainport.params.servlet.7.params.sfDefaultSaveDir",
+ "Default folder to save large downloaded files to. Defaults
to a folder",
+ "called \"freenet-downloads\" in your home directory."
+ );
// mainport.params.servlet.7.params.sfDefaultWriteToDisk
config.setExpert("mainport.params.servlet.7.params.sfDefaultWriteToDisk",
true);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
