Index: zStressTest.mac.rou
===================================================================
diff -u -r1394 -r2179
--- zStressTest.mac.rou	(.../zStressTest.mac.rou)	(revision 1394)
+++ zStressTest.mac.rou	(.../zStressTest.mac.rou)	(revision 2179)
@@ -26,7 +26,8 @@
 ExecSelectQuery(Query)
 	do StartTimer^vhLib
 	new rs ,id,ctr
-	set rs = ##class(%ResultSet).%New("%DynamicQuery:SQL")
+	set rs = ##class(%ResultSet).%New()
+	W "Prepare",!
 	do rs.Prepare(Query)
 	do rs.Execute()
 	while rs.Next() { 
@@ -55,7 +56,8 @@
 	new CurrentNamespace
 	set CurrentNamespace = $$$NSpace
 	
-	znspace Namespace
+	;znspace Namespace
+	;set Prefix="^K"
 	
 	new Global,QGlobal,Data
 	do StartTimer^vhLib
Index: zStressTest/StressTest.cls.xml
===================================================================
diff -u -r1394 -r2179
--- zStressTest/StressTest.cls.xml	(.../StressTest.cls.xml)	(revision 1394)
+++ zStressTest/StressTest.cls.xml	(.../StressTest.cls.xml)	(revision 2179)
@@ -10,36 +10,18 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="JobCount">
+<Property name="DoCount">
 <Type>%String</Type>
 </Property>
 
 <Method name="RunTest">
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	set StressTest = ..%New()
-	read "Geef namespace : ",Namespace
-	if '$length(Namespace) set Namespace = $$$NSpace
-	set StressTest.Namespace = Namespace
-	
-	write !
-
-	set StressTest.JobCount = StressTest.ActiveJobs()
-	
-	do StressTest.DeleteGlobals()
-	do StressTest.DeletePreviousResults()
-	do StressTest.Test()
-	
-	set ActiveJobs = StressTest.ActiveJobs()
-	while '(ActiveJobs=StressTest.JobCount) { 
-		write "Active : "_$justify((ActiveJobs-StressTest.JobCount),5,0),*13 
-		hang 2 
-		set ActiveJobs = StressTest.ActiveJobs()
-	}
-	
-	do StressTest.Totalize()
-	
-	do StressTest.DeleteGlobals()	
+	for Counter=1:1:96 do
+	. for Counter2=1:1:15 do
+	. . Job ClassMethod^vhLib("zStressTest.StressTest","Test")
+	. . hang 5
+	. hang 2400
 	quit
 ]]></Implementation>
 </Method>
