Changeset f11a543

Timestamp:

Feb 11, 2011 11:59:10 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

f4ca3976

Parents:

3f3385f

Message:

• Clock: Cleanups and javadocs
• EepGet?: Cleanups and javadocs
• Reseed: Use the reseeder as a clock source

Files:

• apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java (modified) (1 diff)
• apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java (modified) (5 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/UnsignedUpdateHandler.java (modified) (2 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java (modified) (2 diffs)
• core/java/src/net/i2p/time/Timestamper.java (modified) (4 diffs)
• core/java/src/net/i2p/util/Clock.java (modified) (3 diffs)
• core/java/src/net/i2p/util/EepGet.java (modified) (5 diffs)
• router/java/src/net/i2p/router/RouterClock.java (modified) (5 diffs)
• router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java (modified) (8 diffs)
• router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java (modified) (1 diff)
• router/java/src/net/i2p/router/transport/ntcp/EstablishState.java (modified) (2 diffs)
• router/java/src/net/i2p/router/transport/udp/PacketHandler.java (modified) (1 diff)
• router/java/src/net/i2p/router/util/RFC822Date.java (added)

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java

@@ -60 +60 @@
         super(ctx, false, null, -1, numRetries, minSize, maxSize, outputFile, outputStream, url, true, null, null);
         _socketManager = mgr;
-        _log = ctx.logManager().getLog(I2PSocketEepGet.class);
     }
    

apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java

@@ -4 +4 @@
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 import net.i2p.I2PAppContext;
@@ -16 +14 @@
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterVersion;
+import net.i2p.router.util.RFC822Date;
 import net.i2p.util.EepGet;
 import net.i2p.util.EepHead;
@@ -74 +73 @@
                 _lastFetch = _lastUpdated;
             if (_lastModified == null)
-                _lastModified = to822Date(_lastFetch);
+                _lastModified = RFC822Date.to822Date(_lastFetch);
         } else {
             _lastUpdated = 0;
@@ -213 +212 @@
                 if (lastmod != null) {
                     if (!(_context.isRouterContext())) return;
-                    long modtime = parse822Date(lastmod);
+                    long modtime = RFC822Date.parse822Date(lastmod);
                     if (modtime <= 0) return;
                     String lastUpdate = _context.getProperty(UpdateHandler.PROP_LAST_UPDATE_TIME);
@@ -250 +249 @@
                                                           _unsignedUpdateVersion);
         handler.update();
-    }
-
-    /**
-     * http://jimyjoshi.com/blog/2007/08/rfc822dateparsinginjava.html
-     * Apparently public domain
-     * Probably don't need all of these...
-     */
-    private static final SimpleDateFormat rfc822DateFormats[] = new SimpleDateFormat[] {
-                 new SimpleDateFormat("EEE, d MMM yy HH:mm:ss z", Locale.US),
-                 new SimpleDateFormat("EEE, d MMM yy HH:mm z", Locale.US),
-                 new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z", Locale.US),
-                 new SimpleDateFormat("EEE, d MMM yyyy HH:mm z", Locale.US),
-                 new SimpleDateFormat("d MMM yy HH:mm z", Locale.US),
-                 new SimpleDateFormat("d MMM yy HH:mm:ss z", Locale.US),
-                 new SimpleDateFormat("d MMM yyyy HH:mm z", Locale.US),
-                 new SimpleDateFormat("d MMM yyyy HH:mm:ss z", Locale.US)
-    };
-
-    /**
-     * new Date(String foo) is deprecated, so let's do this the hard way
-     *
-     * @param s non-null
-     * @return -1 on failure
-     */
-    public static long parse822Date(String s) {
-        for (int i = 0; i < rfc822DateFormats.length; i++) {
-            try {
-                Date date = rfc822DateFormats[i].parse(s);
-                if (date != null)
-                    return date.getTime();
-            } catch (ParseException pe) {}
-        }
-        return -1;
-    }
-
-    /** @since 0.8.2 */
-    private static String to822Date(long t) {
-        return (new SimpleDateFormat("d MMM yyyy HH:mm:ss z", Locale.US)).format(new Date(t));
     }
 

apps/routerconsole/java/src/net/i2p/router/web/UnsignedUpdateHandler.java

@@ -5 +5 @@
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.router.util.RFC822Date;
 import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
@@ -102 +103 @@
                 long modtime = 0;
                 if (lastmod != null)
-                    modtime = NewsFetcher.parse822Date(lastmod);
+                    modtime = RFC822Date.parse822Date(lastmod);
                 if (modtime <= 0)
                     modtime = _context.clock().now();

apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java

@@ -16 +16 @@
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterVersion;
+import net.i2p.router.util.RFC822Date;
 import net.i2p.util.EepGet;
 import net.i2p.util.I2PAppThread;
