[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/ping TCPSynPinger.java, 1.9, 1.10 ICMPPinger.java, 1.12, 1.13 Pinger.java, 1.5, 1.6 JpcapPinger.java, 1.7, 1.8

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

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

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


Index: Pinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/Pinger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pinger.java	20 Mar 2007 12:27:53 -0000	1.5
--- Pinger.java	30 Mar 2007 18:03:27 -0000	1.6
***************
*** 3,7 ****
  import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EventLoop;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
--- 3,7 ----
  import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EL;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
***************
*** 30,34 ****
  			protected void cb(CBResult result, Double lat) {
  				System.out.println(lat == 0 ? "Timeout" : "lat=" + (lat > 0 ? lat : "Neg"));
! 				EventLoop.get().registerTimerCB(PING_DELAY, new CB0() {
  					protected void cb(CBResult result) {
  						testPing(remoteNode);
--- 30,34 ----
  			protected void cb(CBResult result, Double lat) {
  				System.out.println(lat == 0 ? "Timeout" : "lat=" + (lat > 0 ? lat : "Neg"));
! 				EL.get().registerTimerCB(PING_DELAY, new CB0() {
  					protected void cb(CBResult result) {
  						testPing(remoteNode);

Index: TCPSynPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/TCPSynPinger.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TCPSynPinger.java	20 Mar 2007 12:27:53 -0000	1.9
--- TCPSynPinger.java	30 Mar 2007 18:03:27 -0000	1.10
***************
*** 5,9 ****
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EventLoop;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
--- 5,9 ----
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EL;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
***************
*** 104,108 ****
  		}
  		
! 		EventLoop.set(new EventLoop());
  
  		if (args.length == 0) {
--- 104,108 ----
  		}
  		
! 		EL.set(new EL());
  
  		if (args.length == 0) {
***************
*** 115,119 ****
  		final PingerIF pinger = new TCPSynPinger();
  				
! 		EventLoop.get().registerTimerCB(new CB0() {
  			protected void cb(CBResult resultOK) {
  				AddressFactory.createResolved("www.google.com", new CB1<AddressIF>() {
--- 115,119 ----
  		final PingerIF pinger = new TCPSynPinger();
  				
! 		EL.get().registerTimerCB(new CB0() {
  			protected void cb(CBResult resultOK) {
  				AddressFactory.createResolved("www.google.com", new CB1<AddressIF>() {
***************
*** 151,155 ****
  			}
  		});
! 		EventLoop.get().main();
  	}	
  	
--- 151,155 ----
  			}
  		});
! 		EL.get().main();
  	}	
  	

Index: JpcapPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/JpcapPinger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JpcapPinger.java	20 Mar 2007 12:27:53 -0000	1.7
--- JpcapPinger.java	30 Mar 2007 18:03:27 -0000	1.8
***************
*** 12,16 ****
  import edu.harvard.syrah.prp.POut;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EventLoop;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
--- 12,16 ----
  import edu.harvard.syrah.prp.POut;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EL;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
***************
*** 152,156 ****
  				log.debug("JpcapPinger initalised.");
  								
! 				EventLoop.get().registerTimerCB(cbDone);
  
  				JpcapPinger.this.run();
--- 152,156 ----
  				log.debug("JpcapPinger initalised.");
  								
! 				EL.get().registerTimerCB(cbDone);
  
  				JpcapPinger.this.run();
***************
*** 194,198 ****
  							currentPing.recvPacket = ip;								
  							log.debug("Found a matching ping request");
! 							EventLoop.get().registerTimerCB(currentPing.cbDone);								
  						}
  					}
--- 194,198 ----
  							currentPing.recvPacket = ip;								
  							log.debug("Found a matching ping request");
! 							EL.get().registerTimerCB(currentPing.cbDone);								
  						}
  					}

Index: ICMPPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/ICMPPinger.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ICMPPinger.java	20 Mar 2007 12:27:53 -0000	1.12
--- ICMPPinger.java	30 Mar 2007 18:03:27 -0000	1.13
***************
*** 6,10 ****
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EventLoop;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
--- 6,10 ----
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
! import edu.harvard.syrah.sbon.async.EL;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
***************
*** 102,106 ****
  		}
  		
! 		EventLoop.set(new EventLoop());
  
  		if (args.length == 0) {
--- 102,106 ----
  		}
  		
! 		EL.set(new EL());
  
  		if (args.length == 0) {
***************
*** 113,117 ****
  		final String hostname = args[0];
  		
! 		EventLoop.get().registerTimerCB(new CB0() {
  			protected void cb(CBResult resultOK) {
  				AddressFactory.createResolved("www.google.com", new CB1<AddressIF>() {
--- 113,117 ----
  		final String hostname = args[0];
  		
! 		EL.get().registerTimerCB(new CB0() {
  			protected void cb(CBResult resultOK) {
  				AddressFactory.createResolved("www.google.com", new CB1<AddressIF>() {
***************
*** 149,153 ****
  			}
  		});
! 		EventLoop.get().main();
  	}
  }
--- 149,153 ----
  			}
  		});
! 		EL.get().main();
  	}
  }