@@ -76,7 +58,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ActiveJobs">
+<Method name="ActiveDos">
 <Implementation><![CDATA[
 	set result = 0
 	set idx=""
@@ -86,75 +68,79 @@
 </Method>
 
 <Method name="Test">
+<ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	Job ReadGlobals^zStressTest(..Namespace,"^K")
+	;set Id=$increment(^zStressTest.Info)
+	;set ^zStressTest.Info(Id,"Started")=##class(TECH.DateTime).CurrentTimeStamp()
 
-	Job ReadGlobals^zStressTest(..Namespace,"^A")
-	Do PopulateData^zStressTest(1,150000)
-	Do PopulateData^zStressTest(2,150000)
-	Do PopulateData^zStressTest(3,150000)
-
-	Job ReadGlobals^zStressTest(..Namespace,"^A")
+	;Do ReadGlobals^zStressTest($$$NSpace,"^A")
+	;Do PopulateData^zStressTest(1,150000)
+	;Do PopulateData^zStressTest(2,150000)
+	;Do PopulateData^zStressTest(3,150000)
+	;	
+	;Do ReadGlobals^zStressTest($$$NSpace,"^A")
 	
-	for Counter = 1 : 1 : 3 Job ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass"_Counter_" ORDER BY Property1 DESC")
-	Job ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass1 ORDER BY Property2 DESC")
-	Job ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass2 ORDER BY Property1 DESC")	
-	Job ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass3")	
-	Job ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass1")	
+	for Counter = 1 : 1 : 3 Do ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass"_Counter_" ORDER BY Property1 DESC")
+	Do ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass1 ORDER BY Property2 DESC")
+	Do ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass2 ORDER BY Property1 DESC")	
+	Do ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass3")	
+	Do ExecSelectQuery^zStressTest("SELECT TOP 50000 ID from zStressTest.PopClass1")	
 
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job MergeData^zStressTest(3)
+	Do MergeData^zStressTest(3)
 	
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass1 Set Property1 = 'ABC'")
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ExecQuery^zStressTest("UPDATE zStressTest.PopClass1 Set Property1 = 'ABC'")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job ReadGlobals^zStressTest(..Namespace,"^A")
+	Do ReadGlobals^zStressTest($$$NSpace,"^A")
 	
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass2 Set Property1 = 'ABC'")
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'ABC'")
+	Do ExecQuery^zStressTest("UPDATE zStressTest.PopClass2 Set Property1 = 'ABC'")
+	Do ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'ABC'")
 	
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'DEF'")
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'DEF'")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job PopulateData^zStressTest(1,150000)
-	Job PopulateData^zStressTest(2,150000)
-	Job PopulateData^zStressTest(3,150000)
+	Do PopulateData^zStressTest(1,150000)
+	Do PopulateData^zStressTest(2,150000)
+	Do PopulateData^zStressTest(3,150000)
 	
-	Job MergeData^zStressTest(1)
+	Do MergeData^zStressTest(1)
 	
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job PopulateData^zStressTest(1,150000)
-	Job PopulateData^zStressTest(2,150000)
-	Job PopulateData^zStressTest(3,150000)
+	Do PopulateData^zStressTest(1,150000)
+	Do PopulateData^zStressTest(2,150000)
+	Do PopulateData^zStressTest(3,150000)
 	
-	for Counter = 1 : 1 : 3 Job ExecSelectQuery^zStressTest("SELECT TOP 300000 ID from zStressTest.PopClass"_Counter_" ORDER BY Property2 DESC")
+	for Counter = 1 : 1 : 3 Do ExecSelectQuery^zStressTest("SELECT TOP 300000 ID from zStressTest.PopClass"_Counter_" ORDER BY Property2 DESC")
 	
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	Do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 	
-	Job MergeData^zStressTest(2)
+	Do MergeData^zStressTest(2)
 	
-	Job PopulateData^zStressTest(1,150000)
-	Job PopulateData^zStressTest(2,150000)
-	Job PopulateData^zStressTest(3,150000)
+	Do PopulateData^zStressTest(1,150000)
+	Do PopulateData^zStressTest(2,150000)
+	Do PopulateData^zStressTest(3,150000)
 
-	Job MergeData^zStressTest(1)
-	Job MergeData^zStressTest(3)
+	Do MergeData^zStressTest(1)
+	Do MergeData^zStressTest(3)
 
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass2 Set Property1 = 'ABC'")
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property1 = 'ABC'")
-	Job ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'DEF'")
+	Do ExecQuery^zStressTest("UPDATE zStressTest.PopClass2 Set Property1 = 'ABC'")
+	do ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property1 = 'ABC'")
+	do ExecQuery^zStressTest("UPDATE zStressTest.PopClass3 Set Property2 = 'DEF'")
 
-	Job MergeData^zStressTest(1)
-	Job MergeData^zStressTest(3)
+	do MergeData^zStressTest(1)
+	do MergeData^zStressTest(3)
 	
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	do ReadGlobals^zStressTest($$$NSpace,"^zStress")
 
-	Job ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	do ReadGlobals^zStressTest($$$NSpace,"^zStress")
+	
+	set ^zStressTest.Info(Id,"Finished")=##class(TECH.DateTime).CurrentTimeStamp()
 ]]></Implementation>
 </Method>