Skip to content
Snippets Groups Projects
Commit b86c68bb authored by Simon Eismann's avatar Simon Eismann
Browse files

Merge branch 'master' into ispass03

parents 394f089d 17859ca1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 144 deletions
SPECjEnterprise2010/specjent2010.dql
+ 1
− 1
View file @ b86c68bb
......@@ -28,4 +28,4 @@ RESOURCE '_8qw3MGwPEeWCYNLM2TRs5A' AS itembrowser,
RESOURCE '_9T-zUGwPEeWJhvNbj7xb_w' AS order,
RESOURCE '_9wLAEGwPEeW0tqW9Tyn6MA' AS web,
RESOURCE '_iFuuwGwOEeWxPr4eA8ksEw' AS db
USING dml@'/specj/specjent2010/specjent2010.properties';
\ No newline at end of file
USING dml@'specjent2010.properties';
\ No newline at end of file
SPECjEnterprise2010/specjent2010.properties 0 → 100644
+ 4
− 0
View file @ b86c68bb
## Model Instance
dml.files.usageprofile=specjent2010.usageprofile
dml.files.deployment=specjent2010.deployment
dml.outputdirectory=results
\ No newline at end of file
SPECjEnterprise2010/specjent2010.repository
+ 106
− 106
View file @ b86c68bb
This diff is collapsed.
SPECjEnterprise2010/specjent2010.resourcelandscape
+ 14
− 14
View file @ b86c68bb
......@@ -3,71 +3,71 @@
<consistsOf id="_iFrEYGwOEeWxPr4eA8ksEw" name="default">
<computeNodes id="_iFs5kGwOEeWxPr4eA8ksEw" name="specj-database-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_iFuuwGwOEeWxPr4eA8ksEw" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_iFvV0GwOEeWxPr4eA8ksEw" name="cpu" number="2"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_bOE1YH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_eg54EH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_7svvwWwPEeWXT6fe2tN28g" name="specj-mfgsupplier-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7tOQ4GwPEeWXT6fe2tN28g" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_7tPfAGwPEeWXT6fe2tN28g" name="cpu" number="2"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_iEQDAH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_jj8UIH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_8qNdkWwPEeWCYNLM2TRs5A" name="specj-itembrowser-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8qw3MGwPEeWCYNLM2TRs5A" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_8qzTcGwPEeWCYNLM2TRs5A" name="cpu" number="1"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_lCadQH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_mHDKEH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_8wLisWwPEeWNm_Ma13nxMA" name="specj-fulfillorder-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8w24IGwPEeWNm_Ma13nxMA" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_8w8XsGwPEeWNm_Ma13nxMA" name="cpu" number="1"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_noZBAH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_owJTQH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_9Tnm8GwPEeWJhvNbj7xb_w" name="specj-order-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9T-zUGwPEeWJhvNbj7xb_w" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_9UCdsGwPEeWJhvNbj7xb_w" name="cpu" number="1"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_uIhtMH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_vadPIH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_9c1NUWwPEeWH2qIjdveD6Q" name="specj-customer-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9dKkgGwPEeWH2qIjdveD6Q" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_9dLLkGwPEeWH2qIjdveD6Q" name="cpu" number="1"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_xbn1oH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_yoppcH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
<computeNodes id="_9vtGAWwPEeW0tqW9Tyn6MA" name="specj-web-1">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_9wLAEGwPEeW0tqW9Tyn6MA" name="cpu" schedulingPolicy="PROCESSOR_SHARING">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDvUwFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_9wOqcGwPEeW0tqW9Tyn6MA" name="cpu" number="1"/>
</configSpec>
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_04HKoH4gEeW6SfhJ5ch4Pg" name="delay">
<processingResourceType href="../../../common/defaultresourcetypes.resourcetype#_RDxxAFiDEeWAC-JU0rDUdg"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_2SO_QH4gEeW6SfhJ5ch4Pg" name="delay"/>
</configSpec>
</computeNodes>
......
_hello_world_example/DMLListEntitiesQuery.dql
+ 1
− 1
View file @ b86c68bb
LIST ENTITIES
USING dml@'DML Examples/_hello_world_example/minmodels.properties';
\ No newline at end of file
USING dml@'minmodels.properties';
\ No newline at end of file
_hello_world_example/DMLListMetrics.dql
+ 1
− 1
View file @ b86c68bb
LIST METRICS (RESOURCE '_I3tj4EnuEeOWVc_o6w1CBw' AS res1,
SERVICE '_A_DeMEmxEeOPLK3yYyEQWQ' AS svc1)
USING dml@'DML Examples/_hello_world_example/minmodels.properties';
\ No newline at end of file
USING dml@'minmodels.properties';
\ No newline at end of file
_hello_world_example/DMLSelectMetrics.dql
+ 1
− 1
View file @ b86c68bb
SELECT res1.utilization, svc1.avgResponseTime
FOR RESOURCE '_I3tj4EnuEeOWVc_o6w1CBw' AS res1,
SERVICE '_A_DeMEmxEeOPLK3yYyEQWQ' AS svc1
USING dml@'DML Examples/_hello_world_example/minmodels.properties';
\ No newline at end of file
USING dml@'minmodels.properties';
\ No newline at end of file
_hello_world_example/min.repository
+ 2
− 2
View file @ b86c68bb
......@@ -9,8 +9,8 @@
<fineGrainedBehavior describedSignature="_aeA_cEh-EeOdTtmYhYAY2w" interfaceProvidingRole="_fMTX4EicEeOUHduTkzq26A">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
<resourceDemand id="_a-wSROnUEeWJbNBbEh2EOw" characterization="EXPLICIT">
<resourceType xsi:type="resourcetype:ProcessingResourceType" href="min.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<resourceDemand id="_a-wSROnUEeWJbNBbEh2EOw" name="CPU" characterization="EXPLICIT">
<resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<explicitDescription>
<probFunction xsi:type="functions:ExponentialDistribution" rate="2.0"/>
</explicitDescription>
......
_hello_world_example/min.resourcelandscape
+ 6
− 6
View file @ b86c68bb
......@@ -3,20 +3,20 @@
<consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
<computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="CPU">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="processingCPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
<processingResourceType href="min.resourcetype#_wb33sEibEeOUHduTkzq26A"/>
<nrOfParProcUnits id="_Jd8dcEnuEeOWVc_o6w1CBw" name="numberofcores" number="1"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="1"/>
</configSpec>
</computeNodes>
<computeNodes id="_EuLk4ObvEeWHMYaSILpfIaw" name="HDD">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_daxLACRlEeS6t8oIpPE2Zg" name="processingHDD" schedulingPolicy="FCFS">
<processingResourceType href="min.resourcetype#_KmZtECRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="_jRyBsCRlEeS6t8oIpPE2Zg" name="multiplicity" number="1"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_V1kjMAJEEeaYI8Ji-SVFxg" name="multiplicity" number="1"/>
</configSpec>
</computeNodes>
<computeNodes id="_EuLk4ObvEeWHMYaSILpfvIw" name="DELAY">
<configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_rbWJ0CRlEeS6t8oIpPE2Zg" name="delayResource">
<processingResourceType href="min.resourcetype#_2AqisCRlEeS6t8oIpPE2Zg"/>
<nrOfParProcUnits id="_8hMQcCRlEeS6t8oIpPE2Zg" name="multiplicity" number="1"/>
<processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="_XJaJoAJEEeaYI8Ji-SVFxg" name="multiplicity" number="1"/>
</configSpec>
</computeNodes>
</consistsOf>
......
_hello_world_example/min.resourcetype deleted 100644 → 0
+ 0
− 6
View file @ 394f089d
<?xml version="1.0" encoding="UTF-8"?>
<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_wb33sEibEeOUHduTkzq26A" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_KmZtECRlEeS6t8oIpPE2Zg" name="HDD"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_2AqisCRlEeS6t8oIpPE2Zg" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
_hello_world_example/minmodels.properties
+ 6
− 6
View file @ b86c68bb
## Model Instance
dml.files.usageprofile=DML Examples/_hello_world_example/min.usageprofile
dml.files.system=DML Examples/_hello_world_example/min.system
dml.files.resourcelandscape=DML Examples/_hello_world_example/min.resourcelandscape
dml.files.repository=DML Examples/_hello_world_example/min.repository
dml.files.deployment=DML Examples/_hello_world_example/min.deployment
#dml.outputdirectory=DML Examples/_hello_world_example/results/
dml.files.usageprofile=min.usageprofile
dml.files.system=min.system
dml.files.resourcelandscape=min.resourcelandscape
dml.files.repository=min.repository
dml.files.deployment=min.deployment
#dml.outputdirectory=/results/
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment