[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/api ExternalAPI.java, 1.10, 1.11 ExternalA

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	ExternalAPI.java ExternalAPIIF.java 
Log Message:
problem with return XML values

Index: ExternalAPIIF.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPIIF.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ExternalAPIIF.java	5 Dec 2006 19:23:39 -0000	1.9
--- ExternalAPIIF.java	6 Dec 2006 22:03:54 -0000	1.10
***************
*** 5,8 ****
--- 5,9 ----

  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
+ import edu.harvard.syrah.sbon.async.CallbacksIF.CB2;

  public interface ExternalAPIIF {
***************
*** 14,23 ****
  	public void getLocalCoord(CB1<Vector<Double>> cbLocalCoord);

! 	public void getRemoteCoord(String remoteNode, CB1<List<Double>> cbRemoteCoord);

  	public void getLocalError(CB1<Double> cbLocalError);

  	// Estimate the RTT
! 	public void estimateRTT(String nodeA, String nodeB, CB1<Double> cbLatency);

  	// Create a new proxy coord with a lease
--- 15,24 ----
  	public void getLocalCoord(CB1<Vector<Double>> cbLocalCoord);

! 	public void getRemoteCoord(String remoteNode, CB2<List<Double>,String> cbRemoteCoord);

  	public void getLocalError(CB1<Double> cbLocalError);

  	// Estimate the RTT
! 	public void estimateRTT(String nodeA, String nodeB, CB2<Double,String> cbLatency);

  	// Create a new proxy coord with a lease
***************
*** 25,37 ****
  	// lease of 0 will expire in one hour
  	//	public void createProxyCoord(String remoteNode, long lease, CB1<Boolean> cbResult);
! 	public void createProxyCoord(String remoteNode, int lease, CB1<Boolean> cbResult);

! 	public void getProxyCoord(String remoteNode, CB1<Vector<Double>> cbProxyCoord);

  	// Renew proxy coord lease
! 	public void renewProxyCoord(String remoteNode, int lease, CB1<Boolean> cbResult);

! 	public void destroyProxyCoord(String remoteNode, CB1<Boolean> cbResult);

  	// TODO Add routing methods
--- 26,38 ----
  	// lease of 0 will expire in one hour
  	//	public void createProxyCoord(String remoteNode, long lease, CB1<Boolean> cbResult);
! 	public void createProxyCoord(String remoteNode, int lease, CB1<String> cbResult);

! 	public void getProxyCoord(String remoteNode, CB2<Vector<Double>,String> cbProxyCoord);

  	// Renew proxy coord lease
! 	public void renewProxyCoord(String remoteNode, int lease, CB1<String> cbResult);

! 	public void destroyProxyCoord(String remoteNode, CB1<String> cbResult);

  	// TODO Add routing methods

Index: ExternalAPI.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPI.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ExternalAPI.java	5 Dec 2006 19:23:39 -0000	1.10
--- ExternalAPI.java	6 Dec 2006 22:03:54 -0000	1.11
***************
*** 10,13 ****
--- 10,14 ----
  import edu.harvard.syrah.sbon.async.CBResult;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
+ import edu.harvard.syrah.sbon.async.CallbacksIF.CB2;
  import edu.harvard.syrah.sbon.comm.AddressFactory;
  import edu.harvard.syrah.sbon.comm.AddressIF;
***************
*** 23,27 ****

  	public void createProxyCoord(String remoteNodeStr, final int lease, 
! 															 final CB1<Boolean> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
--- 24,28 ----

  	public void createProxyCoord(String remoteNodeStr, final int lease, 
! 															 final CB1<String> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
***************
*** 29,35 ****
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.createProxyCoord(remoteNode, lease);
! 						if (!res)
! 							log.warn("createProxyCoord for "+remoteNode+" failed");
  						cbResult.call(CBResult.OK(),res);
  						break;
--- 30,35 ----
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						String res = ncManager.createProxyCoord(remoteNode, lease);
! 						log.debug(res);
  						cbResult.call(CBResult.OK(),res);
  						break;
***************
*** 38,42 ****
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
  						break;
  					}
--- 38,42 ----
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,nsResult.toString());
  						break;
  					}
***************
*** 47,51 ****

  	public void getProxyCoord(String remoteNodeStr, 
! 														final CB1<Vector<Double>> cbProxyCoord) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
--- 47,51 ----

  	public void getProxyCoord(String remoteNodeStr, 
! 														final CB2<Vector<Double>,String> cbProxyCoord) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
***************
*** 55,59 ****
  						Coordinate coord = ncManager.getProxyCoord(remoteNode);
  						Vector<Double> listCoord = getVectorFromCoord(coord);
! 						cbProxyCoord.call(CBResult.OK(),listCoord);
  						break;
  					}
