[Jrobin-commits] src Demo.java,1.16,1.17 StressTest.java,1.2,1.3

[Sasa M. <sa...@us...>]

Update of /cvsroot/jrobin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9371

Modified Files:
	Demo.java StressTest.java 
Log Message:
Major core package redesign

Index: Demo.java
===================================================================
RCS file: /cvsroot/jrobin/src/Demo.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Demo.java	11 May 2004 10:05:48 -0000	1.16
--- Demo.java	20 May 2004 10:29:31 -0000	1.17
***************
*** 40,43 ****
--- 40,44 ----
  	static final Random RANDOM = new Random(SEED);
  	static final String FILE = "demo";
+ 	static final String FACTORY_NAME = "FILE";
  
  	static final long START = Util.getTimestamp(2003, 4, 1);
***************
*** 50,54 ****
  		println("== Starting demo");
  		RrdDb.setLockMode(RrdDb.NO_LOCKS);
- 
  		long startMillis = System.currentTimeMillis();
  		long start = START;
--- 51,54 ----

Index: StressTest.java
===================================================================
RCS file: /cvsroot/jrobin/src/StressTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StressTest.java	29 Mar 2004 14:38:27 -0000	1.2
--- StressTest.java	20 May 2004 10:29:31 -0000	1.3
***************
*** 38,41 ****
--- 38,42 ----
  	public static final long RRD_START = 946710000L;
  	public static final long RRD_STEP = 30;
+ 	public static final String BACKEND_NAME = "MEMORY";
  
  	public static final String RRD_DATASOURCE_NAME = "T";
***************
*** 94,101 ****
          def.addArchive("MIN", 0.5, 1440, 50000);
          def.addArchive("MAX", 0.5, 1440, 50000);
- 		//printLapTime(def.dump());
  		printLapTime("Definition created, creating RRD file");
! 		RrdDbPool pool = RrdDbPool.getInstance();
! 		RrdDb rrd = pool.requestRrdDb(def);
  		printLapTime("RRD file created: " + RRD_PATH);
  		BufferedReader r = new BufferedReader(new FileReader(args[0]));
--- 95,100 ----
          def.addArchive("MIN", 0.5, 1440, 50000);
          def.addArchive("MAX", 0.5, 1440, 50000);
  		printLapTime("Definition created, creating RRD file");
! 		RrdDb rrd = new RrdDb(def);
  		printLapTime("RRD file created: " + RRD_PATH);
  		BufferedReader r = new BufferedReader(new FileReader(args[0]));
***************
*** 117,121 ****
  			}
  		}
! 		pool.release(rrd);
  		printLapTime("FINISHED: " + count + " samples stored");
          // GRAPH
--- 116,120 ----
  			}
  		}
! 		rrd.close();
  		printLapTime("FINISHED: " + count + " samples stored");
          // GRAPH
***************
*** 139,143 ****
  		gdef.comment("\nOriginal data provided by diy-zoning.sf.net@c");
  		printLapTime("Graph definition created");
! 		RrdGraph g = new RrdGraph(gdef, true);
  		g.saveAsPNG(PNG_PATH, PNG_WIDTH, PNG_HEIGHT);
  		printLapTime("Graph saved: " + PNG_PATH);
--- 138,142 ----
  		gdef.comment("\nOriginal data provided by diy-zoning.sf.net@c");
  		printLapTime("Graph definition created");
! 		RrdGraph g = new RrdGraph(gdef);
  		g.saveAsPNG(PNG_PATH, PNG_WIDTH, PNG_HEIGHT);
  		printLapTime("Graph saved: " + PNG_PATH);