[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/nc NCManager.java, 1.37, 1.38

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

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

Modified Files:
	NCManager.java 
Log Message:
Fixed grave bug in EventLoop code
Made "pyxida" prefix implicit for config parameters
Changed EventLoop->EL


Index: NCManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/NCManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** NCManager.java	20 Mar 2007 12:27:52 -0000	1.37
--- NCManager.java	30 Mar 2007 18:03:27 -0000	1.38
***************
*** 26,36 ****
  	// Number of dimensions
  	public static final int NC_NUM_DIMS = Integer.parseInt(Config.getProperty(
! 			"pyxida.dimensions", "5"));
  
  	public static final int SECONDARY_NC_NUM_DIMS = Integer.parseInt(Config.getProperty(
! 			"pyxida.dimensions.secondary", "4"));
  
  	public static final boolean WATCH_NEIGHBORS = Boolean.parseBoolean(Config.getConfigProps().getProperty(
! 			"pyxida.ncmanager.watch_neighbors", "false"));
  
  	// Height is set within NCClient and is the "last dimension"
--- 26,36 ----
  	// Number of dimensions
  	public static final int NC_NUM_DIMS = Integer.parseInt(Config.getProperty(
! 			"dimensions", "5"));
  
  	public static final int SECONDARY_NC_NUM_DIMS = Integer.parseInt(Config.getProperty(
! 			"dimensions.secondary", "4"));
  
  	public static final boolean WATCH_NEIGHBORS = Boolean.parseBoolean(Config.getConfigProps().getProperty(
! 			"ncmanager.watch_neighbors", "false"));
  
  	// Height is set within NCClient and is the "last dimension"
***************
*** 41,45 ****
  
  	String bootstrapList[] = Config.getProperty(
! 			"pyxida.bootstraplist", "righthand.eecs.harvard.edu lefthand.eecs.harvard.edu").split("[\\s]");
  	Set<AddressIF> bootstrapAddrs;
  
--- 41,45 ----
  
  	String bootstrapList[] = Config.getProperty(
! 			"bootstraplist", "righthand.eecs.harvard.edu lefthand.eecs.harvard.edu").split("[\\s]");
  	Set<AddressIF> bootstrapAddrs;
  
***************
*** 306,310 ****
  			getRemoteOrLocalCoordinate(addr, barrier, addr2coord, errorBuffer);
  		}
! 		EventLoop.get().registerTimerCB(barrier, new CB0() {
  			protected void cb(CBResult result) {
  				String errorString;
--- 306,310 ----
  			getRemoteOrLocalCoordinate(addr, barrier, addr2coord, errorBuffer);
  		}
! 		EL.get().registerTimerCB(barrier, new CB0() {
  			protected void cb(CBResult result) {
  				String errorString;
***************
*** 334,338 ****
  		getRemoteOrLocalCoordinate(nodeB, barrier, addr2coord, errorBuffer);
  
! 		EventLoop.get().registerTimerCB(barrier, new CB0() {
  			protected void cb(CBResult result) {
  
--- 334,338 ----
  		getRemoteOrLocalCoordinate(nodeB, barrier, addr2coord, errorBuffer);
  
! 		EL.get().registerTimerCB(barrier, new CB0() {
  			protected void cb(CBResult result) {
  
***************
*** 589,593 ****
  
  			log.debug("setting timer to " + delay);
! 			EventLoop.get().registerTimerCB(delay, updateCB);
  		}
  
--- 589,593 ----
  
  			log.debug("setting timer to " + delay);
! 			EL.get().registerTimerCB(delay, updateCB);
  		}