Ny version av lilom.jar med stöd för att mäta OS Busy, OS Load och OS

Load per cpu. Ökad precision på mätningarna till flyttal.

@@ -61,8 +61,11 @@ public class Actions
 		    {
 			    String instance = oracle.getDBName();
 			    sendDataPoint("ORA Cpus (#) " + instance, oracle.getNumberOfCPUs());
-			    sendDataPoint("ORA Cpu Time (ms/s) " + instance, oracle.getCPUTimePerSecond());
+			    sendDataPoint("ORA Cpu Time (us/s) " + instance, oracle.getCPUTimePerSecond());
 			    sendDataPoint("ORA Cpu Usage (%) " + instance, oracle.getCPUPercent());
+			    sendDataPoint("ORA OS Busy (%) " + instance, oracle.getOsBusyPercent());
+			    sendDataPoint("ORA OS Load (#) " + instance, oracle.getOsLoad());
+			    sendDataPoint("ORA OS Load per Cpu (#) " + instance, oracle.getOsLoadPerCPU());
 			    sendDataPoint("ORA Logical Reads (#/s) " + instance, oracle.getLogicalReadsPerSecond());
 			    sendDataPoint("ORA Consistent Gets (#/s) " + instance, oracle.getPerSecondValue("consistent gets"));
 			    sendDataPoint("ORA DB Block Gets (#/s) " + instance, oracle.getPerSecondValue("db block gets"));

-[General]
-Type=General-Java
-RecordedProtocol=
-DefaultCfg=default.cfg
-AppName=
-BuildTarget=
-ParamRightBrace=>
-ParamLeftBrace=<
-NewFunctionHeader=1
-LastActiveAction=Actions
-CorrInfoReportDir=
-LastResultDir=
-DevelopTool=Vugen
-ActionLogicExt=action_logic
-MajorVersion=12
-MinorVersion=50
-ParameterFile=
-GlobalParameterFile=
-RunType=Java-Interpreter
-LastModifyVer=12.50.0.0
-AdditionalTypes=General-Java
-GenerateTypes=
-ActiveTypes=
-ScriptLanguage=JAVA
-DisableRegenerate=0
-Description=
-[TransactionsOrder]
-Order=
-[Actions]
-vuser_init=vuser_init.java
-Actions=Actions.java
-vuser_end=vuser_end.java
-[ProtocolsVersion]
-General-Java=11.0.0.0
-[RunLogicFiles]
-Default Profile=default.usp
-[StateManagement]
-1=1
-4=0
-9=0
-10=0
-11=0
-12=0
-17=0
-18=0
-20=0
-21=0
-CurrentState=1
-VuserStateHistory=0 65536 65552
-LastReplayStatus=2
-[ActiveReplay]
-LastReplayedRunName=result1
-ActiveRunName=result1
-[Recorded Actions]
-vuser_init=0
-Actions=0
-vuser_end=0
-[Replayed Actions]
-vuser_init=1
-Actions=1
-vuser_end=1
-[Modified Actions]
-vuser_init=0
-Actions=1
-vuser_end=0
-[ManuallyExtraFiles]
-lilom.jar=
-ojdbc6.jar=
-[Interpreters]
-vuser_init=Java-Interpreter
-Actions=Java-Interpreter
-vuser_end=Java-Interpreter
+[General]
+Type=General-Java
+RecordedProtocol=
+DefaultCfg=default.cfg
+AppName=
+BuildTarget=
+ParamRightBrace=>
+ParamLeftBrace=<
+NewFunctionHeader=1
+LastActiveAction=Actions
+CorrInfoReportDir=
+LastResultDir=
+DevelopTool=Vugen
+ActionLogicExt=action_logic
+MajorVersion=12
+MinorVersion=50
+ParameterFile=
+GlobalParameterFile=
+RunType=Java-Interpreter
+LastModifyVer=12.50.0.0
+AdditionalTypes=General-Java
+GenerateTypes=
+ActiveTypes=
+ScriptLanguage=JAVA
+DisableRegenerate=0
+Description=
+[TransactionsOrder]
+Order=
+[Actions]
+vuser_init=vuser_init.java
+Actions=Actions.java
+vuser_end=vuser_end.java
+[ProtocolsVersion]
+General-Java=11.0.0.0
+[RunLogicFiles]
+Default Profile=default.usp
+[StateManagement]
+1=1
+4=0
+9=0
+10=0
+11=0
+12=0
+17=0
+18=0
+20=0
+21=0
+CurrentState=1
+VuserStateHistory=0 65536 65552
+LastReplayStatus=2
+[ActiveReplay]
+LastReplayedRunName=
+ActiveRunName=
+[Recorded Actions]
+vuser_init=0
+Actions=0
+vuser_end=0
+[Replayed Actions]
+vuser_init=1
+Actions=1
+vuser_end=1
+[Modified Actions]
+vuser_init=0
+Actions=1
+vuser_end=0
+[ManuallyExtraFiles]
+lilom.jar=
+ojdbc6.jar=
+[Interpreters]
+vuser_init=Java-Interpreter
+Actions=Java-Interpreter
+vuser_end=Java-Interpreter

-[RunLogicEndRoot:vuser_end]
-MercIniTreeSectionName="vuser_end"
-RunLogicObjectKind="Action"
-Name="vuser_end"
-RunLogicInterpreterType="Java-Interpreter"
-MercIniTreeFather="RunLogicEndRoot"
-RunLogicActionType="VuserEnd"
-[RunLogicInitRoot:vuser_init]
-MercIniTreeSectionName="vuser_init"
-RunLogicObjectKind="Action"
-Name="vuser_init"
-RunLogicInterpreterType="Java-Interpreter"
-MercIniTreeFather="RunLogicInitRoot"
-RunLogicActionType="VuserInit"
-[RunLogicRunRoot:Actions]
-MercIniTreeSectionName="Actions"
-RunLogicObjectKind="Action"
-Name="Actions"
-RunLogicInterpreterType="Java-Interpreter"
-MercIniTreeFather="RunLogicRunRoot"
-RunLogicActionType="VuserRun"
-[Profile Actions]
-Profile Actions name=vuser_init,Actions,vuser_end
-MercIniTreeSectionName="Profile Actions"
-MercIniTreeFather=""
-[RunLogicRunRoot]
-RunLogicPaceConstTime="60,000"
-RunLogicRandomPaceMax="90,000"
-RunLogicActionOrder="Actions"
-RunLogicAfterPaceMax="90,000"
-MercIniTreeFather=""
-RunLogicPaceType="ConstAfter"
-MercIniTreeSons="Actions"
-RunLogicNumOfIterations="2"
-Name="Run"
-RunLogicAfterPaceMin="60,000"
-RunLogicRunMode="Sequential"
-RunLogicPaceConstAfterTime="15,000"
-RunLogicObjectKind="Group"
-RunLogicActionType="VuserRun"
-RunLogicRandomPaceMin="60,000"
-MercIniTreeSectionName="RunLogicRunRoot"
-[RunLogicEndRoot]
-RunLogicActionOrder="vuser_end"
-MercIniTreeFather=""
-MercIniTreeSons="vuser_end"
-RunLogicNumOfIterations="1"
-Name="End"
-RunLogicRunMode="Sequential"
-RunLogicObjectKind="Group"
-RunLogicActionType="VuserEnd"
-MercIniTreeSectionName="RunLogicEndRoot"
-[RunLogicInitRoot]
-RunLogicActionOrder="vuser_init"
-MercIniTreeFather=""
-MercIniTreeSons="vuser_init"
-RunLogicNumOfIterations="1"
-Name="Init"
-RunLogicRunMode="Sequential"
-RunLogicObjectKind="Group"
-RunLogicActionType="VuserInit"
-MercIniTreeSectionName="RunLogicInitRoot"
+[RunLogicEndRoot:vuser_end]
+MercIniTreeSectionName="vuser_end"
+RunLogicObjectKind="Action"
+Name="vuser_end"
+RunLogicActionType="VuserEnd"
+MercIniTreeFather="RunLogicEndRoot"
+RunLogicInterpreterType="Java-Interpreter"
+[RunLogicInitRoot:vuser_init]
+MercIniTreeSectionName="vuser_init"
+RunLogicObjectKind="Action"
+Name="vuser_init"
+RunLogicActionType="VuserInit"
+MercIniTreeFather="RunLogicInitRoot"
+RunLogicInterpreterType="Java-Interpreter"
+[RunLogicRunRoot:Actions]
+MercIniTreeSectionName="Actions"
+RunLogicObjectKind="Action"
+Name="Actions"
+RunLogicActionType="VuserRun"
+MercIniTreeFather="RunLogicRunRoot"
+RunLogicInterpreterType="Java-Interpreter"
+[Profile Actions]
+MercIniTreeSectionName="Profile Actions"
+Profile Actions name=vuser_init,Actions,vuser_end
+MercIniTreeFather=""
+[RunLogicRunRoot]
+RunLogicPaceConstTime="60,000"
+RunLogicRandomPaceMax="90,000"
+RunLogicActionOrder="Actions"
+RunLogicAfterPaceMax="90,000"
+MercIniTreeFather=""
+RunLogicPaceType="ConstAfter"
+MercIniTreeSons="Actions"
+RunLogicNumOfIterations="2"
+RunLogicAfterPaceMin="60,000"
+Name="Run"
+RunLogicPaceConstAfterTime="15,000"
+RunLogicRunMode="Sequential"
+RunLogicObjectKind="Group"
+RunLogicActionType="VuserRun"
+RunLogicRandomPaceMin="60,000"
+MercIniTreeSectionName="RunLogicRunRoot"
+[RunLogicEndRoot]
+RunLogicActionOrder="vuser_end"
+MercIniTreeFather=""
+MercIniTreeSons="vuser_end"
+RunLogicNumOfIterations="1"
+Name="End"
+RunLogicRunMode="Sequential"
+RunLogicObjectKind="Group"
+RunLogicActionType="VuserEnd"
+MercIniTreeSectionName="RunLogicEndRoot"
+[RunLogicInitRoot]
+RunLogicActionOrder="vuser_init"
+MercIniTreeFather=""
+MercIniTreeSons="vuser_init"
+RunLogicNumOfIterations="1"
+Name="Init"
+RunLogicRunMode="Sequential"
+RunLogicObjectKind="Group"
+RunLogicActionType="VuserInit"
+MercIniTreeSectionName="RunLogicInitRoot"