Changeset 1ef33906


Ignore:
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:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile.gcj

    rf3849a2 r1ef33906  
    2222#  jbigi.jar: collection of native optimized GMP routines for crypto
    2323JAR_BASE=i2p.jar mstreaming.jar streaming.jar
    24 JAR_CLIENTS=i2ptunnel.jar sam.jar i2psnark.jar
     24JAR_CLIENTS=i2ptunnel.jar sam.jar
    2525JAR_ROUTER=router.jar
    2626JAR_JBIGI=jbigi.jar
    2727JAR_XML=xml-apis.jar resolver.jar xercesImpl.jar
    2828JAR_CONSOLE=\
     29            i2psnark.jar \
    2930            javax.servlet.jar \
    3031            commons-el.jar \
     
    8081        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2p_dsa --main=net.i2p.crypto.DSAEngine
    8182        @echo "* i2p_dsa is a simple test app with the DSA engine and Fortuna PRNG to make sure crypto is working"
    82         @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.Fortuna
     83        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.FortunaStandalone
    8384        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnel --main=net.i2p.i2ptunnel.I2PTunnel
    8485        @echo "* i2ptunnel is mihi's I2PTunnel CLI"
     
    8788        @echo "* i2ptunnelctl is a controller for I2PTunnel, reading i2ptunnel.config"
    8889        @echo "  and launching the appropriate proxies"
    89         @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
    90         @echo "* i2psnark is an anonymous bittorrent client"
     90        #@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
     91        #@echo "* i2psnark is an anonymous bittorrent client"
    9192        @cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2prouter --main=net.i2p.router.Router
    9293        @echo "* i2prouter is the main I2P router"
     
    9697libi2p.so:
    9798        @echo "* Building libi2p.so"
    98         @(cd build ; ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/libi2p.so ${LIBI2P_JARS} ; cd .. )
     99        @(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/libi2p.so ${LIBI2P_JARS} ; cd .. )
    99100        @ls -l ${NATIVE_DIR}/libi2p.so
    100101        @echo "* libi2p.so built"
  • apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java

    rf3849a2 r1ef33906  
    3131        }
    3232    }
     33   
     34    /** list of SummaryListener instances */
     35    List getListeners() { return _listeners; }
    3336   
    3437    private static final String DEFAULT_DATABASES = "bw.sendRate.60000" +
  • apps/routerconsole/jsp/nav.jsp

    rf3849a2 r1ef33906  
    3434 <a href="logs.jsp">Logs</a> |
    3535 <a href="jobs.jsp">Jobs</a> |
     36 <a href="graphs.jsp">Graphs</a> |
    3637 <a href="oldstats.jsp">Stats</a> |
    3738 <a href="oldconsole.jsp">Internals</a>
  • history.txt

    rf3849a2 r1ef33906  
    1 $Id: history.txt,v 1.433 2006/03/17 18:46:03 jrandom Exp $
     1$Id: history.txt,v 1.434 2006/03/18 18:09:38 jrandom Exp $
     2
     32006-03-18  jrandom
     4    * Added a new graphs.jsp page to show all of the stats being harvested
    25
    362006-03-18  jrandom
  • router/java/src/net/i2p/router/Router.java

    rf3849a2 r1ef33906  
    246246        _context.inNetMessagePool().startup();
    247247        startupQueue();
    248         _context.jobQueue().addJob(new CoalesceStatsJob(_context));
     248        //_context.jobQueue().addJob(new CoalesceStatsJob(_context));
     249        SimpleTimer.getInstance().addEvent(new CoalesceStatsEvent(_context), 0);
    249250        _context.jobQueue().addJob(new UpdateRoutingKeyModifierJob(_context));
    250251        warmupCrypto();
     
    10121013 *
    10131014 */
    1014 class CoalesceStatsJob extends JobImpl {
    1015     public CoalesceStatsJob(RouterContext ctx) {
    1016         super(ctx);
     1015class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
     1016    private RouterContext _ctx;
     1017    public CoalesceStatsEvent(RouterContext ctx) {
     1018        _ctx = ctx;
    10171019        ctx.statManager().createRateStat("bw.receiveBps", "How fast we receive data (in KBps)", "Bandwidth", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
    10181020        ctx.statManager().createRateStat("bw.sendBps", "How fast we send data (in KBps)", "Bandwidth", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
     
    10241026        ctx.statManager().createRateStat("router.fastPeers", "How many fast peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
    10251027    }
    1026     public String getName() { return "Coalesce stats"; }
    1027     public void runJob() {
     1028    private RouterContext getContext() { return _ctx; }
     1029    public void timeReached() {
    10281030        int active = getContext().commSystem().countActivePeers();
    10291031        getContext().statManager().addRateData("router.activePeers", active, 60*1000);
     
    10631065        }
    10641066       
    1065         requeue(60*1000);
     1067        SimpleTimer.getInstance().addEvent(this, 60*1000);
    10661068    }
    10671069}
  • router/java/src/net/i2p/router/RouterVersion.java

    rf3849a2 r1ef33906  
    1616 */
    1717public class RouterVersion {
    18     public final static String ID = "$Revision: 1.374 $ $Date: 2006/03/17 18:46:02 $";
     18    public final static String ID = "$Revision: 1.375 $ $Date: 2006/03/18 18:09:37 $";
    1919    public final static String VERSION = "0.6.1.12";
    20     public final static long BUILD = 12;
     20    public final static long BUILD = 13;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
Note: See TracChangeset for help on using the changeset viewer.