[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/log ReportCoordReqMsg.java, 1.2, 1.3 LogManager.java, 1.2, 1.3 ReportCoordReplyMsg.java, 1.2, 1.3

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

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

Modified Files:
	ReportCoordReqMsg.java LogManager.java 
	ReportCoordReplyMsg.java 
Log Message:
Updated Pyxida to maintain a secondary 3D+h coordinate

Index: ReportCoordReplyMsg.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/ReportCoordReplyMsg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportCoordReplyMsg.java	5 Feb 2007 18:48:17 -0000	1.2
--- ReportCoordReplyMsg.java	15 Feb 2007 18:01:26 -0000	1.3
***************
*** 5,9 ****
  public class ReportCoordReplyMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 2L;
  	
  	public long interval;
--- 5,9 ----
  public class ReportCoordReplyMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 3L;
  	
  	public long interval;

Index: LogManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/LogManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LogManager.java	5 Feb 2007 18:48:17 -0000	1.2
--- LogManager.java	15 Feb 2007 18:01:26 -0000	1.3
***************
*** 38,41 ****
--- 38,42 ----
  			protected void cb(CBResult result, AddressIF logServerAddr) {
  				if (result.state == CBState.OK) {
+ 					log.debug("Logging to logserver=" + logServerAddr);
  					EventLoop.get().registerTimerCB(new ReportCoordCB(comm, logServerAddr, ncManager));
  				}					
***************
*** 64,71 ****
  	protected void cb(CBResult result) {
  		ReportCoordReqMsg reqMsg = new ReportCoordReqMsg();
! 		reqMsg.sysCoord = ncManager.getLocalCoord();
! 		reqMsg.appCoord = ncManager.getStableCoord();
  		
! 		log.debug("Reporting coord=" + reqMsg.sysCoord + " to logserver");				
  		comm.sendRequestMessage(reqMsg, logServerAddr, new ObjCommRRCB<ReportCoordReplyMsg>() {
  			protected void cb(CBResult result, ReportCoordReplyMsg replyMsg, AddressIF remoteAddr, Long rtt) {
--- 65,75 ----
  	protected void cb(CBResult result) {
  		ReportCoordReqMsg reqMsg = new ReportCoordReqMsg();
! 		reqMsg.primarySysCoord = ncManager.getLocalCoord();
! 		reqMsg.primaryAppCoord = ncManager.getStableCoord();
! 
! 		reqMsg.secondarySysCoord = ncManager.getLocalSecondaryCoord();
! 		reqMsg.secondaryAppCoord = ncManager.getStableSecondaryCoord();
  		
! 		log.debug("Reporting c1=" + reqMsg.primarySysCoord + " c2=" + reqMsg.secondarySysCoord + " to logserver");				
  		comm.sendRequestMessage(reqMsg, logServerAddr, new ObjCommRRCB<ReportCoordReplyMsg>() {
  			protected void cb(CBResult result, ReportCoordReplyMsg replyMsg, AddressIF remoteAddr, Long rtt) {

Index: ReportCoordReqMsg.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/ReportCoordReqMsg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportCoordReqMsg.java	5 Feb 2007 18:48:17 -0000	1.2
--- ReportCoordReqMsg.java	15 Feb 2007 18:01:26 -0000	1.3
***************
*** 6,13 ****
  public class ReportCoordReqMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 2L;
  	
! 	public Coordinate sysCoord;
! 	public Coordinate appCoord;
  
  }
--- 6,16 ----
  public class ReportCoordReqMsg extends ObjMessage {
  
! 	private static final long serialVersionUID = 3L;
  	
! 	public Coordinate primarySysCoord;
! 	public Coordinate primaryAppCoord;
! 	
! 	public Coordinate secondarySysCoord;
! 	public Coordinate secondaryAppCoord;	
  
  }