You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/10/06 12:12:01 UTC
svn commit: r1179556 - in
/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf:
PerfMain.scala PerfUnit.scala PerfUnitLib.scala
Author: andy
Date: Thu Oct 6 10:12:00 2011
New Revision: 1179556
URL: http://svn.apache.org/viewvc?rev=1179556&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala?rev=1179556&r1=1179555&r2=1179556&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala Thu Oct 6 10:12:00 2011
@@ -40,8 +40,6 @@ object PerfMain {
if ( true )
{
- // Feel wrong there are two ways to do things.
- // Why not collect twice?
println("Warmup")
val collector0 = new Collector()
enact(new ActionProcessorCollector(collector0, monitor), manifest.actionWarmUp)
@@ -53,31 +51,16 @@ object PerfMain {
println("Finish @ "+now())
}
-// // Actions
-// val query1 = QueryFactory.create("SELECT * { ?s1 ?p1 ?o1 }")
-// val query2 = QueryFactory.create("SELECT * { ?s2 ?p2 ?o2 }")
-//
-// val action1 = new ActionByScheme("Q1", "file:D.ttl", query1)
-// val action2 = new ActionByScheme("Q2", "tdb:DB", query2)
-//
-// object ActionBuilderTest extends ActionBuilder
-// {
-// def build():Action = { new ActionN(List(action1, action2)) }
-// }
-// // Performing : Runner
-// def enact(proc:ActionProcessor, action:Action): Unit =
-// new ActionExecutor(proc).exec(action)
-
- // Performing : Runner
+ // --- Performing
def enact(proc:ActionProcessor, action:Action): Unit = {
val executor = new ActionExecutor(proc)
executor.exec(action)
}
- // Reporting : reporter
+ // ---- Reporting
def report(reporter: Reporter, collector: Collector): Unit = reporter.report(collector)
- val dateFmt:DateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z")
+ private val dateFmt:DateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z")
def now():String = dateFmt.format(new Date())
}
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala?rev=1179556&r1=1179555&r2=1179556&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnit.scala Thu Oct 6 10:12:00 2011
@@ -55,22 +55,22 @@ case object Failure extends Outcome("fai
case object NoOutcome extends Outcome("nothing")
/** Details, details */
-case class Result(outcome:Outcome, elapsed:Long, startDT:Option[Date] = None, finishDT:Option[Date] = None )
+case class Result(outcome:Outcome, id:Int, elapsed:Long, startDT:Option[Date] = None, finishDT:Option[Date] = None )
object Result {
- def apply(outcome:Outcome, elapsed:Long, startDT:Date, finishDT:Date) =
- new Result(outcome, elapsed, Some(startDT), Some(finishDT))
- def apply(outcome:Outcome, startDT:Date, finishDT:Date) =
- new Result(outcome, -1, Some(startDT), Some(finishDT))
- def apply(outcome:Outcome, elapsed:Long) =
- new Result(outcome, elapsed, None, None)
- def apply(outcome:Outcome) =
- new Result(outcome, -1, None, None)
+ def apply(outcome:Outcome, id:Int, elapsed:Long, startDT:Date, finishDT:Date) =
+ new Result(outcome, id, elapsed, Some(startDT), Some(finishDT))
+ def apply(outcome:Outcome, id:Int, startDT:Date, finishDT:Date) =
+ new Result(outcome, id, -1, Some(startDT), Some(finishDT))
+ def apply(outcome:Outcome, id:Int, elapsed:Long) =
+ new Result(outcome, id, elapsed, None, None)
+ def apply(outcome:Outcome, id:Int) =
+ new Result(outcome, id, -1, None, None)
}
trait ResultMonitor {
- def report(action: Action, result: Result)
+ def report(action: Action, id:Int, result: Result)
}
// def comp(out1:Outcome, out2:Outcome): Outcome = {
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala?rev=1179556&r1=1179555&r2=1179556&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfUnitLib.scala Thu Oct 6 10:12:00 2011
@@ -56,15 +56,15 @@ class ActionProcessorCollector(collector
val outcome = action.enact()
val finish = System.currentTimeMillis()
- val r = Result(outcome, finish-start)
- monitor.report(action, r)
+ val r = Result(outcome, id, finish-start)
+ monitor.report(action, id, r)
collector.acc(action, id, r)
}
}
object actionMonitorPrint extends ResultMonitor {
- def report(action: Action, result: Result) = {
- printf("%4dms %s\n", result.elapsed, action.name)
+ def report(action: Action, id:Int, result: Result) = {
+ printf("[%02d] %4dms %s\n", id, result.elapsed, action.name)
}
}