Update of /cvsroot/freenet/freenet/src/freenet/support
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/support
Modified Files:
Tag: stable
AbstractBinaryTree.java ArrayBucket.java BlockingQueue.java
BufferLoggerHook.java Fields.java FileBucketFactory.java
FileLoggerHook.java Logger.java RedBlackTree.java
SimpleDataObjectStore.java Skiplist.java SpyInputStream.java
SpyOutputStream.java TempBucketFactory.java
TempFileBucket.java URLDecoder.java
URLEncodedFormatException.java
Log Message:
5030: Merge minor(ish) changes from unstable:
Open Connections infolet
Minor implementation changes on normal mode
Show total bytes transmitted/received so far
Much new information on the PeerHandler mode
Fixed tons of eclipse warnings (almost all are style issues, not functional changes -
relating to logger and imports mostly). Remove deprecated FieldSet.add(String,String).
Update TestLocalNIOInterface to current API
Make 5029 mandatory (it can't connect to us anyway, only vice versa).
If incoming HTL is 25, 50% chance of not decrementing it, so we have some plausible
deniability when we send out an HTL 25 request (the client level HTL perturb mechanism
is insufficient although useful).
Don't use seednodes with no physical address.
Use our own URLEncoder/URLDecoder's, catch the exceptions. We were using java's, which
are deprecated.
Add support for deprecated options. These will be read form config file and handled,
but will not be written to it by --config. Currently bandwidthLimit and
averageBandwidthLimit are in this category. Separate code logs an error when these are
set.
Change the way bandwidthLimit set but others not set, to prevent it from constantly
getting 100% load due to bandwidth limit (0!) exceeded.
Set priority of entropy thread to MIN.
Remove old datastore code, GOOD RIDDENS!
Add a memory usage test for the Failure Table
Increase size of failure table to 20,000 (from 2,000).
Don't show the key request form in simple mode on the default infolet.
Major refactoring of HTML reporting, writing to disk, in NGRouting estimators.
Relative times in (for example) ?date= in fproxy: ?date=-1year gives the edition of a
DBR one year ago.
NIO refactoring (ASL.ChannelAttachmentPairQueue).
Logging.
Index: AbstractBinaryTree.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/AbstractBinaryTree.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -w -r1.3 -r1.3.6.1
--- AbstractBinaryTree.java 5 Mar 2002 21:01:38 -0000 1.3
+++ AbstractBinaryTree.java 1 Nov 2003 16:55:36 -0000 1.3.6.1
@@ -1,7 +1,7 @@
package freenet.support;
-import java.io.*;
-import freenet.support.BinaryTree.Node;
+import java.io.IOException;
+import java.io.PrintWriter;
public abstract class AbstractBinaryTree implements BinaryTree {
Index: ArrayBucket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/ArrayBucket.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.2.2.1
diff -u -w -r1.2.4.2 -r1.2.4.2.2.1
--- ArrayBucket.java 25 Mar 2003 18:37:05 -0000 1.2.4.2
+++ ArrayBucket.java 1 Nov 2003 16:55:36 -0000 1.2.4.2.2.1
@@ -1,8 +1,11 @@
package freenet.support;
-import freenet.*;
-import java.io.*;
-import java.util.Vector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Enumeration;
+import java.util.Vector;
/**
* A bucket that stores data in the memory.
Index: BlockingQueue.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/BlockingQueue.java,v
retrieving revision 1.1.1.1.4.1.2.7
retrieving revision 1.1.1.1.4.1.2.8
diff -u -w -r1.1.1.1.4.1.2.7 -r1.1.1.1.4.1.2.8
--- BlockingQueue.java 28 Oct 2003 20:20:45 -0000 1.1.1.1.4.1.2.7
+++ BlockingQueue.java 1 Nov 2003 16:55:36 -0000 1.1.1.1.4.1.2.8
@@ -1,8 +1,7 @@
package freenet.support;
-import freenet.*;
+import java.util.LinkedList;
-import java.util.*;
-import java.util.logging.LogManager;
+import freenet.Core;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
@@ -100,7 +99,7 @@
if (andnow - now >= (timeout) && !queue.isEmpty()) {
long x = andnow - enqueuedAt;
- if(queue.size() > 5 && x > (5*timeout)) {
+ if(queue.size() > 5 && x > 2000) {
String err = "Waited more than "+timeout+"ms to
dequeue, "+queue.size()+" in queue, "+x+" millis since enqueued last item,
"+dequeuedCounted+" maximum waits so far - could indicate serious JVM bug. Please
report to [EMAIL PROTECTED] along with JVM and OS/kernel.";
Core.logger.log(this, err, Logger.NORMAL);
System.err.println(err);
Index: BufferLoggerHook.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/BufferLoggerHook.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.1.2.1
diff -u -w -r1.2.4.1 -r1.2.4.1.2.1
--- BufferLoggerHook.java 9 Jan 2003 01:42:36 -0000 1.2.4.1
+++ BufferLoggerHook.java 1 Nov 2003 16:55:36 -0000 1.2.4.1.2.1
@@ -1,12 +1,9 @@
package freenet.support;
-import java.util.StringTokenizer;
-
/**
* A LoggerHook that buffers the last N log statements as objects.
* @author oskar
*/
-
public class BufferLoggerHook extends LoggerHook {
public static class LogEntry {
Index: Fields.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/Fields.java,v
retrieving revision 1.7.4.8.2.3
retrieving revision 1.7.4.8.2.4
diff -u -w -r1.7.4.8.2.3 -r1.7.4.8.2.4
--- Fields.java 28 Oct 2003 20:20:45 -0000 1.7.4.8.2.3
+++ Fields.java 1 Nov 2003 16:55:36 -0000 1.7.4.8.2.4
@@ -1,4 +1,5 @@
package freenet.support;
+import java.util.Calendar;
import java.util.StringTokenizer;
import java.util.GregorianCalendar;
import java.util.Date;
@@ -305,11 +306,54 @@
* The value has to be of the form YYYYMMDD-HH:MM:SS (where seconds
* may include a decimal) or YYYYMMDD (in which case 00:00:00 is assumed
* for time).
+ * Another accepted format is +/-{integer}{day|month|year|minute|second}
* @returns millis of the epoch of at the time described.
*/
public static final long dateTime(String date)
throws NumberFormatException {
+ if(date.length() == 0)
+ throw new NumberFormatException("Date time empty");
+
+ if(date.charAt(0) == '-' || date.charAt(0) == '+') {
+ // Relative date
+ StringBuffer sb = new StringBuffer(10);
+ for(int x=1;x<date.length();x++) {
+ char c = date.charAt(x);
+ if(Character.isDigit(date.charAt(x))) {
+ sb.append(c);
+ } else break;
+ }
+ int num = Integer.parseInt(new String(sb));
+ int chop = 1 + sb.length();
+ int deltaType = 0;
+ if(date.length() == chop)
+ deltaType = Calendar.DAY_OF_YEAR;
+ else {
+ String deltaTypeString = date.substring(chop).toLowerCase();
+ if(deltaTypeString.equals("y") ||
deltaTypeString.equals("yes"))
+ deltaType = Calendar.YEAR;
+ else if(deltaTypeString.equals("month") ||
deltaTypeString.equals("mo"))
+ deltaType = Calendar.MONTH;
+ else if(deltaTypeString.equals("week") ||
deltaTypeString.equals("w"))
+ deltaType = Calendar.WEEK_OF_YEAR;
+ else if(deltaTypeString.equals("day") ||
deltaTypeString.equals("d"))
+ deltaType = Calendar.DAY_OF_YEAR;
+ else if(deltaTypeString.equals("hour") ||
deltaTypeString.equals("h"))
+ deltaType = Calendar.HOUR;
+ else if(deltaTypeString.equals("minute") ||
deltaTypeString.equals("min"))
+ deltaType = Calendar.MINUTE;
+ else if(deltaTypeString.equals("second") ||
deltaTypeString.equals("s") ||
+ deltaTypeString.equals("sec"))
+ deltaType = Calendar.SECOND;
+ else
+ throw new NumberFormatException("unknown
time/date delta type: "+deltaTypeString);
+ GregorianCalendar gc = new GregorianCalendar();
+ gc.add(deltaType, (date.charAt(0) == '+') ? 1 : -1);
+ return gc.getTime().getTime();
+ }
+ }
+
int dash = date.indexOf('-');
Index: FileBucketFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/FileBucketFactory.java,v
retrieving revision 1.2.4.5
retrieving revision 1.2.4.5.2.1
diff -u -w -r1.2.4.5 -r1.2.4.5.2.1
--- FileBucketFactory.java 7 Mar 2003 23:27:20 -0000 1.2.4.5
+++ FileBucketFactory.java 1 Nov 2003 16:55:36 -0000 1.2.4.5.2.1
@@ -1,10 +1,10 @@
package freenet.support;
-import freenet.Core;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.util.Vector;
+
+import freenet.Core;
public class FileBucketFactory implements BucketFactory {
Index: FileLoggerHook.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/FileLoggerHook.java,v
retrieving revision 1.4.4.5.2.10
retrieving revision 1.4.4.5.2.11
diff -u -w -r1.4.4.5.2.10 -r1.4.4.5.2.11
--- FileLoggerHook.java 28 Oct 2003 20:20:45 -0000 1.4.4.5.2.10
+++ FileLoggerHook.java 1 Nov 2003 16:55:36 -0000 1.4.4.5.2.11
@@ -1,14 +1,19 @@
package freenet.support;
-import freenet.*;
-import java.io.*;
-import java.util.StringTokenizer;
-import java.util.Vector;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.Calendar;
import java.util.LinkedList;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Converted the old StandardLogger to Ian's loggerhook interface.
@@ -112,9 +117,9 @@
}
protected String getHourLogName(Calendar c) {
- return baseFilename + "-" + c.get(c.YEAR) + "-" + pad2(c.get(c.MONTH)) +
- "-" + pad2(c.get(c.DAY_OF_MONTH)) + "-" + pad2(c.get(c.HOUR_OF_DAY)) +
- (INTERVAL == c.MINUTE ? ("-" + pad2(c.get(c.MINUTE))) : "");
+ return baseFilename + "-" + c.get(Calendar.YEAR) + "-" +
pad2(c.get(Calendar.MONTH)) +
+ "-" + pad2(c.get(Calendar.DAY_OF_MONTH)) + "-" +
pad2(c.get(Calendar.HOUR_OF_DAY)) +
+ (INTERVAL == Calendar.MINUTE ? ("-" + pad2(c.get(Calendar.MINUTE))) : "");
}
protected String pad2(int x) {
Index: Logger.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/Logger.java,v
retrieving revision 1.7.4.1.2.1
retrieving revision 1.7.4.1.2.2
diff -u -w -r1.7.4.1.2.1 -r1.7.4.1.2.2
--- Logger.java 28 Oct 2003 20:20:45 -0000 1.7.4.1.2.1
+++ Logger.java 1 Nov 2003 16:55:36 -0000 1.7.4.1.2.2
@@ -1,8 +1,7 @@
package freenet.support;
-import freenet.Core;
-import java.io.PrintStream;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
+
/**
* A class that takes logging messages and distributes them to LoggerHooks.
* It implements LoggerHook itself, so that instances can be chained (just
Index: RedBlackTree.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/RedBlackTree.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -w -r1.2.6.1 -r1.2.6.2
--- RedBlackTree.java 5 Jul 2003 01:09:55 -0000 1.2.6.1
+++ RedBlackTree.java 1 Nov 2003 16:55:36 -0000 1.2.6.2
@@ -32,8 +32,6 @@
package freenet.support;
-import freenet.support.BinaryTree.Node;
-
/**
* Originally adapted from GNU Classpath 0.02 -- java.util.TreeMap
*
Index: SimpleDataObjectStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SimpleDataObjectStore.java,v
retrieving revision 1.4.2.4.2.4
retrieving revision 1.4.2.4.2.5
diff -u -w -r1.4.2.4.2.4 -r1.4.2.4.2.5
--- SimpleDataObjectStore.java 28 Oct 2003 20:20:45 -0000 1.4.2.4.2.4
+++ SimpleDataObjectStore.java 1 Nov 2003 16:55:36 -0000 1.4.2.4.2.5
@@ -1,13 +1,21 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.support;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+
import freenet.Core;
-import freenet.support.Comparator;
-import freenet.support.sort.*;
import freenet.fs.dir.FileNumber;
import freenet.fs.dir.FilePattern;
-//import java.util.Hashtable;
-import java.util.Enumeration;
-import java.io.*;
/**
* A simple DataObjectStore implementation backed by a skiplist that
@@ -67,7 +75,7 @@
int isize = in.readInt();
Core.logger.log(this, "Preloading "+isize+" entries.",
- Core.logger.DEBUG);
+ Logger.DEBUG);
for (int i = 0 ; i < isize ; i++) {
try {
@@ -79,7 +87,7 @@
}
size++;
} catch (EOFException e) {
- Core.logger.log(this, "Size was wrong reading in
SimpleDataObjectStore", Core.logger.ERROR);
+ Core.logger.log(this, "Size was wrong reading in
SimpleDataObjectStore", Logger.ERROR);
truncated = true;
break;
}
@@ -115,7 +123,7 @@
*/
public void flush() throws IOException {
Core.logger.log(this, "Trying to write to "+targets[saveFile].
- getAbsolutePath(), Core.logger.DEBUG);
+ getAbsolutePath(), Logger.DEBUG);
FileOutputStream fo = new FileOutputStream(targets[saveFile]);
DataOutputStream out = new DataOutputStream(new BufferedOutputStream(fo));
@@ -153,19 +161,19 @@
throws DataObjectUnloadedException {
long startTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Entering get("+key+") at "+startTime,
- Core.logger.DEBUG);
- long findsAtStart = contents.findCalled();
+ Logger.DEBUG);
+ long findsAtStart = Skiplist.findCalled();
DOWrapper res = (DOWrapper) contents.treeSearch(key);
- long findsAtEnd = contents.findCalled();
+ long findsAtEnd = Skiplist.findCalled();
long gotTime = System.currentTimeMillis();
long len = gotTime - startTime;
- if(len>500 || Core.logger.shouldLog(Core.logger.DEBUG))
+ if(len>500 || Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Ran treeSearch for "+key+" in "+len+
", find() called
"+(findsAtEnd-findsAtStart),
-
len>500?Core.logger.MINOR:Core.logger.DEBUG);
+
len>500?Logger.MINOR:Logger.DEBUG);
if (res == null)
return null;
Index: Skiplist.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/Skiplist.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -w -r1.4.6.1 -r1.4.6.2
--- Skiplist.java 1 Jul 2003 02:27:17 -0000 1.4.6.1
+++ Skiplist.java 1 Nov 2003 16:55:36 -0000 1.4.6.2
@@ -1,8 +1,6 @@
package freenet.support;
import java.util.Random;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
/**
* This an implementation of the BinaryTree interface backed by a SkipList.
Index: SpyInputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SpyInputStream.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -w -r1.1.2.1 -r1.1.2.1.2.1
--- SpyInputStream.java 24 Jan 2003 23:50:00 -0000 1.1.2.1
+++ SpyInputStream.java 1 Nov 2003 16:55:36 -0000 1.1.2.1.2.1
@@ -1,10 +1,7 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
////////////////////////////////////////////////////////////
// The purpose of all of this gobbledeygook is to
Index: SpyOutputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/SpyOutputStream.java,v
retrieving revision 1.1.2.2.2.1
retrieving revision 1.1.2.2.2.2
diff -u -w -r1.1.2.2.2.1 -r1.1.2.2.2.2
--- SpyOutputStream.java 1 Jul 2003 02:27:17 -0000 1.1.2.2.2.1
+++ SpyOutputStream.java 1 Nov 2003 16:55:36 -0000 1.1.2.2.2.2
@@ -1,10 +1,8 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
@@ -29,7 +27,7 @@
*/
private void println(String text) {
//if (vociferous) {
- if(freenet.Core.logger.shouldLog(freenet.Core.logger.DEBUG))
+ if(freenet.Core.logger.shouldLog(Logger.DEBUG))
freenet.Core.logger.log(this, text, Logger.DEBUGGING);
//
}
Index: TempBucketFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/TempBucketFactory.java,v
retrieving revision 1.2.2.4.2.3
retrieving revision 1.2.2.4.2.4
diff -u -w -r1.2.2.4.2.3 -r1.2.2.4.2.4
--- TempBucketFactory.java 28 Oct 2003 20:20:45 -0000 1.2.2.4.2.3
+++ TempBucketFactory.java 1 Nov 2003 16:55:36 -0000 1.2.2.4.2.4
@@ -1,11 +1,9 @@
package freenet.support;
-import freenet.*;
-import freenet.support.*;
+import java.io.File;
+import java.io.IOException;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import freenet.Core;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
@@ -40,15 +38,15 @@
if(tmpDir == null) tmpDir = System.getProperty("java.io.tmpdir");
// Core.logger.log(this, "Creating TempBucketFactory, tmpDir = "+
// (tmpDir == null ? "(null)" : tmpDir),
-// new Exception("debug"), Core.logger.DEBUG);
+// new Exception("debug"), Logger.DEBUG);
}
public TempBucketFactory() {
this(System.getProperty("java.io.tmpdir"));
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Creating TempBucketFactory, tmpDir = "+
(tmpDir == null ? "(null)" : tmpDir),
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
}
public Bucket makeBucket(long size) throws IOException {
@@ -75,23 +73,23 @@
f = new File(tmpDir, "tbf_" +
Long.toHexString(Math.abs(Core.getRandSource().nextInt())));
Core.logger.log(this, "Temp file in "+tmpDir,
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else {
f = new File("tbf_" +
Long.toHexString(Math.abs(Core.getRandSource().nextInt())));
Core.logger.log(this, "Temp file in pwd",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
} while (f.exists());
//System.err.println("TEMP BUCKET CREATED: " + f.getAbsolutePath());
//(new Exception("creating TempBucket")).printStackTrace();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Temp bucket created: " + f.getAbsolutePath()+
" with hook "+hook+" initial length "+size,
new Exception("creating TempBucket"),
- Core.logger.DEBUG);
+ Logger.DEBUG);
return new TempFileBucket(f, hook, size, increment, factor);
}
@@ -105,14 +103,14 @@
*/
public void freeBucket(Bucket b) throws IOException {
if (b instanceof TempFileBucket) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Temp bucket released: " +
((TempFileBucket)b).getFile().getAbsolutePath(),
new Exception("debug"), Logger.DEBUG);
if(!((TempFileBucket) b).release()) {
System.err.println("Could not release temp bucket"+b);
Core.logger.log(this, "Could not release temp bucket "+b,
- Core.logger.ERROR);
+ Logger.ERROR);
}
}
}
@@ -125,16 +123,16 @@
**/
public static void setHook(TempBucketHook t) {
Core.logger.log(TempBucketFactory.class, "Set TempBucketHook to "+t,
- Core.logger.DEBUG);
+ Logger.DEBUG);
hook = t;
if (hook == null) {
// Allow hooks to be disabled w/o sprinkling
// if (hook != null) {/*blah blah */} calls
// throughout the code.
hook = DONT_HOOK;
- if(Core.logger.shouldLog(Core.logger.DEBUG)) {
+ if(Core.logger.shouldLog(Logger.DEBUG)) {
Core.logger.log(TempBucketHook.class, "TempBucketHook file usage
management was disabled.",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
}
Index: TempFileBucket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/TempFileBucket.java,v
retrieving revision 1.1.2.6.2.5
retrieving revision 1.1.2.6.2.6
diff -u -w -r1.1.2.6.2.5 -r1.1.2.6.2.6
--- TempFileBucket.java 28 Oct 2003 20:20:45 -0000 1.1.2.6.2.5
+++ TempFileBucket.java 1 Nov 2003 16:55:36 -0000 1.1.2.6.2.6
@@ -1,13 +1,12 @@
package freenet.support;
-import freenet.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Vector;
import freenet.Core;
-// for logging. FileBucket uses Core.randSource as well as Core.logger, "fix" that
first :)
import freenet.support.io.NullInputStream;
/*
@@ -51,9 +50,9 @@
long x = startLength <= 0 ? minAlloc : startLength;
hook.createFile(x);
this.fakeLength = x;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Initializing TempFileBucket("+f+","+
- hook+")", Core.logger.DEBUG);
+ hook+")", Logger.DEBUG);
}
/**
@@ -66,9 +65,9 @@
if(released)
throw new IllegalStateException("Trying to getInputStream on "+
"released TempFileBucket!");
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getRealInputStream() for "+
- file, new Exception("debug"), Core.logger.DEBUG);
+ file, new Exception("debug"), Logger.DEBUG);
if(!file.exists()) return new NullInputStream();
else return new HookedFileBucketInputStream(file);
}
@@ -80,10 +79,10 @@
* @exception IOException Description of the Exception
*/
OutputStream getRealOutputStream() throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getRealOutputStream() for "+file,
new Exception("debug"),
- Core.logger.DEBUG);
+ Logger.DEBUG);
return super.getOutputStream();
}
@@ -97,9 +96,9 @@
* @exception IOException Description of the Exception
*/
public synchronized InputStream getInputStream() throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getInputStream for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
InputStream newIn = new SpyInputStream(this, file.getAbsolutePath());
return newIn;
}
@@ -111,17 +110,17 @@
* @exception IOException Description of the Exception
*/
public synchronized OutputStream getOutputStream() throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getOutputStream for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return new SpyOutputStream(this, file.getAbsolutePath());
}
/** Description of the Method */
public synchronized void resetWrite() {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Resetting write for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (isReleased()) {
throw new RuntimeException("Attempt to use a released TempFileBucket: " +
getName());
@@ -143,10 +142,10 @@
// Force all open streams closed.
// Windows won't let us delete the file unless we
// do this.
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
if(shouldLog)
Core.logger.log(this, "Releasing TempFileBucket "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
for (int i = 0; i < streams.size(); i++) {
try {
if (streams.elementAt(i) instanceof InputStream) {
@@ -179,12 +178,12 @@
} catch (IOException ioe) {
}
}
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Closed streams for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if(released) {
Core.logger.log(this, "Already released file: "+file.getName(),
- Core.logger.MINOR);
+ Logger.MINOR);
if(file.exists())
throw new IllegalStateException("already released file "+
file.getName()+
@@ -193,7 +192,7 @@
}
if(shouldLog)
Core.logger.log(this, "Checked for released for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
released = true;
if (file.exists()) {
if(shouldLog)
@@ -211,7 +210,7 @@
}
if(shouldLog)
Core.logger.log(this, "release() returning true for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return true;
}
@@ -230,9 +229,9 @@
* @exception Throwable Description of the Exception
*/
public void finalize() throws Throwable {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Finalizing TempFileBucket for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
super.finalize();
}
@@ -242,25 +241,25 @@
protected FileBucketOutputStream
newFileBucketOutputStream(String s, boolean append,
long restartCount) throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Creating new HookedFileBucketOutputStream for "+
- file, Core.logger.DEBUG);
+ file, Logger.DEBUG);
if(hook != null)
return new HookedFileBucketOutputStream(s, append, restartCount);
else return super.newFileBucketOutputStream(s, append, restartCount);
}
protected void deleteFile() {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, "Deleting "+file, Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, "Deleting "+file, Logger.DEBUG);
file.delete();
if(hook != null) hook.deleteFile(fakeLength);
}
protected synchronized void resetLength() {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Resetting length for "+file,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if(length != 0) {
if(hook != null) {
hook.shrinkFile(0, fakeLength);
@@ -325,26 +324,26 @@
public void write(byte[] b) throws IOException {
// Core.logger.log(this, "HookedFileBucketOutputStream.write(byte[] len "+
-// b.length+") for "+file, Core.logger.DEBUG);
+// b.length+") for "+file, Logger.DEBUG);
synchronized(TempFileBucket.this) {
// Core.logger.log(this, "Synchronized on TempFileBucket",
-// Core.logger.DEBUG);
+// Logger.DEBUG);
super.confirmWriteSynchronized();
-// Core.logger.log(this, "confirmWriteSynchronized()", Core.logger.DEBUG);
+// Core.logger.log(this, "confirmWriteSynchronized()", Logger.DEBUG);
long finalLength = length + b.length;
// Core.logger.log(this, "length="+length+", finalLength="+finalLength,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
long realStartLen = fakeLength;
getLengthSynchronized(finalLength);
-// Core.logger.log(this, "Called hook.enlargeFile()", Core.logger.DEBUG);
+// Core.logger.log(this, "Called hook.enlargeFile()", Logger.DEBUG);
try {
super.write(b);
-// Core.logger.log(this, "Written", Core.logger.DEBUG);
+// Core.logger.log(this, "Written", Logger.DEBUG);
} catch (IOException e) {
-// Core.logger.log(this, "Write failed", Core.logger.DEBUG);
+// Core.logger.log(this, "Write failed", Logger.DEBUG);
hook.shrinkFile(realStartLen, fakeLength);
fakeLength = realStartLen;
-// Core.logger.log(this, "Shrank file", Core.logger.DEBUG);
+// Core.logger.log(this, "Shrank file", Logger.DEBUG);
throw e;
}
}
@@ -352,7 +351,7 @@
public void write(byte[] b, int off, int len) throws IOException {
// Core.logger.log(this, "HookedFileBucketOutputStream.write(byte[], "+off+
-// ","+len+") for "+file, Core.logger.DEBUG);
+// ","+len+") for "+file, Logger.DEBUG);
synchronized(TempFileBucket.this) {
long finalLength = length + len;
long realStartLen = fakeLength;
@@ -369,7 +368,7 @@
public void write(int b) throws IOException {
// Core.logger.log(this, "HookedFileBucketOutputStream.write(int) for "+file,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
synchronized(TempFileBucket.this) {
long finalLength = length + 1;
long realStartLen = fakeLength;
Index: URLDecoder.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/URLDecoder.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -w -r1.2 -r1.2.6.1
--- URLDecoder.java 23 Mar 2002 22:29:26 -0000 1.2
+++ URLDecoder.java 1 Nov 2003 16:55:36 -0000 1.2.6.1
@@ -1,5 +1,4 @@
package freenet.support;
-import java.text.*;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
Index: URLEncodedFormatException.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/support/URLEncodedFormatException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
