[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida Pyxida.java, 1.21, 1.22

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14405/src/edu/harvard/syrah/pyxida

Modified Files:
	Pyxida.java 
Log Message:
Improved Pyxida node webpage

Index: Pyxida.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/Pyxida.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Pyxida.java	15 Feb 2007 18:01:26 -0000	1.21
--- Pyxida.java	21 Feb 2007 13:10:29 -0000	1.22
***************
*** 3,15 ****
  import java.util.Random;
  
! import edu.harvard.syrah.prp.ANSI;
! import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.pyxida.api.APIManager;
  import edu.harvard.syrah.pyxida.log.LogManager;
  import edu.harvard.syrah.pyxida.nc.NCManager;
  import edu.harvard.syrah.pyxida.ping.PingManager;
! import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.Config;
! import edu.harvard.syrah.sbon.async.EventLoop;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.comm.AddressFactory;
--- 3,12 ----
  import java.util.Random;
  
! import edu.harvard.syrah.prp.*;
  import edu.harvard.syrah.pyxida.api.APIManager;
  import edu.harvard.syrah.pyxida.log.LogManager;
  import edu.harvard.syrah.pyxida.nc.NCManager;
  import edu.harvard.syrah.pyxida.ping.PingManager;
! import edu.harvard.syrah.sbon.async.*;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.comm.AddressFactory;
***************
*** 24,28 ****
  	private static final int MINOR_VERSION = 1;
  	private static final int MINOR_MINOR_VERSION = 4;
! 	private static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + MINOR_MINOR_VERSION;
  
  	static {
--- 21,25 ----
  	private static final int MINOR_VERSION = 1;
  	private static final int MINOR_MINOR_VERSION = 4;
! 	public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + MINOR_MINOR_VERSION;
  
  	static {
***************
*** 41,46 ****
  	public static final boolean USE_ICMP = Boolean.parseBoolean(Config.getConfigProps().getProperty("pyxida.use_icmp", "false"));  
  
! 	public static final long STATS_PERIOD = Long.parseLong(Config.getConfigProps().getProperty("pyxida.stats_period", "600000"));  
! 
  	private static Pyxida pyxida = null;
  
--- 38,43 ----
  	public static final boolean USE_ICMP = Boolean.parseBoolean(Config.getConfigProps().getProperty("pyxida.use_icmp", "false"));  
  
! 	private static final long START_TIME = System.currentTimeMillis();
! 	
  	private static Pyxida pyxida = null;
  
***************
*** 50,78 ****
  	private LogManager logManager;
  	private ObjCommIF comm;
- 	final CB0 statCB;
  
  	public static Random random;
  
  	private Pyxida() {
- 		statCB = new CB0() {
- 				protected void cb(CBResult result) {
- 					printStats();
- 					registerStatsTimer();
- 				}
- 			};
- 	}
- 
- 	void registerStatsTimer () {
- 		EventLoop.get().registerTimerCB(STATS_PERIOD, statCB);
- 	}
- 
- 	void printStats() {
- 		ncManager.printStats();
- 		pingManager.printStats();
  	}
  
  	private void init(final CB0 cbDone) {
  		random = new Random(System.currentTimeMillis());
- 		registerStatsTimer();
  
  		// Initiliase the ObjComm communication module
--- 47,58 ----
***************
*** 103,107 ****
  															case OK: {
  																// Initialise the log manager
! 																logManager = new LogManager(comm, ncManager);
  																logManager.init(cbDone);
  																break;
--- 83,87 ----
  															case OK: {
  																// Initialise the log manager
! 																logManager = new LogManager(comm, ncManager, pingManager);
  																logManager.init(cbDone);
  																break;
***************
*** 132,135 ****
--- 112,121 ----
  		});
  	}
+ 	
+ 	public static String getUptimeStr() {
+ 		long now = System.currentTimeMillis();
+ 				
+ 		return PUtil.getDiffTimeStr(START_TIME, now);
+ 	}
  
  	/**