@@ -272 +273 @@
                 long modtime = 0;
                 if (lastmod != null)
-                    modtime = NewsFetcher.parse822Date(lastmod);
+                    modtime = RFC822Date.parse822Date(lastmod);
                 if (modtime <= 0)
                     modtime = _context.clock().now();

core/java/src/net/i2p/time/Timestamper.java

@@ -5 +5 @@
 import java.util.Locale;
 import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import net.i2p.I2PAppContext;
@@ -57 +58 @@
         // moved here to prevent problems with synchronized statements.
         _servers = new ArrayList(3);
-        _listeners = new ArrayList(1);
+        _listeners = new CopyOnWriteArrayList();
         // Don't bother starting a thread if we are disabled.
         // This means we no longer check every 5 minutes to see if we got enabled,
@@ -93 +94 @@
     
     public void addListener(UpdateListener lsnr) {
-        synchronized (_listeners) {
             _listeners.add(lsnr);
-        }
     }
     public void removeListener(UpdateListener lsnr) {
-        synchronized (_listeners) {
             _listeners.remove(lsnr);
-        }
     }
     public int getListenerCount() {
-        synchronized (_listeners) {
             return _listeners.size();
-        }
     }
     public UpdateListener getListener(int index) {
-        synchronized (_listeners) {
             return _listeners.get(index);
-        }
     }
     
