Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25217/src/edu/harvard/syrah/pyxida/nc
Modified Files:
NCManager.java
Log Message:
untested proxy code compiles
Index: NCManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/NCManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** NCManager.java 5 Dec 2006 03:19:06 -0000 1.20
--- NCManager.java 5 Dec 2006 03:59:26 -0000 1.21
***************
*** 84,88 ****
comm.registerMessageCB(GossipRequestMsg.class, new GossipHandler());
comm.registerMessageCB(CoordRequestMsg.class, new CoordHandler());
! comm.registerMessageCB(PingRequestMsg.class, new PingHandler());
upNeighbors = new HashSet<AddressIF>();
--- 84,88 ----
comm.registerMessageCB(GossipRequestMsg.class, new GossipHandler());
comm.registerMessageCB(CoordRequestMsg.class, new CoordHandler());
! comm.registerMessageCB(ProxyPingRequestMsg.class, new ProxyPingHandler());
upNeighbors = new HashSet<AddressIF>();
***************
*** 141,144 ****
--- 141,154 ----
}
+ public boolean renewLeaseOnProxyCoord(AddressIF remoteNode, long lease) {
+ ProxyClient proxyCoord = addr2proxyClient.get(remoteNode);
+ if (proxyCoord == null) {
+ log.debug("No proxy coord for "+remoteNode+" found");
+ return false;
+ }
+ proxyCoord.renewLease(lease);
+ return true;
+ }
+
/**
* @return Coordinate for this remoteNode if we are
***************
*** 335,341 ****
case OK: {
log.debug("latency to "+msg.target+"="+latency);
sendResponseMessage
("Ping", remoteAddr,
! new ProxyPingResponseMsg(latency), msg.getMsgId(),
null, cbHandled);
break;
--- 345,354 ----
case OK: {
log.debug("latency to "+msg.target+"="+latency);
+ long curr_time = System.currentTimeMillis();
sendResponseMessage
("Ping", remoteAddr,
! new ProxyPingResponseMsg
! (localNC.nc.getSystemCoords(), localNC.nc.getSystemError(),
! localNC.nc.getAge(curr_time),latency), msg.getMsgId(),
null, cbHandled);
break;
***************
*** 610,616 ****
switch (result.state) {
case OK: {
! log.debug("proxyping response from "+neighbor);
nc.processSample(neighbor, responseMsg.remoteCoordinate,
! responseMsg.remoteError, latency,
responseMsg.remoteAge,
curr_time, true);
--- 623,631 ----
switch (result.state) {
case OK: {
! log.debug("proxyping response from "+neighbor+
! " lat to "+addr+" "+responseMsg.latency);
! long curr_time = System.currentTimeMillis();
nc.processSample(neighbor, responseMsg.remoteCoordinate,
! responseMsg.remoteError, responseMsg.latency,
responseMsg.remoteAge,
curr_time, true);
|
