Menu
▾
▴
pyxida-cvs-commits — Log of all CVS commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(123) |
Dec
(100) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(12) |
Feb
(80) |
Mar
(35) |
Apr
|
May
|
Jun
(28) |
Jul
(10) |
Aug
(6) |
Sep
|
Oct
|
Nov
(16) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
(6) |
| 2009 |
Jan
(20) |
Feb
(1) |
Mar
(19) |
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
|
From: Peter P. <pr...@us...> - 2007-06-04 17:55:19
|
Update of /cvsroot/pyxida/AsyncJ/src/edu/harvard/syrah/sbon/async/comm/dns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21417/src/edu/harvard/syrah/sbon/async/comm/dns Log Message: Directory /cvsroot/pyxida/AsyncJ/src/edu/harvard/syrah/sbon/async/comm/dns added to the repository |
|
From: Peter P. <pr...@us...> - 2007-06-04 17:55:19
|
Update of /cvsroot/pyxida/AsyncJ/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21417/classes Log Message: Directory /cvsroot/pyxida/AsyncJ/classes added to the repository |
|
From: Peter P. <pr...@us...> - 2007-06-04 17:55:19
|
Update of /cvsroot/pyxida/AsyncJ/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21417/lib Log Message: Directory /cvsroot/pyxida/AsyncJ/lib added to the repository |
|
From: Peter P. <pr...@us...> - 2007-06-04 17:53:31
|
Update of /cvsroot/pyxida/AsyncJ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20700/AsyncJ Log Message: Directory /cvsroot/pyxida/AsyncJ added to the repository |
|
From: Peter P. <pr...@us...> - 2007-06-04 17:47:40
|
Update of /cvsroot/pyxida/Pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18474 Modified Files: .classpath build.xml Log Message: Renamed sbon-async.jar to asyncj.jar (SBON and Pyxida use now the same asyncj lib) Index: .classpath =================================================================== RCS file: /cvsroot/pyxida/Pyxida/.classpath,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** .classpath 21 Mar 2007 19:17:15 -0000 1.7 --- .classpath 4 Jun 2007 17:47:39 -0000 1.8 *************** *** 7,11 **** <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/> <classpathentry kind="lib" path="lib/util-prp.jar"/> ! <classpathentry kind="lib" path="lib/sbon-async.jar"/> <classpathentry kind="output" path="classes"/> </classpath> --- 7,11 ---- <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/> <classpathentry kind="lib" path="lib/util-prp.jar"/> ! <classpathentry kind="lib" path="lib/asyncj.jar"/> <classpathentry kind="output" path="classes"/> </classpath> Index: build.xml =================================================================== RCS file: /cvsroot/pyxida/Pyxida/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** build.xml 15 Feb 2007 18:53:10 -0000 1.12 --- build.xml 4 Jun 2007 17:47:39 -0000 1.13 *************** *** 25,29 **** <pathelement location="${lib}/util-prp.jar" /> <pathelement location="${lib}/jpcap.jar" /> ! <pathelement location="${lib}/sbon-async.jar" /> <pathelement location="${lib}/xmlrpc-2.0-a1-dev.jar" /> <pathelement location="${lib}/commons-codec-1.2.jar" /> --- 25,29 ---- <pathelement location="${lib}/util-prp.jar" /> <pathelement location="${lib}/jpcap.jar" /> ! <pathelement location="${lib}/asyncj.jar" /> <pathelement location="${lib}/xmlrpc-2.0-a1-dev.jar" /> <pathelement location="${lib}/commons-codec-1.2.jar" /> *************** *** 56,60 **** <zipfileset src="${lib}/util-prp.jar" /> <zipfileset src="${lib}/jpcap.jar"/> ! <zipfileset src="${lib}/sbon-async.jar"/> <zipfileset src="${lib}/xmlrpc-2.0-a1-dev.jar"/> <zipfileset src="${lib}/commons-codec-1.2.jar"/> --- 56,60 ---- <zipfileset src="${lib}/util-prp.jar" /> <zipfileset src="${lib}/jpcap.jar"/> ! <zipfileset src="${lib}/asyncj.jar"/> <zipfileset src="${lib}/xmlrpc-2.0-a1-dev.jar"/> <zipfileset src="${lib}/commons-codec-1.2.jar"/> |
|
From: Peter P. <pr...@us...> - 2007-06-04 17:47:39
|
Update of /cvsroot/pyxida/Pyxida/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18474/lib Added Files: asyncj.jar Removed Files: sbon-async.jar Log Message: Renamed sbon-async.jar to asyncj.jar (SBON and Pyxida use now the same asyncj lib) --- NEW FILE: asyncj.jar --- (This appears to be a binary file; contents omitted.) --- sbon-async.jar DELETED --- |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
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(); } } |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/src/edu/harvard/syrah/pyxida/api Modified Files: XMLRPC_API.java Log Message: Fixed grave bug in EventLoop code Made "pyxida" prefix implicit for config parameters Changed EventLoop->EL Index: XMLRPC_API.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/XMLRPC_API.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** XMLRPC_API.java 20 Mar 2007 12:27:53 -0000 1.7 --- XMLRPC_API.java 30 Mar 2007 18:03:27 -0000 1.8 *************** *** 14,18 **** private static final String XMLRPC_OBJECT_NAME = "pyxida"; ! static final int API_PORT = Integer.parseInt(Config.getProperty("pyxida.api.port", "55501")); // App comm interface --- 14,18 ---- private static final String XMLRPC_OBJECT_NAME = "pyxida"; ! static final int API_PORT = Integer.parseInt(Config.getProperty("api.port", "55501")); // App comm interface |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/src/edu/harvard/syrah/pyxida/log Modified Files: LogManager.java Log Message: Fixed grave bug in EventLoop code Made "pyxida" prefix implicit for config parameters Changed EventLoop->EL Index: LogManager.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/log/LogManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LogManager.java 20 Mar 2007 12:27:53 -0000 1.6 --- LogManager.java 30 Mar 2007 18:03:27 -0000 1.7 *************** *** 17,25 **** private static final Log log = new Log(LogManager.class); ! private static final String LOG_SERVER_HOSTNAME = Config.getProperty("pyxida.logserver"); ! static final long ERROR_RETRY_INTERVAL = Long.valueOf(Config.getProperty("pyxida.logserver.error_interval", "600000")); ! public static final long STATS_PERIOD = Long.parseLong(Config.getConfigProps().getProperty("pyxida.stats_period", "600000")); private ObjCommIF comm; --- 17,25 ---- private static final Log log = new Log(LogManager.class); ! private static final String LOG_SERVER_HOSTNAME = Config.getProperty("logserver"); ! static final long ERROR_RETRY_INTERVAL = Long.valueOf(Config.getProperty("logserver.error_interval", "600000")); ! public static final long STATS_PERIOD = Long.parseLong(Config.getConfigProps().getProperty("stats_period", "600000")); private ObjCommIF comm; *************** *** 55,59 **** if (result.state == CBState.OK) { log.debug("Logging to logserver=" + logServerAddr); ! EventLoop.get().registerTimerCB(new ReportCoordCB(comm, logServerAddr, ncManager)); } cb0.call(result); --- 55,59 ---- if (result.state == CBState.OK) { log.debug("Logging to logserver=" + logServerAddr); ! EL.get().registerTimerCB(new ReportCoordCB(comm, logServerAddr, ncManager)); } cb0.call(result); *************** *** 68,72 **** void registerStatsTimer () { ! EventLoop.get().registerTimerCB(STATS_PERIOD, statCB); } } --- 68,72 ---- void registerStatsTimer () { ! EL.get().registerTimerCB(STATS_PERIOD, statCB); } } *************** *** 103,107 **** case OK: { log.debug("Coord updated successfully. interval=" + replyMsg.interval); ! EventLoop.get().registerTimerCB(replyMsg.interval, ReportCoordCB.this); break; } --- 103,107 ---- case OK: { log.debug("Coord updated successfully. interval=" + replyMsg.interval); ! EL.get().registerTimerCB(replyMsg.interval, ReportCoordCB.this); break; } *************** *** 109,113 **** case ERROR: { log.debug("LogServer error: " + result.what + ". Retrying in " + LogManager.ERROR_RETRY_INTERVAL + " ms"); ! EventLoop.get().registerTimerCB(LogManager.ERROR_RETRY_INTERVAL, ReportCoordCB.this); break; } --- 109,113 ---- case ERROR: { log.debug("LogServer error: " + result.what + ". Retrying in " + LogManager.ERROR_RETRY_INTERVAL + " ms"); ! EL.get().registerTimerCB(LogManager.ERROR_RETRY_INTERVAL, ReportCoordCB.this); break; } |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/src/edu/harvard/syrah/pyxida/nc Modified Files: NCManager.java Log Message: Fixed grave bug in EventLoop code Made "pyxida" prefix implicit for config parameters Changed EventLoop->EL Index: NCManager.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/NCManager.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** NCManager.java 20 Mar 2007 12:27:52 -0000 1.37 --- NCManager.java 30 Mar 2007 18:03:27 -0000 1.38 *************** *** 26,36 **** // Number of dimensions public static final int NC_NUM_DIMS = Integer.parseInt(Config.getProperty( ! "pyxida.dimensions", "5")); public static final int SECONDARY_NC_NUM_DIMS = Integer.parseInt(Config.getProperty( ! "pyxida.dimensions.secondary", "4")); public static final boolean WATCH_NEIGHBORS = Boolean.parseBoolean(Config.getConfigProps().getProperty( ! "pyxida.ncmanager.watch_neighbors", "false")); // Height is set within NCClient and is the "last dimension" --- 26,36 ---- // Number of dimensions public static final int NC_NUM_DIMS = Integer.parseInt(Config.getProperty( ! "dimensions", "5")); public static final int SECONDARY_NC_NUM_DIMS = Integer.parseInt(Config.getProperty( ! "dimensions.secondary", "4")); public static final boolean WATCH_NEIGHBORS = Boolean.parseBoolean(Config.getConfigProps().getProperty( ! "ncmanager.watch_neighbors", "false")); // Height is set within NCClient and is the "last dimension" *************** *** 41,45 **** String bootstrapList[] = Config.getProperty( ! "pyxida.bootstraplist", "righthand.eecs.harvard.edu lefthand.eecs.harvard.edu").split("[\\s]"); Set<AddressIF> bootstrapAddrs; --- 41,45 ---- String bootstrapList[] = Config.getProperty( ! "bootstraplist", "righthand.eecs.harvard.edu lefthand.eecs.harvard.edu").split("[\\s]"); Set<AddressIF> bootstrapAddrs; *************** *** 306,310 **** getRemoteOrLocalCoordinate(addr, barrier, addr2coord, errorBuffer); } ! EventLoop.get().registerTimerCB(barrier, new CB0() { protected void cb(CBResult result) { String errorString; --- 306,310 ---- getRemoteOrLocalCoordinate(addr, barrier, addr2coord, errorBuffer); } ! EL.get().registerTimerCB(barrier, new CB0() { protected void cb(CBResult result) { String errorString; *************** *** 334,338 **** getRemoteOrLocalCoordinate(nodeB, barrier, addr2coord, errorBuffer); ! EventLoop.get().registerTimerCB(barrier, new CB0() { protected void cb(CBResult result) { --- 334,338 ---- getRemoteOrLocalCoordinate(nodeB, barrier, addr2coord, errorBuffer); ! EL.get().registerTimerCB(barrier, new CB0() { protected void cb(CBResult result) { *************** *** 589,593 **** log.debug("setting timer to " + delay); ! EventLoop.get().registerTimerCB(delay, updateCB); } --- 589,593 ---- log.debug("setting timer to " + delay); ! EL.get().registerTimerCB(delay, updateCB); } |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/src/edu/harvard/syrah/pyxida Modified Files: LogServer.java Pyxida.java Log Message: Fixed grave bug in EventLoop code Made "pyxida" prefix implicit for config parameters Changed EventLoop->EL Index: Pyxida.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/Pyxida.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Pyxida.java 20 Mar 2007 12:27:53 -0000 1.23 --- Pyxida.java 30 Mar 2007 18:03:27 -0000 1.24 *************** *** 27,40 **** * All config properties in the file must start with 'pyxida.' */ ! Config.read("pyxida", System.getProperty("pyxida.config", "config/pyxida.cfg")); } ! private static final String CONFIG_FILE = System.getProperty("pyxida.config", "config/pyxida.cfg"); // Imperial blocks ports outside of 55000-56999 ! public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("pyxida.port", "55504")); ! public static final boolean USE_ICMP = Boolean.parseBoolean(Config.getConfigProps().getProperty("pyxida.use_icmp", "false")); private static final long START_TIME = System.currentTimeMillis(); --- 27,40 ---- * All config properties in the file must start with 'pyxida.' */ ! Config.read("pyxida", System.getProperty("config", "config/pyxida.cfg")); } ! private static final String CONFIG_FILE = System.getProperty("config", "config/pyxida.cfg"); // Imperial blocks ports outside of 55000-56999 ! public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("port", "55504")); ! public static final boolean USE_ICMP = Boolean.parseBoolean(Config.getConfigProps().getProperty("use_icmp", "false")); private static final long START_TIME = System.currentTimeMillis(); *************** *** 148,152 **** * Create the event loop */ ! EventLoop.set(new EventLoop(Long.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.statedump", "600000")), Boolean.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.showidle", "false")))); --- 148,152 ---- * Create the event loop */ ! EL.set(new EL(Long.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.statedump", "600000")), Boolean.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.showidle", "false")))); *************** *** 171,177 **** try { ! EventLoop.get().main(); } catch (OutOfMemoryError e) { ! EventLoop.get().dumpState(true); e.printStackTrace(); log.error("Error: Out of memory: " + e); --- 171,177 ---- try { ! EL.get().main(); } catch (OutOfMemoryError e) { ! EL.get().dumpState(true); e.printStackTrace(); log.error("Error: Out of memory: " + e); Index: LogServer.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/LogServer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** LogServer.java 21 Mar 2007 11:59:27 -0000 1.11 --- LogServer.java 30 Mar 2007 18:03:27 -0000 1.12 *************** *** 18,22 **** import edu.harvard.syrah.sbon.async.CBResult; import edu.harvard.syrah.sbon.async.Config; ! import edu.harvard.syrah.sbon.async.EventLoop; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; --- 18,22 ---- import edu.harvard.syrah.sbon.async.CBResult; import edu.harvard.syrah.sbon.async.Config; ! import edu.harvard.syrah.sbon.async.EL; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; *************** *** 35,54 **** * All config properties in the file must start with 'pyxida.' */ ! Config.read("pyxida", System.getProperty("pyxida.config", "config/pyxida.cfg")); } ! private static final String CONFIG_FILE = System.getProperty("pyxida.config", "config/pyxida.cfg"); // Imperial blocks ports outside of 55000-56999 ! public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("pyxida.port", "55504")); // By default tell nodes to report their coords every 10 seconds ! private static final long LOG_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.log_interval", "10000")); // Output a summary of nodes we have heard from recently at this rate (10 minutes) ! private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "600000")); ! //private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "200000")); ! private static final String DUMP_COORD_PATH = String.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_path", "/nc/log-pyxida-coords")); --- 35,54 ---- * All config properties in the file must start with 'pyxida.' */ ! Config.read("pyxida", System.getProperty("config", "config/pyxida.cfg")); } ! private static final String CONFIG_FILE = System.getProperty("config", "config/pyxida.cfg"); // Imperial blocks ports outside of 55000-56999 ! public static final int COMM_PORT = Integer.parseInt(Config.getConfigProps().getProperty("port", "55504")); // By default tell nodes to report their coords every 10 seconds ! private static final long LOG_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("logserver.log_interval", "10000")); // Output a summary of nodes we have heard from recently at this rate (10 minutes) ! private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("logserver.dump_coord_interval", "600000")); ! //private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("logserver.dump_coord_interval", "200000")); ! private static final String DUMP_COORD_PATH = String.valueOf(Config.getConfigProps().getProperty("logserver.dump_coord_path", "/nc/log-pyxida-coords")); *************** *** 101,105 **** void registerDumpCoordsTimer () { ! EventLoop.get().registerTimerCB(DUMP_COORD_INTERVAL, dumpCoordsCB); } --- 101,105 ---- void registerDumpCoordsTimer () { ! EL.get().registerTimerCB(DUMP_COORD_INTERVAL, dumpCoordsCB); } *************** *** 131,135 **** * Create the event loop */ ! EventLoop.set(new EventLoop(Long.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.statedump", "600000")), Boolean.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.showidle", "false")))); --- 131,135 ---- * Create the event loop */ ! EL.set(new EL(Long.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.statedump", "600000")), Boolean.valueOf(Config.getConfigProps().getProperty( "sbon.eventloop.showidle", "false")))); *************** *** 154,160 **** try { ! EventLoop.get().main(); } catch (OutOfMemoryError e) { ! EventLoop.get().dumpState(true); e.printStackTrace(); log.error("Error: Out of memory: " + e); --- 154,160 ---- try { ! EL.get().main(); } catch (OutOfMemoryError e) { ! EL.get().dumpState(true); e.printStackTrace(); log.error("Error: Out of memory: " + e); |
|
From: Peter P. <pr...@us...> - 2007-03-30 18:03:38
|
Update of /cvsroot/pyxida/Pyxida/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/lib Modified Files: sbon-async.jar Log Message: Fixed grave bug in EventLoop code Made "pyxida" prefix implicit for config parameters Changed EventLoop->EL Index: sbon-async.jar =================================================================== RCS file: /cvsroot/pyxida/Pyxida/lib/sbon-async.jar,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 Binary files /tmp/cvsF4ZHt7 and /tmp/cvsArzPk8 differ |
|
From: Peter P. <pr...@us...> - 2007-03-21 19:17:20
|
Update of /cvsroot/pyxida/Pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10255 Modified Files: .classpath Log Message: Moved comm package under async Index: .classpath =================================================================== RCS file: /cvsroot/pyxida/Pyxida/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .classpath 6 Feb 2007 17:54:03 -0000 1.6 --- .classpath 21 Mar 2007 19:17:15 -0000 1.7 *************** *** 6,11 **** <classpathentry kind="lib" path="lib/xmlrpc-2.0-a1-dev.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/> - <classpathentry kind="lib" path="lib/sbon-async.jar"/> <classpathentry kind="lib" path="lib/util-prp.jar"/> <classpathentry kind="output" path="classes"/> </classpath> --- 6,11 ---- <classpathentry kind="lib" path="lib/xmlrpc-2.0-a1-dev.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.2.jar"/> <classpathentry kind="lib" path="lib/util-prp.jar"/> + <classpathentry kind="lib" path="lib/sbon-async.jar"/> <classpathentry kind="output" path="classes"/> </classpath> |
|
From: Peter P. <pr...@us...> - 2007-03-21 19:17:18
|
Update of /cvsroot/pyxida/Pyxida/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10255/lib Modified Files: sbon-async.jar Log Message: Moved comm package under async Index: sbon-async.jar =================================================================== RCS file: /cvsroot/pyxida/Pyxida/lib/sbon-async.jar,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 Binary files /tmp/cvsWsKlqt and /tmp/cvsdpTFAI differ |
|
From: Peter P. <pr...@us...> - 2007-03-21 13:47:53
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10755/src/edu/harvard/syrah/pyxida/knn Modified Files: Zone.java Log Message: Fixed cast Index: Zone.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn/Zone.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Zone.java 20 Mar 2007 13:17:26 -0000 1.4 --- Zone.java 21 Mar 2007 13:47:52 -0000 1.5 *************** *** 72,76 **** if (currentInterval == intervalCount) currentInterval = 0; ! ArrayList<NodeDesc> current = (ArrayList)intervalSet.get(currentInterval); nodeCount -= current.size(); current.clear(); --- 72,76 ---- if (currentInterval == intervalCount) currentInterval = 0; ! ArrayList<NodeDesc> current = (ArrayList<NodeDesc>) intervalSet.get(currentInterval); nodeCount -= current.size(); current.clear(); |
|
From: Peter P. <pr...@us...> - 2007-03-21 11:59:28
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv681/src/edu/harvard/syrah/pyxida Modified Files: LogServer.java Log Message: Changed import for async packages Index: LogServer.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/LogServer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LogServer.java 20 Mar 2007 13:17:26 -0000 1.10 --- LogServer.java 21 Mar 2007 11:59:27 -0000 1.11 *************** *** 6,12 **** import java.io.PrintWriter; import java.text.NumberFormat; - import java.io.*; import java.text.SimpleDateFormat; ! import java.util.*; import edu.harvard.syrah.prp.ANSI; --- 6,13 ---- import java.io.PrintWriter; import java.text.NumberFormat; import java.text.SimpleDateFormat; ! import java.util.Date; ! import java.util.HashMap; ! import java.util.Map; import edu.harvard.syrah.prp.ANSI; *************** *** 21,29 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommCB; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommIF; public class LogServer { --- 22,30 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjCommCB; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjCommIF; public class LogServer { |
|
From: Peter P. <pr...@us...> - 2007-03-21 11:58:19
|
Update of /cvsroot/pyxida/Pyxida/web/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32402/web/dist Added Files: pyxida-src-0.1.4.tar.gz pyxida-0.1.4.tar.gz Removed Files: foo Log Message: Added new tarballs --- NEW FILE: pyxida-src-0.1.4.tar.gz --- (This appears to be a binary file; contents omitted.) --- foo DELETED --- --- NEW FILE: pyxida-0.1.4.tar.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Jonathan L. <le...@us...> - 2007-03-20 13:53:31
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26088/src/edu/harvard/syrah/pyxida/knn Modified Files: Zone.java KnnSim.java HyperCubeZoneManager.java Log Message: Trimmed memory use with KNN Index: Zone.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn/Zone.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Zone.java 14 Mar 2007 18:12:26 -0000 1.3 --- Zone.java 20 Mar 2007 13:17:26 -0000 1.4 *************** *** 34,40 **** // max guys per interval ! public static final int maxNodesPerInterval = 10; // remember this many slots of nodes public static final int intervalCount = 10; --- 34,43 ---- // max guys per interval ! // TODO Set to 10 ! public static final int maxNodesPerInterval = 1000; // remember this many slots of nodes + // Note: if you make this large, you may want to change the memory allocation + // below so to be a little more judicious public static final int intervalCount = 10; *************** *** 42,46 **** // maxNodesPerInterval x intervalCount pointers to NodeDescs ! final Vector<List<NodeDesc>> intervalSet; int currentInterval = 0; --- 45,50 ---- // maxNodesPerInterval x intervalCount pointers to NodeDescs ! final Vector<List<NodeDesc>> intervalSet; ! //final NodeDesc[][] intervalSet; int currentInterval = 0; *************** *** 51,57 **** public Zone (long _id) { id = _id; ! intervalSet = new Vector<List<NodeDesc>> (); for (int i = 0; i < intervalCount; i++) { ! intervalSet.add(new ArrayList<NodeDesc>()); } } --- 55,62 ---- public Zone (long _id) { id = _id; ! ! intervalSet = new Vector<List<NodeDesc>> (intervalCount); for (int i = 0; i < intervalCount; i++) { ! intervalSet.add(new ArrayList<NodeDesc>(0)); } } *************** *** 60,64 **** if (node == null) return; long intervalFloor = stamp / rotateSetInterval; ! if (intervalFloor > currentIntervalFloor || intervalSet.get(currentInterval).size() >= maxNodesPerInterval) { --- 65,69 ---- if (node == null) return; long intervalFloor = stamp / rotateSetInterval; ! if (intervalFloor > currentIntervalFloor || intervalSet.get(currentInterval).size() >= maxNodesPerInterval) { *************** *** 66,75 **** currentInterval++; if (currentInterval == intervalCount) currentInterval = 0; ! nodeCount -= intervalSet.get(currentInterval).size(); ! intervalSet.get(currentInterval).clear(); currentIntervalFloor = intervalFloor; } intervalSet.get(currentInterval).add(node); nodeCount++; } --- 71,84 ---- currentInterval++; if (currentInterval == intervalCount) currentInterval = 0; ! ! ArrayList<NodeDesc> current = (ArrayList)intervalSet.get(currentInterval); ! nodeCount -= current.size(); ! current.clear(); ! current.trimToSize(); currentIntervalFloor = intervalFloor; } intervalSet.get(currentInterval).add(node); + nodeCount++; } *************** *** 80,84 **** int intervalsPassed = 0; ! while (distance2nearbyNodes.size() < maxNearbyNodes && intervalsPassed < intervalCount) { for (NodeDesc nearbyNode : intervalSet.get(interval)) { if (!probeSrc.equals(nearbyNode) && probeSrc.coord != null && nearbyNode.coord != null) { --- 89,93 ---- int intervalsPassed = 0; ! while ( (maxNearbyNodes==0 || distance2nearbyNodes.size() < maxNearbyNodes) && intervalsPassed < intervalCount) { for (NodeDesc nearbyNode : intervalSet.get(interval)) { if (!probeSrc.equals(nearbyNode) && probeSrc.coord != null && nearbyNode.coord != null) { Index: HyperCubeZoneManager.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn/HyperCubeZoneManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HyperCubeZoneManager.java 14 Mar 2007 18:12:26 -0000 1.4 --- HyperCubeZoneManager.java 20 Mar 2007 13:17:26 -0000 1.5 *************** *** 30,39 **** final Map<Long,List<Long>> zone2adjacentZones; ! public HyperCubeZoneManager (int _dimensions, double _dimensionSideLength, int _zonesPerDimension, boolean _useAdjacentZones) { dimensions = _dimensions; dimensionSideLength = _dimensionSideLength; halfDimensionSideLength = dimensionSideLength / 2.; ! zonesPerDimension = _zonesPerDimension; ! zoneEdgeLength = _dimensionSideLength / _zonesPerDimension; useAdjacentZones = _useAdjacentZones; zoneMap = new HashMap<Long,Zone> (); --- 30,40 ---- final Map<Long,List<Long>> zone2adjacentZones; ! public HyperCubeZoneManager (int _dimensions, double _dimensionSideLength, double _zoneEdgeLength, boolean _useAdjacentZones) { dimensions = _dimensions; dimensionSideLength = _dimensionSideLength; halfDimensionSideLength = dimensionSideLength / 2.; ! zoneEdgeLength = _zoneEdgeLength; ! zonesPerDimension = (int)Math.floor(_dimensionSideLength / _zoneEdgeLength); ! useAdjacentZones = _useAdjacentZones; zoneMap = new HashMap<Long,Zone> (); *************** *** 78,82 **** //slog.info ("added "+distance2nearbyNodes.size()+" from our zone "+zoneId); ! if (useAdjacentZones && distance2nearbyNodes.size() < maxReturnSize) { List<Long> adjacentZones = zone2adjacentZones.get(zoneId); // compute our adjacent zones in case ours is empty --- 79,83 ---- //slog.info ("added "+distance2nearbyNodes.size()+" from our zone "+zoneId); ! if (useAdjacentZones && (maxReturnSize == 0 || distance2nearbyNodes.size() < maxReturnSize)) { List<Long> adjacentZones = zone2adjacentZones.get(zoneId); // compute our adjacent zones in case ours is empty *************** *** 92,96 **** //slog.info ("total "+distance2nearbyNodes.size()+" from zone "+adjacentZoneId); ! if (distance2nearbyNodes.size() >= maxReturnSize) { return; } --- 93,97 ---- //slog.info ("total "+distance2nearbyNodes.size()+" from zone "+adjacentZoneId); ! if (maxReturnSize == 0 || distance2nearbyNodes.size() >= maxReturnSize) { return; } Index: KnnSim.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/knn/KnnSim.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** KnnSim.java 20 Mar 2007 12:27:53 -0000 1.5 --- KnnSim.java 20 Mar 2007 13:17:26 -0000 1.6 *************** *** 35,43 **** // Number of guys we would be returning to client. // We will see how many of the true NN of the same size we find. ! int returnSetSize = 50; String coordFilename = null; ! boolean useAdjacentZones = true; double dimensionSideLength = 10000; ! int zonesPerDimension = 2; final static protected int NFDigits = 3; --- 35,44 ---- // Number of guys we would be returning to client. // We will see how many of the true NN of the same size we find. ! int returnSetSize = 0; String coordFilename = null; ! boolean useAdjacentZones = false; double dimensionSideLength = 10000; ! double zoneEdgeLength = 25.; ! double zoneTargetRTT = 100.; final static protected int NFDigits = 3; *************** *** 65,68 **** --- 66,71 ---- " -h toggle height use ("+NCClient.USE_HEIGHT+")\n"+ " -s dimension side length ("+dimensionSideLength+")\n"+ + " -e zone edge length ("+zoneEdgeLength+")\n"+ + " -t zone target RTT ("+zoneTargetRTT+")\n"+ " -a toggle adjacent zone use ("+useAdjacentZones+")\n"+ " -r return set size ("+returnSetSize+")\n"+ *************** *** 73,77 **** public KnnSim (String[] args) { int c; ! Getopt g = new Getopt ("KnnSim", args, "d:hz:s:ar:c:"); while ((c = g.getopt()) != -1) { --- 76,80 ---- public KnnSim (String[] args) { int c; ! Getopt g = new Getopt ("KnnSim", args, "d:he:s:ar:c:"); while ((c = g.getopt()) != -1) { *************** *** 83,88 **** NCClient.USE_HEIGHT = !NCClient.USE_HEIGHT; break; ! case 'z': ! zonesPerDimension = Integer.parseInt(g.getOptarg()); break; case 's': --- 86,91 ---- NCClient.USE_HEIGHT = !NCClient.USE_HEIGHT; break; ! case 'e': ! zoneEdgeLength = Double.parseDouble(g.getOptarg()); break; case 's': *************** *** 102,121 **** } } if (coordFilename == null) printUsage ("coordinate file required"); if (dimensions <= 0) printUsage ("invalid number of dimensions"); if (zonesPerDimension <= 1) printUsage ("zones per dimension invalid"); if (dimensionSideLength < 1.) printUsage ("dimension side length invalid"); ! if (returnSetSize < 1) printUsage ("return set size invalid"); dimsPlusHeight = NCClient.USE_HEIGHT?(dimensions+1):dimensions; ! slog.info("PARAMS dims="+dimensions+ " height="+NCClient.USE_HEIGHT+ " dimensionSideLength="+dimensionSideLength+ " zonesPerDimension="+zonesPerDimension+ " useAdjacentZones="+useAdjacentZones+ " returnSetSize="+returnSetSize+ ! " coordFile="+coordFilename); slog.info ("reading coordinate file "+coordFilename); --- 105,131 ---- } } + + if (dimensionSideLength % zoneEdgeLength != 0.) + printUsage ("zone edge length must divide dimension side length evenly."); + int zonesPerDimension = (int)(Math.floor(dimensionSideLength / zoneEdgeLength)); + if (coordFilename == null) printUsage ("coordinate file required"); if (dimensions <= 0) printUsage ("invalid number of dimensions"); if (zonesPerDimension <= 1) printUsage ("zones per dimension invalid"); if (dimensionSideLength < 1.) printUsage ("dimension side length invalid"); ! if (returnSetSize < 0) printUsage ("return set size invalid"); dimsPlusHeight = NCClient.USE_HEIGHT?(dimensions+1):dimensions; ! String params = "PARAMS dims="+dimensions+ " height="+NCClient.USE_HEIGHT+ " dimensionSideLength="+dimensionSideLength+ " zonesPerDimension="+zonesPerDimension+ + " zoneEdgeLength="+zoneEdgeLength+ " useAdjacentZones="+useAdjacentZones+ " returnSetSize="+returnSetSize+ ! " coordFile="+coordFilename; ! System.out.println ("# "+params); slog.info ("reading coordinate file "+coordFilename); *************** *** 125,129 **** ! zm = new HyperCubeZoneManager (dimensions, dimensionSideLength, zonesPerDimension, useAdjacentZones); slog.info ("adding nodes to zones"); --- 135,139 ---- ! zm = new HyperCubeZoneManager (dimensions, dimensionSideLength, zoneEdgeLength, useAdjacentZones); slog.info ("adding nodes to zones"); *************** *** 137,146 **** for (NodeDesc me : nodes) { SortedMap<Double,NodeDesc> distance2node = new TreeMap<Double,NodeDesc>(); for (NodeDesc node : nodes) { if (me != node) { double distance = me.coord.distanceTo(node.coord); ! distance2node.put(distance, node); } } node2distance2node.put(me, distance2node); } --- 147,173 ---- for (NodeDesc me : nodes) { SortedMap<Double,NodeDesc> distance2node = new TreeMap<Double,NodeDesc>(); + double nearestDistance = Double.MAX_VALUE; + NodeDesc nearestNode = null; for (NodeDesc node : nodes) { if (me != node) { double distance = me.coord.distanceTo(node.coord); ! if (distance < nearestDistance) { ! nearestDistance = distance; ! nearestNode = node; ! } } } + + distance2node.put(nearestDistance, nearestNode); + + /* + SortedMap<Double,NodeDesc> distance2node = new TreeMap<Double,NodeDesc>(); + int count = 0; + final int MAX_NEARBY_TNN = 1; + for (Map.Entry<Double,NodeDesc> entry : allDistance2node.entrySet()) { + distance2node.put(entry.getKey(), entry.getValue()); + if (count > MAX_NEARBY_TNN) break; + } + */ node2distance2node.put(me, distance2node); } *************** *** 153,157 **** zm.add (stamp, node); } ! //slog.info (zm.toString()); } --- 180,185 ---- zm.add (stamp, node); } ! //slog.info (zm.toString()); ! //System.out.println (zm.toString()); } *************** *** 162,173 **** SortedMap<Double,NodeDesc> distance2nearbyNodes = new TreeMap<Double,NodeDesc>(); ! zm.query(node,distance2nearbyNodes,returnSetSize); // foundSet is who we would be returning to the client //Set<NodeDesc> foundSet = getSetHead (distance2node, returnSetSize); ! Set<NodeDesc> tnnSet = getSetHead (node2distance2node.get(node), returnSetSize); ! ! int unionSize = 0; ! /* slog.info (node.id+" true nearest neighbors:"); --- 190,204 ---- SortedMap<Double,NodeDesc> distance2nearbyNodes = new TreeMap<Double,NodeDesc>(); ! zm.query(node,distance2nearbyNodes,0); // foundSet is who we would be returning to the client //Set<NodeDesc> foundSet = getSetHead (distance2node, returnSetSize); ! SortedMap<Double,NodeDesc> trueDistance2node = node2distance2node.get(node); ! double trueNearestDistance = trueDistance2node.firstKey(); ! ! double rttSum = 0.; ! int countLtTargetRtt = 0; ! int countGtTargetRtt = 0; ! /* slog.info (node.id+" true nearest neighbors:"); *************** *** 177,193 **** */ ! for (NodeDesc foundNode : distance2nearbyNodes.values()) { //slog.info (node.id+" union "+foundNode.id); ! if (tnnSet.contains(foundNode)) { ! unionSize++; } } ! double pctOverlap = (double)unionSize / tnnSet.size(); //slog.info (node.id+" unionSize "+unionSize + " pct="+nf.format(pctOverlap)); ! slog.info (node.id+" pct="+nf.format(pctOverlap)); ! // TODO Could also eval mapping with abs(rank difference) // exponentially weighted by tnn rank --- 208,236 ---- */ ! for (Map.Entry<Double, NodeDesc> entry : distance2nearbyNodes.entrySet()) { //slog.info (node.id+" union "+foundNode.id); ! double rtt = entry.getKey(); ! rttSum += rtt; ! if (rtt < zoneTargetRTT) { ! countLtTargetRtt++; ! } else { ! countGtTargetRtt++; } } ! double avgRtt = (distance2nearbyNodes.size() > 0) ? ! rttSum / (double)distance2nearbyNodes.size() : 0.; //slog.info (node.id+" unionSize "+unionSize + " pct="+nf.format(pctOverlap)); ! String res = node.id+" avgRtt= "+nf.format(avgRtt)+ ! " lt= "+countLtTargetRtt+ " gt= "+countGtTargetRtt+ ! " pctLt= "+ nf.format ! ((distance2nearbyNodes.size() > 0) ? (double)countLtTargetRtt/(double)distance2nearbyNodes.size() : 0.)+ ! " tN= "+nf.format(trueNearestDistance)+ ! " c= "+node.coord; ! ! System.out.println (res); ! // Could also eval mapping with abs(rank difference) // exponentially weighted by tnn rank |
|
From: Jonathan L. <le...@us...> - 2007-03-20 13:53:26
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26088/src/edu/harvard/syrah/pyxida Modified Files: LogServer.java Log Message: Trimmed memory use with KNN Index: LogServer.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/LogServer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LogServer.java 20 Mar 2007 12:27:53 -0000 1.9 --- LogServer.java 20 Mar 2007 13:17:26 -0000 1.10 *************** *** 1,4 **** --- 1,9 ---- package edu.harvard.syrah.pyxida; + import java.io.BufferedWriter; + import java.io.File; + import java.io.FileWriter; + import java.io.PrintWriter; + import java.text.NumberFormat; import java.io.*; import java.text.SimpleDateFormat; *************** *** 10,20 **** import edu.harvard.syrah.pyxida.log.ReportCoordReqMsg; import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.*; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.*; public class LogServer { --- 15,29 ---- import edu.harvard.syrah.pyxida.log.ReportCoordReqMsg; import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.CBResult; ! import edu.harvard.syrah.sbon.async.Config; ! import edu.harvard.syrah.sbon.async.EventLoop; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommCB; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommIF; public class LogServer { *************** *** 39,43 **** // Output a summary of nodes we have heard from recently at this rate (10 minutes) private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "600000")); ! //private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "20000")); private static final String DUMP_COORD_PATH = String.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_path", "/nc/log-pyxida-coords")); --- 48,52 ---- // Output a summary of nodes we have heard from recently at this rate (10 minutes) private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "600000")); ! //private static final long DUMP_COORD_INTERVAL = Long.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_interval", "200000")); private static final String DUMP_COORD_PATH = String.valueOf(Config.getConfigProps().getProperty("pyxida.logserver.dump_coord_path", "/nc/log-pyxida-coords")); *************** *** 50,53 **** --- 59,76 ---- Map<AddressIF,CoordDesc> addr2coords = new HashMap<AddressIF,CoordDesc>(); + final static protected NumberFormat nf = NumberFormat.getInstance(); + + final static protected int NFDigits = 3; + + static { + if (nf.getMaximumFractionDigits() > NFDigits) { + nf.setMaximumFractionDigits(NFDigits); + } + if (nf.getMinimumFractionDigits() > NFDigits) { + nf.setMinimumFractionDigits(NFDigits); + } + nf.setGroupingUsed(false); + } + public LogServer () { dateFormat = new SimpleDateFormat("yyyyMMdd-HHmm"); *************** *** 168,174 **** public String toString () { ! return (primaryAppCoord.toString()+" erP="+primarySysCoordError+ ! secondaryAppCoord.toString()+" erS="+secondarySysCoordError); ! //return (" sc1=" + primarySysCoord + " ac1=" + primaryAppCoord + " sc2=" + secondarySysCoord + " ac2=" + secondaryAppCoord); } --- 191,196 ---- public String toString () { ! return ("cP="+primaryAppCoord.toString()+" erP="+nf.format(primarySysCoordError)+ ! " cS="+secondaryAppCoord.toString()+" erS="+nf.format(secondarySysCoordError)); } *************** *** 213,217 **** switch (result.state) { case OK: { ! log.info("a=" + remoteAddr + " sc1=" + reqMsg.primarySysCoord + " ac1=" + reqMsg.primaryAppCoord + " sc2=" + reqMsg.secondarySysCoord + " ac2=" + reqMsg.secondaryAppCoord); // just scribble over old version if there is one --- 235,243 ---- switch (result.state) { case OK: { ! log.info("a=" + remoteAddr + " sc1=" + reqMsg.primarySysCoord + " er1="+ ! nf.format(reqMsg.primarySysCoordError)+" ac1=" + reqMsg.primaryAppCoord + ! " sc2=" + reqMsg.secondarySysCoord + ! " er2=" + nf.format(reqMsg.secondarySysCoordError)+ ! " ac2=" + reqMsg.secondaryAppCoord); // just scribble over old version if there is one |
|
From: Jonathan L. <le...@us...> - 2007-03-20 13:53:26
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26088/src/edu/harvard/syrah/pyxida/nc/lib Modified Files: NCClient.java Log Message: Trimmed memory use with KNN Index: NCClient.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/lib/NCClient.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NCClient.java 21 Feb 2007 15:35:56 -0000 1.7 --- NCClient.java 20 Mar 2007 13:17:26 -0000 1.8 *************** *** 116,120 **** public static double MAX_DIST_FROM_ORIGIN = 60000.; ! final static protected NumberFormat nf = NumberFormat.getInstance(); final static protected int NFDigits = 2; --- 116,120 ---- public static double MAX_DIST_FROM_ORIGIN = 60000.; ! final static protected NumberFormat nf = NumberFormat.getInstance(); final static protected int NFDigits = 2; |
|
From: Peter P. <pr...@us...> - 2007-03-20 12:27:58
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/src/edu/harvard/syrah/pyxida/nc Modified Files: NCManager.java ProxyPingResponseMsg.java CoordRequestMsg.java GossipResponseMsg.java ProxyPingRequestMsg.java CoordResponseMsg.java GossipRequestMsg.java Log Message: Refactored async lib Index: NCManager.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/NCManager.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** NCManager.java 21 Feb 2007 13:10:29 -0000 1.36 --- NCManager.java 20 Mar 2007 12:27:52 -0000 1.37 *************** *** 9,22 **** import edu.harvard.syrah.pyxida.nc.lib.NCClient; import edu.harvard.syrah.pyxida.ping.PingManager; - import edu.harvard.syrah.sbon.async.CBResult; - import edu.harvard.syrah.sbon.async.Config; - import edu.harvard.syrah.sbon.async.EventLoop; import edu.harvard.syrah.sbon.async.*; ! import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! 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; ! import edu.harvard.syrah.sbon.comm.obj.*; /** --- 9,17 ---- import edu.harvard.syrah.pyxida.nc.lib.NCClient; import edu.harvard.syrah.pyxida.ping.PingManager; import edu.harvard.syrah.sbon.async.*; ! import edu.harvard.syrah.sbon.async.CallbacksIF.*; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.*; /** Index: ProxyPingResponseMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/ProxyPingResponseMsg.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProxyPingResponseMsg.java 5 Dec 2006 10:34:12 -0000 1.2 --- ProxyPingResponseMsg.java 20 Mar 2007 12:27:52 -0000 1.3 *************** *** 2,6 **** import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 2,6 ---- import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** Index: ProxyPingRequestMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/ProxyPingRequestMsg.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProxyPingRequestMsg.java 1 Feb 2007 14:59:14 -0000 1.2 --- ProxyPingRequestMsg.java 20 Mar 2007 12:27:52 -0000 1.3 *************** *** 1,6 **** package edu.harvard.syrah.pyxida.nc; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 1,6 ---- package edu.harvard.syrah.pyxida.nc; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** Index: GossipRequestMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/GossipRequestMsg.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GossipRequestMsg.java 15 Feb 2007 18:01:26 -0000 1.4 --- GossipRequestMsg.java 20 Mar 2007 12:27:53 -0000 1.5 *************** *** 4,9 **** import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 4,9 ---- import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** Index: CoordResponseMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/CoordResponseMsg.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CoordResponseMsg.java 29 Nov 2006 11:08:20 -0000 1.2 --- CoordResponseMsg.java 20 Mar 2007 12:27:53 -0000 1.3 *************** *** 2,6 **** import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 2,6 ---- import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** Index: CoordRequestMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/CoordRequestMsg.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CoordRequestMsg.java 29 Nov 2006 11:08:20 -0000 1.2 --- CoordRequestMsg.java 20 Mar 2007 12:27:52 -0000 1.3 *************** *** 1,5 **** package edu.harvard.syrah.pyxida.nc; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 1,5 ---- package edu.harvard.syrah.pyxida.nc; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** Index: GossipResponseMsg.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/nc/GossipResponseMsg.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GossipResponseMsg.java 15 Feb 2007 18:01:26 -0000 1.5 --- GossipResponseMsg.java 20 Mar 2007 12:27:52 -0000 1.6 *************** *** 4,9 **** import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjMessage; /** --- 4,9 ---- import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjMessage; /** |
|
From: Peter P. <pr...@us...> - 2007-03-20 12:27:56
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/src/edu/harvard/syrah/pyxida Modified Files: LogServer.java Pyxida.java Log Message: Refactored async lib Index: Pyxida.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/Pyxida.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Pyxida.java 21 Feb 2007 13:10:29 -0000 1.22 --- Pyxida.java 20 Mar 2007 12:27:53 -0000 1.23 *************** *** 10,17 **** import edu.harvard.syrah.sbon.async.*; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommIF; public class Pyxida { --- 10,17 ---- import edu.harvard.syrah.sbon.async.*; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.async.comm.obj.ObjCommIF; public class Pyxida { Index: LogServer.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/LogServer.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LogServer.java 5 Mar 2007 19:58:29 -0000 1.8 --- LogServer.java 20 Mar 2007 12:27:53 -0000 1.9 *************** *** 1,12 **** package edu.harvard.syrah.pyxida; ! import java.io.BufferedWriter; ! import java.io.File; ! import java.io.FileWriter; ! import java.io.PrintWriter; import java.text.SimpleDateFormat; ! import java.util.Date; ! import java.util.HashMap; ! import java.util.Map; import edu.harvard.syrah.prp.ANSI; --- 1,7 ---- package edu.harvard.syrah.pyxida; ! import java.io.*; import java.text.SimpleDateFormat; ! import java.util.*; import edu.harvard.syrah.prp.ANSI; *************** *** 15,29 **** import edu.harvard.syrah.pyxida.log.ReportCoordReqMsg; import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.CBResult; ! import edu.harvard.syrah.sbon.async.Config; ! import edu.harvard.syrah.sbon.async.EventLoop; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.obj.ObjComm; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommCB; ! import edu.harvard.syrah.sbon.comm.obj.ObjCommIF; public class LogServer { --- 10,20 ---- import edu.harvard.syrah.pyxida.log.ReportCoordReqMsg; import edu.harvard.syrah.pyxida.nc.lib.Coordinate; ! import edu.harvard.syrah.sbon.async.*; import edu.harvard.syrah.sbon.async.CBResult.CBState; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.obj.*; public class LogServer { |
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/src/edu/harvard/syrah/pyxida/ping Modified Files: ICMPPinger.java PingManager.java TCPSynPinger.java PingerIF.java UDPAppPinger.java Pinger.java JpcapPinger.java Log Message: Refactored async lib Index: Pinger.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/Pinger.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Pinger.java 24 Nov 2006 12:06:22 -0000 1.4 --- Pinger.java 20 Mar 2007 12:27:53 -0000 1.5 *************** *** 6,10 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressIF; abstract class Pinger implements PingerIF { --- 6,10 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; abstract class Pinger implements PingerIF { Index: UDPAppPinger.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/UDPAppPinger.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UDPAppPinger.java 23 Nov 2006 16:46:10 -0000 1.4 --- UDPAppPinger.java 20 Mar 2007 12:27:53 -0000 1.5 *************** *** 4,8 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressIF; class UDPAppPinger extends Pinger implements PingerIF { --- 4,8 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; class UDPAppPinger extends Pinger implements PingerIF { Index: PingManager.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/PingManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PingManager.java 30 Nov 2006 13:00:42 -0000 1.11 --- PingManager.java 20 Mar 2007 12:27:53 -0000 1.12 *************** *** 4,16 **** import java.util.List; - import edu.harvard.syrah.pyxida.Pyxida; import edu.harvard.syrah.prp.Log; import edu.harvard.syrah.sbon.async.CBResult; import edu.harvard.syrah.sbon.async.LoopIt; ! import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! 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; --- 4,14 ---- import java.util.List; import edu.harvard.syrah.prp.Log; + import edu.harvard.syrah.pyxida.Pyxida; import edu.harvard.syrah.sbon.async.CBResult; import edu.harvard.syrah.sbon.async.LoopIt; ! import edu.harvard.syrah.sbon.async.CallbacksIF.*; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; Index: ICMPPinger.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/ICMPPinger.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ICMPPinger.java 7 Dec 2006 11:46:17 -0000 1.11 --- ICMPPinger.java 20 Mar 2007 12:27:53 -0000 1.12 *************** *** 1,8 **** package edu.harvard.syrah.pyxida.ping; ! import jpcap.packet.EthernetPacket; ! import jpcap.packet.ICMPPacket; ! import jpcap.packet.IPPacket; ! import jpcap.packet.Packet; import edu.harvard.syrah.prp.ANSI; import edu.harvard.syrah.prp.Log; --- 1,5 ---- package edu.harvard.syrah.pyxida.ping; ! import jpcap.packet.*; import edu.harvard.syrah.prp.ANSI; import edu.harvard.syrah.prp.Log; *************** *** 12,17 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; class ICMPPinger extends JpcapPinger implements PingerIF { --- 9,14 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; class ICMPPinger extends JpcapPinger implements PingerIF { Index: JpcapPinger.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/JpcapPinger.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JpcapPinger.java 7 Dec 2006 11:46:17 -0000 1.6 --- JpcapPinger.java 20 Mar 2007 12:27:53 -0000 1.7 *************** *** 3,18 **** import java.io.IOException; import java.io.InputStream; ! import java.net.Inet4Address; ! import java.net.InetAddress; ! import java.net.MalformedURLException; import java.util.*; ! import jpcap.JpcapCaptor; ! import jpcap.JpcapSender; import jpcap.NetworkInterface; ! import jpcap.NetworkInterfaceAddress; ! import jpcap.packet.EthernetPacket; ! import jpcap.packet.IPPacket; ! import jpcap.packet.Packet; import edu.harvard.syrah.prp.Log; import edu.harvard.syrah.prp.POut; --- 3,12 ---- import java.io.IOException; import java.io.InputStream; ! import java.net.*; import java.util.*; ! import jpcap.*; import jpcap.NetworkInterface; ! import jpcap.packet.*; import edu.harvard.syrah.prp.Log; import edu.harvard.syrah.prp.POut; *************** *** 21,26 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; --- 15,20 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; Index: PingerIF.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/PingerIF.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PingerIF.java 23 Nov 2006 16:46:10 -0000 1.3 --- PingerIF.java 20 Mar 2007 12:27:53 -0000 1.4 *************** *** 3,7 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressIF; interface PingerIF extends Runnable { --- 3,7 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; interface PingerIF extends Runnable { Index: TCPSynPinger.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/TCPSynPinger.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TCPSynPinger.java 7 Dec 2006 11:46:17 -0000 1.8 --- TCPSynPinger.java 20 Mar 2007 12:27:53 -0000 1.9 *************** *** 2,8 **** import jpcap.packet.*; ! import edu.harvard.syrah.prp.ANSI; ! import edu.harvard.syrah.prp.Log; ! import edu.harvard.syrah.prp.PUtil; import edu.harvard.syrah.pyxida.Pyxida; import edu.harvard.syrah.sbon.async.CBResult; --- 2,6 ---- import jpcap.packet.*; ! import edu.harvard.syrah.prp.*; import edu.harvard.syrah.pyxida.Pyxida; import edu.harvard.syrah.sbon.async.CBResult; *************** *** 10,15 **** import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; class TCPSynPinger extends JpcapPinger implements PingerIF { --- 8,13 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; class TCPSynPinger extends JpcapPinger implements PingerIF { |
|
From: Peter P. <pr...@us...> - 2007-03-20 12:27:56
|
Update of /cvsroot/pyxida/Pyxida/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/lib Modified Files: sbon-async.jar Log Message: Refactored async lib Index: sbon-async.jar =================================================================== RCS file: /cvsroot/pyxida/Pyxida/lib/sbon-async.jar,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 Binary files /tmp/cvs0AYuFC and /tmp/cvsSYIzz1 differ |
|
From: Peter P. <pr...@us...> - 2007-03-20 12:27:56
|
Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/src/edu/harvard/syrah/pyxida/api Modified Files: XMLRPC_API.java ExternalAPI.java Log Message: Refactored async lib Index: ExternalAPI.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPI.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ExternalAPI.java 21 Feb 2007 13:44:42 -0000 1.20 --- ExternalAPI.java 20 Mar 2007 12:27:53 -0000 1.21 *************** *** 10,16 **** 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; ! import edu.harvard.syrah.sbon.comm.http.HTTPCallbackHandler; public class ExternalAPI extends HTTPCallbackHandler implements ExternalAPIIF { --- 10,16 ---- import edu.harvard.syrah.sbon.async.CallbacksIF.CB1; import edu.harvard.syrah.sbon.async.CallbacksIF.CB2; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.http.HTTPCallbackHandler; public class ExternalAPI extends HTTPCallbackHandler implements ExternalAPIIF { Index: XMLRPC_API.java =================================================================== RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/XMLRPC_API.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLRPC_API.java 21 Feb 2007 13:10:29 -0000 1.6 --- XMLRPC_API.java 20 Mar 2007 12:27:53 -0000 1.7 *************** *** 4,11 **** import edu.harvard.syrah.sbon.async.Config; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! import edu.harvard.syrah.sbon.comm.AddressFactory; ! import edu.harvard.syrah.sbon.comm.AddressIF; ! import edu.harvard.syrah.sbon.comm.xmlrpc.XMLRPCComm; ! import edu.harvard.syrah.sbon.comm.xmlrpc.XMLRPCCommIF; public class XMLRPC_API implements APIInstanceIF { --- 4,11 ---- import edu.harvard.syrah.sbon.async.Config; import edu.harvard.syrah.sbon.async.CallbacksIF.CB0; ! import edu.harvard.syrah.sbon.async.comm.AddressFactory; ! import edu.harvard.syrah.sbon.async.comm.AddressIF; ! import edu.harvard.syrah.sbon.async.comm.xmlrpc.XMLRPCComm; ! import edu.harvard.syrah.sbon.async.comm.xmlrpc.XMLRPCCommIF; public class XMLRPC_API implements APIInstanceIF { |