@@ -258 +251 @@
     private void stampTime(long now, int stratum) {
         long before = _context.clock().now();
-        synchronized (_listeners) {
-            for (int i = 0; i < _listeners.size(); i++) {
-                UpdateListener lsnr = _listeners.get(i);
-                lsnr.setNow(now, stratum);
-            }
+        for (UpdateListener lsnr : _listeners) {
+             lsnr.setNow(now, stratum);
         }
         if (_log.shouldLog(Log.DEBUG))

core/java/src/net/i2p/util/Clock.java

@@ -50 +50 @@
     public final static long MIN_OFFSET_CHANGE = 5 * 1000;
 
+    /**
+     * Specify how far away from the "correct" time the computer is - a positive
+     * value means that the system time is slow, while a negative value means the system time is fast.
+     *
+     * @param offsetMs the delta from System.currentTimeMillis() (NOT the delta from now())
+     */
     public void setOffset(long offsetMs) {
         setOffset(offsetMs, false);        
@@ -56 +62 @@
     /**
      * Specify how far away from the "correct" time the computer is - a positive
-     * value means that we are slow, while a negative value means we are fast.
+     * value means that the system time is slow, while a negative value means the system time is fast.
      * Warning - overridden in RouterClock
+     *
+     * @param offsetMs the delta from System.currentTimeMillis() (NOT the delta from now())
      */
     public void setOffset(long offsetMs, boolean force) {
@@ -102 +110 @@
     }
 
+    /*
+     * @return the current delta from System.currentTimeMillis() in milliseconds
+     */
     public long getOffset() {
         return _offset;

core/java/src/net/i2p/util/EepGet.java

@@ -29 +29 @@
  */
 public class EepGet {
-    protected I2PAppContext _context;
-    protected Log _log;
-    protected boolean _shouldProxy;
-    private String _proxyHost;
-    private int _proxyPort;
-    protected int _numRetries;
-    private long _minSize; // minimum and maximum acceptable response size, -1 signifies unlimited,
-    private long _maxSize; // applied both against whole responses and chunks
-    protected String _outputFile;
-    protected OutputStream _outputStream;
+    protected final I2PAppContext _context;
+    protected final Log _log;
+    protected final boolean _shouldProxy;
+    private final String _proxyHost;
+    private final int _proxyPort;
+    protected final int _numRetries;
+    private final long _minSize; // minimum and maximum acceptable response size, -1 signifies unlimited,
+    private final long _maxSize; // applied both against whole responses and chunks
+    protected final String _outputFile;
+    protected final OutputStream _outputStream;
     /** url we were asked to fetch */
-    protected String _url;
+    protected final String _url;
     /** the URL we actually fetch from (may differ from the _url in case of redirect) */
     protected String _actualURL;
-    private String _postData;
+    private final String _postData;
     private boolean _allowCaching;
     protected final List<StatusListener> _listeners;
@@ -107 +107 @@
                   String etag, String lastModified, String postData) {
         _context = ctx;
-        _log = ctx.logManager().getLog(EepGet.class);
+        _log = ctx.logManager().getLog(getClass());
         _shouldProxy = (proxyHost != null) && (proxyHost.length() > 0) && (proxyPort > 0) && shouldProxy;
         _proxyHost = proxyHost;
@@ -119 +119 @@
         _actualURL = url;
         _postData = postData;
-        _alreadyTransferred = 0;
-        _bytesTransferred = 0;
         _bytesRemaining = -1;
-        _currentAttempt = 0;
-        _transferFailed = false;
-        _headersRead = false;
-        _aborted = false;
         _fetchHeaderTimeout = CONNECT_TIMEOUT;
         _listeners = new ArrayList(1);
@@ -256 +250 @@
     }
     protected class CLIStatusListener implements StatusListener {
-        private int _markSize;
-        private int _lineSize;
-        private long _startedOn;
+        private final int _markSize;
+        private final int _lineSize;
+        private final long _startedOn;
         private long _written;
         private long _previousWritten;
@@ -272 +266 @@
             _markSize = markSize;
             _lineSize = lineSize;
-            _written = 0;
-            _previousWritten = 0;
-            _discarded = 0;
             _lastComplete = _context.clock().now();
             _startedOn = _lastComplete;

router/java/src/net/i2p/router/RouterClock.java

@@ -25 +25 @@
      */
     private static final long MAX_SLEW = 50;
-    private static final int DEFAULT_STRATUM = 8;
+    public static final int DEFAULT_STRATUM = 8;
     private static final int WORST_STRATUM = 16;
     /** the max NTP Timestamper delay is 30m right now, make this longer than that */
@@ -45 +45 @@
     /**
      * Specify how far away from the "correct" time the computer is - a positive
-     * value means that we are slow, while a negative value means we are fast.
+     * value means that the system time is slow, while a negative value means the system time is fast.
      *
+     * @param offsetMs the delta from System.currentTimeMillis() (NOT the delta from now())
      */
     @Override
@@ -53 +54 @@
     }
 
-    /** @since 0.7.12 */
+    /**
+     * @since 0.7.12
+     * @param offsetMs the delta from System.currentTimeMillis() (NOT the delta from now())
+     */
     private void setOffset(long offsetMs, int stratum) {
          setOffset(offsetMs, false, stratum);
     }
 
-    /** @since 0.7.12 */
+    /**
+     * @since 0.7.12
+     * @param offsetMs the delta from System.currentTimeMillis() (NOT the delta from now())
+     */
     private void setOffset(long offsetMs, boolean force, int stratum) {
         long delta = offsetMs - _offset;
@@ -92 +99 @@
             
             // If so configured, check sanity of proposed clock offset
-            if (Boolean.valueOf(_contextRC.getProperty("router.clockOffsetSanityCheck","true")).booleanValue() &&
+            if (_contextRC.getBooleanPropertyDefaultTrue("router.clockOffsetSanityCheck") &&
                 _alreadyChanged) {
 
@@ -193 +200 @@
      *  How far we still have to slew, for diagnostics
      *  @since 0.7.12
+     *  @deprecated for debugging only
      */
     public long getDeltaOffset() {

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -15 +15 @@
 
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.router.RouterClock;
 import net.i2p.router.RouterContext;
+import net.i2p.router.util.RFC822Date;
 import net.i2p.util.EepGet;
 import net.i2p.util.I2PAppThread;
@@ -35 +38 @@
  */
 public class Reseeder {
+    /** FIXME don't keep a static reference, store _isRunning some other way */
     private static ReseedRunner _reseedRunner;
     private final RouterContext _context;
@@ -47 +51 @@
      *  NOTE - URLs in both the standard and SSL groups should use the same hostname and path,
      *         so the reseed process will not download from both.
+     *
+     *  NOTE - Each seedURL must be a directory, it must end with a '/',
+     *         it can't end with 'index.html', for example. Both because of how individual file
+     *         URLs are constructed, and because SSLEepGet doesn't follow redirects.
      */
     public static final String DEFAULT_SEED_URL =
@@ -99 +107 @@
         private int _proxyPort;
         private SSLEepGet.SSLState _sslState;
+        private int _gotDate;
+        private long _attemptStarted;
+        private static final int MAX_DATE_SETS = 2;
 
         public ReseedRunner() {
-            _isRunning = false; 
-            System.clearProperty(PROP_ERROR);
-            System.setProperty(PROP_STATUS, _("Reseeding"));
-            System.setProperty(PROP_INPROGRESS, "true");
-        }
+        }
+
         public boolean isRunning() { return _isRunning; }
 
@@ -114 +122 @@
         public void run() {
             _isRunning = true;
+            System.clearProperty(PROP_ERROR);
+            System.setProperty(PROP_STATUS, _("Reseeding"));
+            System.setProperty(PROP_INPROGRESS, "true");
+            _attemptStarted = 0;
+            _gotDate = 0;
             _sslState = null;  // start fresh
             if (_context.getBooleanProperty(PROP_PROXY_ENABLE)) {
@@ -153 +166 @@
         public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {}
         public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {}
-        public void headerReceived(String url, int attemptNum, String key, String val) {}
-        public void attempting(String url) {}
+
+        /**
+         *  Use the Date header as a backup time source
+         */
+        public void headerReceived(String url, int attemptNum, String key, String val) {
+            // We do this more than once, because
+            // the first SSL handshake may take a while, and it may take the server
+            // a while to render the index page.
+            if (_gotDate < MAX_DATE_SETS && "date".equalsIgnoreCase(key) && _attemptStarted > 0) {
+                long timeRcvd = System.currentTimeMillis();
+                long serverTime = RFC822Date.parse822Date(val);
+                if (serverTime > 0) {
+                    // add 500ms since it's 1-sec resolution, and add half the RTT
+                    long now = serverTime + 500 + ((timeRcvd - _attemptStarted) / 2);
+                    long offset = now - _context.clock().now();
+                    if (_context.clock().getUpdatedSuccessfully()) {
+                        // 2nd time better than the first
+                        if (_gotDate > 0)
+                            _context.clock().setNow(now, RouterClock.DEFAULT_STRATUM - 2);
+                        else
+                            _context.clock().setNow(now, RouterClock.DEFAULT_STRATUM - 1);
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Reseed adjusting clock by " +
+                                      DataHelper.formatDuration(Math.abs(offset)));
+                    } else {
+                        // No peers or NTP yet, this is probably better than the peer average will be for a while
+                        // default stratum - 1, so the peer average is a worse stratum
+                        _context.clock().setNow(now, RouterClock.DEFAULT_STRATUM - 1);
+                        _log.logAlways(Log.WARN, "NTP failure, Reseed adjusting clock by " +
+                                                 DataHelper.formatDuration(Math.abs(offset)));
+                    }
+                    _gotDate++;
+                }
+            }
+        }
+
+        /** save the start time */
+        public void attempting(String url) {
+            if (_gotDate < MAX_DATE_SETS)
+                _attemptStarted = System.currentTimeMillis();
+        }
+
         // End of EepGet status listeners
 
@@ -236 +289 @@
         private int reseedOne(String seedURL, boolean echoStatus) {
             try {
-                final long timeLimit = _context.clock().now() + MAX_TIME_PER_HOST;
+                // Don't use context clock as we may be adjusting the time
+                final long timeLimit = System.currentTimeMillis() + MAX_TIME_PER_HOST;
                 System.setProperty(PROP_STATUS, _("Reseeding: fetching seed URL."));
                 System.err.println("Reseeding from " + seedURL);
@@ -276 +330 @@
                 // 200 max from one URL
                 for (Iterator<String> iter = urlList.iterator();
-                     iter.hasNext() && fetched < 200 && _context.clock().now() < timeLimit; ) {
+                     iter.hasNext() && fetched < 200 && System.currentTimeMillis() < timeLimit; ) {
                     try {
                         System.setProperty(PROP_STATUS,

router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java

@@ -510 +510 @@
         boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null;
         if (found)
-            buf.append("<a title=\"").append(_("NetDb entry")).append("\" href=\"netdb.jsp?r=").append(h).append("\">");
+            buf.append("<a title=\"").append(_("NetDb entry")).append("\" href=\"netdb?r=").append(h).append("\">");
         buf.append(h);
         if (found)

router/java/src/net/i2p/router/transport/ntcp/EstablishState.java

@@ -400 +400 @@
                     _tsA = _tsB;
                     if (diff != 0)
-                        _log.error("NTP failure, NTCP adjusting clock by " + DataHelper.formatDuration(diff));
+                        _log.logAlways(Log.WARN, "NTP failure, NTCP adjusting clock by " + DataHelper.formatDuration(diff));
                 } else if (diff >= Router.CLOCK_FUDGE_FACTOR) {
                     _context.statManager().addRateData("ntcp.invalidOutboundSkew", diff, 0);
@@ -618 +618 @@
                     tsA = _tsB;
                     if (diff != 0)
-                        _log.error("NTP failure, NTCP adjusting clock by " + DataHelper.formatDuration(diff));
+                        _log.logAlways(Log.WARN, "NTP failure, NTCP adjusting clock by " + DataHelper.formatDuration(diff));
                 } else if (diff >= Router.CLOCK_FUDGE_FACTOR) {
                     _context.statManager().addRateData("ntcp.invalidInboundSkew", diff, 0);

router/java/src/net/i2p/router/transport/udp/PacketHandler.java

@@ -474 +474 @@
                 _context.clock().setOffset(0 - skew, true);
                 if (skew != 0)
-                    _log.error("NTP failure, UDP adjusting clock by " + DataHelper.formatDuration(Math.abs(skew)));
+                    _log.logAlways(Log.WARN, "NTP failure, UDP adjusting clock by " + DataHelper.formatDuration(Math.abs(skew)));
             }