Changeset 1ef33906

Timestamp:

Mar 19, 2006 12:23:23 AM (15 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

c5ddfab

Parents:

f3849a2

git-author:

jrandom <jrandom> (03/19/06 00:23:23)

git-committer:

zzz <zzz@…> (03/19/06 00:23:23)

Message:

2006-03-18 jrandom

• Added a new graphs.jsp page to show all of the stats being harvested

Files:

• Makefile.gcj (modified) (4 diffs)
• apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java (added)
• apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java (modified) (1 diff)
• apps/routerconsole/jsp/graphs.jsp (added)
• apps/routerconsole/jsp/nav.jsp (modified) (1 diff)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/Router.java (modified) (4 diffs)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

Makefile.gcj

@@ -22 +22 @@
 #  jbigi.jar: collection of native optimized GMP routines for crypto
 JAR_BASE=i2p.jar mstreaming.jar streaming.jar
-JAR_CLIENTS=i2ptunnel.jar sam.jar i2psnark.jar
+JAR_CLIENTS=i2ptunnel.jar sam.jar
 JAR_ROUTER=router.jar
 JAR_JBIGI=jbigi.jar
 JAR_XML=xml-apis.jar resolver.jar xercesImpl.jar
 JAR_CONSOLE=\
+            i2psnark.jar \
             javax.servlet.jar \
             commons-el.jar \
@@ -80 +81 @@
         @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2p_dsa --main=net.i2p.crypto.DSAEngine 
         @echo "* i2p_dsa is a simple test app with the DSA engine and Fortuna PRNG to make sure crypto is working"
-        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.Fortuna
+        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.FortunaStandalone
         @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnel --main=net.i2p.i2ptunnel.I2PTunnel 
         @echo "* i2ptunnel is mihi's I2PTunnel CLI"
@@ -87 +88 @@
         @echo "* i2ptunnelctl is a controller for I2PTunnel, reading i2ptunnel.config"
         @echo "  and launching the appropriate proxies"
-        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
-        @echo "* i2psnark is an anonymous bittorrent client"
+        #@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
+        #@echo "* i2psnark is an anonymous bittorrent client"
         @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2prouter --main=net.i2p.router.Router 
         @echo "* i2prouter is the main I2P router"
@@ -96 +97 @@
 libi2p.so:
         @echo "* Building libi2p.so"
-        @(cd build ; ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/libi2p.so ${LIBI2P_JARS} ; cd .. )
+        @(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/libi2p.so ${LIBI2P_JARS} ; cd .. )
         @ls -l ${NATIVE_DIR}/libi2p.so
         @echo "* libi2p.so built"

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

@@ -31 +31 @@
         }
     }
+    
+    /** list of SummaryListener instances */
+    List getListeners() { return _listeners; }
     
     private static final String DEFAULT_DATABASES = "bw.sendRate.60000" +

apps/routerconsole/jsp/nav.jsp

@@ -34 +34 @@
  <a href="logs.jsp">Logs</a> |
  <a href="jobs.jsp">Jobs</a> |
+ <a href="graphs.jsp">Graphs</a> |
  <a href="oldstats.jsp">Stats</a> |
  <a href="oldconsole.jsp">Internals</a>

history.txt

@@ -1 @@
-$Id: history.txt,v 1.433 2006/03/17 18:46:03 jrandom Exp $
+$Id: history.txt,v 1.434 2006/03/18 18:09:38 jrandom Exp $
+
+2006-03-18  jrandom
+    * Added a new graphs.jsp page to show all of the stats being harvested
 
 2006-03-18  jrandom

router/java/src/net/i2p/router/Router.java

@@ -246 +246 @@
         _context.inNetMessagePool().startup();
         startupQueue();
-        _context.jobQueue().addJob(new CoalesceStatsJob(_context));
+        //_context.jobQueue().addJob(new CoalesceStatsJob(_context));
+        SimpleTimer.getInstance().addEvent(new CoalesceStatsEvent(_context), 0);
         _context.jobQueue().addJob(new UpdateRoutingKeyModifierJob(_context));
         warmupCrypto();
@@ -1012 +1013 @@
  *
  */
-class CoalesceStatsJob extends JobImpl {
-    public CoalesceStatsJob(RouterContext ctx) { 
-        super(ctx); 
+class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
+    private RouterContext _ctx;
+    public CoalesceStatsEvent(RouterContext ctx) { 
+        _ctx = ctx; 
         ctx.statManager().createRateStat("bw.receiveBps", "How fast we receive data (in KBps)", "Bandwidth", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         ctx.statManager().createRateStat("bw.sendBps", "How fast we send data (in KBps)", "Bandwidth", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
@@ -1024 +1026 @@
         ctx.statManager().createRateStat("router.fastPeers", "How many fast peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
     }
-    public String getName() { return "Coalesce stats"; }
-    public void runJob() {
+    private RouterContext getContext() { return _ctx; }
+    public void timeReached() {
         int active = getContext().commSystem().countActivePeers();
         getContext().statManager().addRateData("router.activePeers", active, 60*1000);
@@ -1063 +1065 @@
         }
         
-        requeue(60*1000);
+        SimpleTimer.getInstance().addEvent(this, 60*1000);
     }
 }

router/java/src/net/i2p/router/RouterVersion.java

@@ -16 +16 @@
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.374 $ $Date: 2006/03/17 18:46:02 $";
+    public final static String ID = "$Revision: 1.375 $ $Date: 2006/03/18 18:09:37 $";
     public final static String VERSION = "0.6.1.12";
-    public final static long BUILD = 12;
+    public final static long BUILD = 13;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);