2006-07-04 jrandom

* New NIO-based tcp transport (NTCP), enabled by default for outbound
      connections only.  Those who configure their NAT/firewall to allow
      inbound connections and specify the external host and port
      (dyndns/etc is ok) on /config.jsp can receive inbound connections.
      SSU is still enabled for use by default for all users as a fallback.
    * Substantial bugfix to the tunnel gateway processing to transfer
      messages sequentially instead of interleaved
    * Renamed GNU/crypto classes to avoid name clashes with kaffe and other
      GNU/Classpath based JVMs
    * Adjust the Fortuna PRNG's pooling system to reduce contention on
      refill with a background thread to refill the output buffer
    * Add per-transport support for the shitlist
    * Add a new async pumped tunnel gateway to reduce tunnel dispatcher
      contention

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

@@ -14,7 +14,7 @@ import java.security.SecureRandom;
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.EntropyHarvester;
 
-import gnu.crypto.prng.FortunaStandalone;
+import gnu.crypto.prng.AsyncFortunaStandalone;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -26,13 +26,13 @@ import java.io.IOException;
  *
  */
 public class FortunaRandomSource extends RandomSource implements EntropyHarvester {
-    private FortunaStandalone _fortuna;
+    private AsyncFortunaStandalone _fortuna;
     private double _nextGaussian;
     private boolean _haveNextGaussian;
 
     public FortunaRandomSource(I2PAppContext context) {
         super(context);
-        _fortuna = new FortunaStandalone();
+        _fortuna = new AsyncFortunaStandalone();
         byte seed[] = new byte[1024];
         if (initSeed(seed)) {
             _fortuna.seed(seed);
@@ -41,6 +41,7 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
             sr.nextBytes(seed);
             _fortuna.seed(seed);
         }
+        _fortuna.startup();
         // kickstart it
         _fortuna.nextBytes(seed);
         _haveNextGaussian = false;
@@ -202,6 +203,13 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
     public static void main(String args[]) {
         try {
             RandomSource rand = I2PAppContext.getGlobalContext().random();
+            if (true) {
+                for (int i = 0; i < 1000; i++)
+                    if (rand.nextFloat() < 0)
+                        throw new RuntimeException("negative!");
+                System.out.println("All positive");
+                return;
+            }
             java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
             java.util.zip.GZIPOutputStream gos = new java.util.zip.GZIPOutputStream(baos);
             for (int i = 0; i < 1024*1024; i++) {

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

@@ -48,6 +48,12 @@ public class I2PThread extends Thread {
         if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
             _createdBy = new Exception("Created by");
     }
+    public I2PThread(Runnable r, String name, boolean isDaemon) {
+        super(r, name);
+	setDaemon(isDaemon);
+        if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
+            _createdBy = new Exception("Created by");
+    }
     
     private void log(int level, String msg) { log(level, msg, null); }
     private void log(int level, String msg, Throwable t) {
@@ -113,4 +119,4 @@ public class I2PThread extends Thread {
         } catch (Throwable tt) { // nop
         }
     }
-}
+}

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

@@ -31,14 +31,14 @@ public class SimpleTimer {
         _context = I2PAppContext.getGlobalContext();
         _log = _context.logManager().getLog(SimpleTimer.class);
         _events = new TreeMap();
-        _eventTimes = new HashMap(1024);
+        _eventTimes = new HashMap(256);
         _readyEvents = new ArrayList(4);
         I2PThread runner = new I2PThread(new SimpleTimerRunner());
         runner.setName(name);
         runner.setDaemon(true);
         runner.start();
         for (int i = 0; i < 3; i++) {
-            I2PThread executor = new I2PThread(new Executor());
+            I2PThread executor = new I2PThread(new Executor(_context, _log, _readyEvents));
             executor.setName(name + "Executor " + i);
             executor.setDaemon(true);
             executor.start();
@@ -114,7 +114,7 @@ public class SimpleTimer {
         long timeToAdd = System.currentTimeMillis() - now;
         if (timeToAdd > 50) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("timer contention: took " + timeToAdd + "ms to add a job");
+                _log.warn("timer contention: took " + timeToAdd + "ms to add a job with " + totalEvents + " queued");
         }
             
     }
@@ -141,14 +141,6 @@ public class SimpleTimer {
         public void timeReached();
     }
     
-    private void log(String msg, Throwable t) {
-        synchronized (this) {
-            if (_log == null) 
-                _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
-        }
-        _log.log(Log.CRIT, msg, t);
-    }
-    
     private long _occurredTime;
     private long _occurredEventCount;
     private TimedEvent _recentEvents[] = new TimedEvent[5];
@@ -228,30 +220,45 @@ public class SimpleTimer {
             }
         }
     }
-    
-    private class Executor implements Runnable {
-        public void run() {
-            while (true) {
-                TimedEvent evt = null;
-                synchronized (_readyEvents) {
-                    if (_readyEvents.size() <= 0) 
-                        try { _readyEvents.wait(); } catch (InterruptedException ie) {}
-                    if (_readyEvents.size() > 0) 
-                        evt = (TimedEvent)_readyEvents.remove(0);
-                }
-                
-                if (evt != null) {
-                    long before = _context.clock().now();
-                    try {
-                        evt.timeReached();
-                    } catch (Throwable t) {
-                        log("wtf, event borked: " + evt, t);
-                    }
-                    long time = _context.clock().now() - before;
-                    if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
-                        _log.warn("wtf, event execution took " + time + ": " + evt);
+}
+
+class Executor implements Runnable {
+    private I2PAppContext _context;
+    private Log _log;
+    private List _readyEvents;
+    public Executor(I2PAppContext ctx, Log log, List events) {
+        _context = ctx;
+        _readyEvents = events;
+    }
+    public void run() {
+        while (true) {
+            SimpleTimer.TimedEvent evt = null;
+            synchronized (_readyEvents) {
+                if (_readyEvents.size() <= 0) 
+                    try { _readyEvents.wait(); } catch (InterruptedException ie) {}
+                if (_readyEvents.size() > 0) 
+                    evt = (SimpleTimer.TimedEvent)_readyEvents.remove(0);
+            }
+
+            if (evt != null) {
+                long before = _context.clock().now();
+                try {
+                    evt.timeReached();
+                } catch (Throwable t) {
+                    log("wtf, event borked: " + evt, t);
                 }
+                long time = _context.clock().now() - before;
+                if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
+                    _log.warn("wtf, event execution took " + time + ": " + evt);
             }
         }
     }
+    
+    private void log(String msg, Throwable t) {
+        synchronized (this) {
+            if (_log == null) 
+                _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
+        }
+        _log.log(Log.CRIT, msg, t);
+    }
 }