From 1bac1dce0c143ddfed383b02a231d70ee5894f3d Mon Sep 17 00:00:00 2001 From: Simon <simon.eismann@uni-wuerzburg.de> Date: Thu, 30 Nov 2017 12:34:52 +0100 Subject: [PATCH] Fixed Utilization calculation for SimQPN --- .../DML-Model/default.resourcelandscape | 46 +++++++++---------- .../DQL-Queries/BoundsAnalysisComparison.dql | 2 +- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dml-examples/MediaStore/DML-Model/default.resourcelandscape b/dml-examples/MediaStore/DML-Model/default.resourcelandscape index 1162ef2..fd25103 100644 --- a/dml-examples/MediaStore/DML-Model/default.resourcelandscape +++ b/dml-examples/MediaStore/DML-Model/default.resourcelandscape @@ -1,25 +1,21 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc"> - <consistsOf id="_f_3EQCCoEeWxOb4Q3eQjzQ" name="defaultDC"> - <computeNodes id="_ibdkACCoEeWxOb4Q3eQjzQ" name="AppServer"> - <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_tjH08SCoEeWxOb4Q3eQjzQ" name="HDD" schedulingPolicy="PROCESSOR_SHARING" processingRate="2.4E7"> - <processingResourceType href="default.resourcetype#_PSb_sA1XEeWT-KaY0W1Acw"/> - <nrOfParProcUnits id="_AOBN0CCpEeWxOb4Q3eQjzQ" name="HDD" number="1"/> - </configSpec> - <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_BoF_ISCpEeWxOb4Q3eQjzQ" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> - <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/> - <nrOfParProcUnits id="_Mxk1ACCpEeWxOb4Q3eQjzQ" name="CPU" number="1"/> - </configSpec> - </computeNodes> - <computeNodes id="_TUvnECCpEeWxOb4Q3eQjzQ" name="DBServer"> - <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_VG2d4SCpEeWxOb4Q3eQjzQ" name="HDD" schedulingPolicy="PROCESSOR_SHARING" processingRate="2.4E7"> - <processingResourceType href="default.resourcetype#_PSb_sA1XEeWT-KaY0W1Acw"/> - <nrOfParProcUnits id="_aFxO8CCpEeWxOb4Q3eQjzQ" name="HDD" number="1"/> - </configSpec> - <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_be1ToSCpEeWxOb4Q3eQjzQ" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> - <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/> - <nrOfParProcUnits id="_hySOsCCpEeWxOb4Q3eQjzQ" name="CPU" number="1"/> - </configSpec> - </computeNodes> - </consistsOf> -</resourcelandscape:DistributedDataCenter> +<?xml version="1.0" encoding="UTF-8"?> +<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc"> + <consistsOf id="_f_3EQCCoEeWxOb4Q3eQjzQ" name="defaultDC"> + <computeNodes id="_ibdkACCoEeWxOb4Q3eQjzQ" name="AppServer"> + <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_BoF_ISCpEeWxOb4Q3eQjzQ" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> + <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/> + <nrOfParProcUnits id="_Mxk1ACCpEeWxOb4Q3eQjzQ" name="CPU" number="1"/> + </configSpec> + </computeNodes> + <computeNodes id="_TUvnECCpEeWxOb4Q3eQjzQ" name="DBServer"> + <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_VG2d4SCpEeWxOb4Q3eQjzQ" name="HDD" schedulingPolicy="PROCESSOR_SHARING" processingRate="2.4E7"> + <processingResourceType href="default.resourcetype#_PSb_sA1XEeWT-KaY0W1Acw"/> + <nrOfParProcUnits id="_aFxO8CCpEeWxOb4Q3eQjzQ" name="HDD" number="1"/> + </configSpec> + <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_be1ToSCpEeWxOb4Q3eQjzQ" name="CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> + <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/> + <nrOfParProcUnits id="_hySOsCCpEeWxOb4Q3eQjzQ" name="CPU" number="1"/> + </configSpec> + </computeNodes> + </consistsOf> +</resourcelandscape:DistributedDataCenter> diff --git a/dml-examples/MediaStore/DQL-Queries/BoundsAnalysisComparison.dql b/dml-examples/MediaStore/DQL-Queries/BoundsAnalysisComparison.dql index afd8c1b..7eee9c2 100644 --- a/dml-examples/MediaStore/DQL-Queries/BoundsAnalysisComparison.dql +++ b/dml-examples/MediaStore/DQL-Queries/BoundsAnalysisComparison.dql @@ -1,4 +1,4 @@ -SELECT defaultUsageScenario.avgResponseTime, defaultUsageScenario.throughput +SELECT defaultUsageScenario.avgResponseTime, defaultUsageScenario.throughput, DBServer_CPU.utilization, AppServer_CPU.utilization, DBServer_HDD.utilization FOR SERVICE '_gxHCUA3hEeWKC634F1E2dQ' AS defaultUsageScenario, SERVICE 'DownloadSCA_id' AS DownloadSCA, SERVICE 'UploadSCA_ID' AS UploadSCA, -- GitLab