pyxida-cvs-commits

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

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

Modified Files:
	NCManager.java GossipResponseMsg.java GossipRequestMsg.java 
Log Message:
Updated Pyxida to maintain a secondary 3D+h coordinate

Index: NCManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/NCManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** NCManager.java	5 Feb 2007 18:43:04 -0000	1.34
--- NCManager.java	15 Feb 2007 18:01:26 -0000	1.35
***************
*** 18,22 ****
  import edu.harvard.syrah.sbon.comm.AddressFactory;
  import edu.harvard.syrah.sbon.comm.AddressIF;
! import edu.harvard.syrah.sbon.comm.obj.	*;
  
  /**
--- 18,22 ----
  import edu.harvard.syrah.sbon.comm.AddressFactory;
  import edu.harvard.syrah.sbon.comm.AddressIF;
! import edu.harvard.syrah.sbon.comm.obj.*;
  
[...1051 lines suppressed...]
  		}
--- 780,784 ----
  		}
  
! 		public void expire() {
  			lease = 0;
  		}
***************
*** 767,771 ****
  		public boolean hasExpired() {
  			if (System.currentTimeMillis() > lease) {
! 				log.debug("ProxyClient "+addr+" has expired");
  				return true;
  			}
--- 786,790 ----
  		public boolean hasExpired() {
  			if (System.currentTimeMillis() > lease) {
! 				log.debug("ProxyClient " + addr + " has expired");
  				return true;
  			}

Index: GossipResponseMsg.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/GossipResponseMsg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GossipResponseMsg.java	29 Nov 2006 11:08:20 -0000	1.4
--- GossipResponseMsg.java	15 Feb 2007 18:01:26 -0000	1.5
***************
*** 14,30 ****
  public class GossipResponseMsg extends ObjMessage {
  
! 	static final long serialVersionUID = 1000000001L;
! 
! 	final Coordinate remoteCoordinate;
! 	final double remoteError;
! 	final long remoteAge;
! 	final Set<AddressIF> nodes;
  
! 	public GossipResponseMsg (Coordinate _remoteCoordinate, double _remoteError, long _remoteAge,
! 			Set<AddressIF> _nodes) {
! 		remoteCoordinate = _remoteCoordinate;
! 		remoteError = _remoteError;
! 		remoteAge = _remoteAge;
! 		nodes = _nodes;
  	}
  }
--- 14,41 ----
  public class GossipResponseMsg extends ObjMessage {
  
! 	static final long serialVersionUID = 3L;
  
! 	final Coordinate remotePrimaryCoord;
! 	final double remotePrimaryError;
! 	final long remotePrimaryAge;
! 	
! 	final Coordinate remoteSecondaryCoord;
! 	final double remoteSecondaryError;
! 	final long remoteSecondaryAge;
! 	
! 	final Set<AddressIF> nodes;	
! 	
! 	public GossipResponseMsg(Coordinate _remotePrimaryCoord, double _remotePrimaryError, long _remotePrimaryAge, 
! 			Coordinate _remoteSecondaryCoord, double _remoteSecondaryError, long _remoteSecondaryAge, Set<AddressIF> _nodes) { 
! 		remotePrimaryCoord = _remotePrimaryCoord;
! 		remotePrimaryError = _remotePrimaryError;
! 		remotePrimaryAge = _remotePrimaryAge;
! 		
! 		remoteSecondaryCoord = _remoteSecondaryCoord;
! 		remoteSecondaryError = _remoteSecondaryError;
! 		remoteSecondaryAge = _remoteSecondaryAge;
! 		
! 		nodes = _nodes;				
  	}
+ 	
  }

Index: GossipRequestMsg.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/GossipRequestMsg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GossipRequestMsg.java	29 Nov 2006 11:08:20 -0000	1.3
--- GossipRequestMsg.java	15 Feb 2007 18:01:26 -0000	1.4
***************
*** 14,20 ****
  public class GossipRequestMsg extends ObjMessage {
  
! 	static final long serialVersionUID = 1000000001L;
  
! 	final Coordinate coordinate;
  	final Set<AddressIF> nodes;
  
--- 14,21 ----
  public class GossipRequestMsg extends ObjMessage {
  
! 	static final long serialVersionUID = 3L;
  
! 	final Coordinate primaryCoord;
! 	final Coordinate secondaryCoord;
  	final Set<AddressIF> nodes;
  
***************
*** 24,29 ****
  	 * set of nodes sender is gossipping to receiver
  	 */
! 	public GossipRequestMsg (Coordinate _coordinate, Set<AddressIF> _nodes) {
! 		coordinate = _coordinate;
  		nodes = _nodes;
  	}
--- 25,31 ----
  	 * set of nodes sender is gossipping to receiver
  	 */
! 	public GossipRequestMsg (Coordinate _primaryCoord, Coordinate _secondaryCoord, Set<AddressIF> _nodes) {
! 		primaryCoord= _primaryCoord;
! 		secondaryCoord = _secondaryCoord;
  		nodes = _nodes;
  	}