--- 55,59 ----
  						Coordinate coord = ncManager.getProxyCoord(remoteNode);
  						Vector<Double> listCoord = getVectorFromCoord(coord);
! 						cbProxyCoord.call(CBResult.OK(),listCoord,"Success");
  						break;
  					}
***************
*** 61,65 ****
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbProxyCoord.call(nsResult,null);
  						break;
  					}
--- 61,65 ----
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbProxyCoord.call(nsResult,null,nsResult.toString());
  						break;
  					}
***************
*** 70,74 ****

  	public void destroyProxyCoord(String remoteNodeStr, 
! 																final CB1<Boolean> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
--- 70,74 ----

  	public void destroyProxyCoord(String remoteNodeStr, 
! 																final CB1<String> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
***************
*** 76,80 ****
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.destroyProxyCoord(remoteNode);
  						cbResult.call(CBResult.OK(),res);
  						break;
--- 76,80 ----
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						String res = ncManager.destroyProxyCoord(remoteNode);
  						cbResult.call(CBResult.OK(),res);
  						break;
***************
*** 83,87 ****
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
  						break;
  					}
--- 83,87 ----
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,nsResult.toString());
  						break;
  					}
***************
*** 91,95 ****
  	}

! 	public void estimateRTT(final String nodeA, final String nodeB, final CB1<Double> cbDistance) {
  		AddressFactory.createResolved(new String[] {nodeA, nodeB}, new CB1<Map<String, AddressIF>>() {
  			protected void cb(CBResult result, Map<String, AddressIF> addrMap) {
--- 91,95 ----
  	}

! 	public void estimateRTT(final String nodeA, final String nodeB, final CB2<Double,String> cbDistance) {
  		AddressFactory.createResolved(new String[] {nodeA, nodeB}, new CB1<Map<String, AddressIF>>() {
  			protected void cb(CBResult result, Map<String, AddressIF> addrMap) {
***************
*** 102,107 ****
  					case TIMEOUT:
  					case ERROR: {
! 						log.warn("Address could not be resolved: " + result.toString());
! 						cbDistance.callCBResult(result);
  					}
  				}
--- 102,107 ----
  					case TIMEOUT:
  					case ERROR: {
! 						log.warn(result.toString());
! 						cbDistance.call(result,new Double(0),result.toString());
  					}
  				}
***************
*** 128,132 ****

  	public void getRemoteCoord(final String remoteNodeStr, 
! 														 final CB1<List<Double>> cbRemoteCoord) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
--- 128,132 ----

  	public void getRemoteCoord(final String remoteNodeStr, 
! 														 final CB2<List<Double>,String> cbRemoteCoord) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
***************
*** 139,143 ****
  								case OK: {
  									Vector<Double> listCoord = getVectorFromCoord(remoteCoord);
! 									cbRemoteCoord.call(CBResult.OK(), listCoord);
  									break;
  								}
--- 139,143 ----
  								case OK: {
  									Vector<Double> listCoord = getVectorFromCoord(remoteCoord);
! 									cbRemoteCoord.call(CBResult.OK(), listCoord, "Success");
  									break;
  								}
***************
*** 145,149 ****
  									case ERROR: {
  										log.warn(ncResult.toString());
! 										cbRemoteCoord.call(ncResult, null);
  										break;
  									}
--- 145,149 ----
  									case ERROR: {
  										log.warn(ncResult.toString());
! 										cbRemoteCoord.call(ncResult, null,ncResult.toString());
  										break;
  									}
***************
*** 155,159 ****
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbRemoteCoord.call(nsResult, null);
  						break;
  					}
--- 155,159 ----
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbRemoteCoord.call(nsResult, null,nsResult.toString());
  						break;
  					}
***************
*** 168,172 ****

  	public void renewProxyCoord(String remoteNodeStr, final int lease,
! 															final CB1<Boolean> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
--- 168,172 ----

  	public void renewProxyCoord(String remoteNodeStr, final int lease,
! 															final CB1<String> cbResult) {
  		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
  			protected void cb(CBResult nsResult, AddressIF remoteNode) {
***************
*** 174,178 ****
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.renewLeaseOnProxyCoord(remoteNode, lease);
  						cbResult.call(CBResult.OK(),res);
  						break;
--- 174,178 ----
  					case OK: {
  						log.debug("resolved node="+remoteNode);
! 						String res = ncManager.renewLeaseOnProxyCoord(remoteNode, lease);
  						cbResult.call(CBResult.OK(),res);
  						break;
***************
*** 181,185 ****
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
  						break;
  					}
--- 181,185 ----
  					case ERROR: {
  						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,nsResult.toString());
  						break;
  					}

[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/api ExternalAPI.java, 1.10, 1.11 ExternalA

[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/api ExternalAPI.java, 1.10, 1.11 ExternalAPIIF.java, 1.9, 1.10