Skip to content

Commit f2fc66c

Browse files
d-leroyd-leroy
committed
Updated benchmark infrastructure, added domain-specific code building generic traces & various minor fixes
1 parent bd36152 commit f2fc66c

File tree

247 files changed

+109174
-1557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+109174
-1557
lines changed

‎java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/debug/OmniscientGenericSequentialModelDebugger.xtend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public class OmniscientGenericSequentialModelDebugger extends GenericSequentialM
278278
if (executedModelRoot != null) {
279279
try {
280280
if(!callerStack.empty){
281-
updateData(threadName, callerStack.findFirst[true])
281+
updateData(threadName, callerStack.findFirst[true])
282282
} else {
283283

284284
}

‎java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/PlainK3DebugModelPresentation.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.eclipse.emf.common.notify.Adapter;
1414
import org.eclipse.jface.resource.ImageDescriptor;
1515
import org.eclipse.swt.graphics.Image;
16+
import org.eclipse.swt.widgets.Display;
1617
import org.gemoc.execution.sequential.javaengine.ui.Activator;
1718

1819
import fr.obeo.dsl.debug.DebugTarget;
@@ -42,11 +43,18 @@ public String getText(Object element) {
4243
return super.getText(element);
4344
}
4445

46+
private Image image;
47+
4548
@Override
4649
public Image getImage(Object element) {
4750
if (element instanceof DSLDebugTargetAdapter || element instanceof DSLThreadAdapter) {
48-
ImageDescriptor id = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/debugt_obj.png");
49-
return id.createImage();
51+
ImageDescriptor descriptor = Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/debugt_obj.png");
52+
Image cachedImage = imagesCache.get(descriptor);
53+
if (cachedImage == null) {
54+
cachedImage = new Image(Display.getDefault(), descriptor.getImageData());
55+
imagesCache.put(descriptor, cachedImage);
56+
}
57+
return image;
5058
}
5159
return super.getImage(element);
5260
}

‎java_execution/java_engine/plugins/org.gemoc.execution.sequential.javaengine.ui/src/org/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ private void updateMainElementName(){
589589
if(mainElement != null){
590590
org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider nameprovider = new DefaultDeclarativeQualifiedNameProvider();
591591
QualifiedName qname = nameprovider.getFullyQualifiedName(mainElement);
592-
String objectName = qname != null ? qname.toString(): mainElement.toString();
592+
String objectName = qname != null ? qname.toString(): mainElement.toString();
593593
String prettyName = objectName+ " : "+mainElement.eClass().getName();
594594
_entryPointModelElementLabel.setText(prettyName);
595595
}

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTrace.ecore‎

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/GenericTraceImpl.ecore‎

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,93 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="generictrace" nsURI="http://www.gemoc.org/generic_trace_impl" nsPrefix="generictrace">
2+
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="generictrace" nsURI="http://www.gemoc.org/generic_trace_impl"
4+
nsPrefix="generictrace">
35
<eClassifiers xsi:type="ecore:EDataType" name="ISerializable" instanceClassName="byte[]"/>
46
<eClassifiers xsi:type="ecore:EClass" name="GenericSequentialStep">
5-
<eGenericSuperTypes eClassifier="//GenericStep"/>
6-
<eGenericSuperTypes>
7-
<eTypeArguments eClassifier="//GenericStep"/>
8-
<eTypeArguments eClassifier="//GenericState"/>
9-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//SequentialStep"/>
7+
<eGenericSuperTypes eClassifier="#//GenericStep"/>
8+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//SequentialStep">
9+
<eTypeArguments eClassifier="#//GenericStep"/>
10+
<eTypeArguments eClassifier="#//GenericState"/>
1011
</eGenericSuperTypes>
1112
</eClassifiers>
12-
<eClassifiers xsi:type="ecore:EClass" name="GenericParallelStep" eSuperTypes="//GenericStep"/>
13-
<eClassifiers xsi:type="ecore:EClass" name="GenericSmallStep" eSuperTypes="//GenericStep"/>
14-
<eClassifiers xsi:type="ecore:EClass" name="GenericReferenceValue" abstract="true" eSuperTypes="//GenericValue"/>
13+
<eClassifiers xsi:type="ecore:EClass" name="GenericParallelStep" eSuperTypes="#//GenericStep"/>
14+
<eClassifiers xsi:type="ecore:EClass" name="GenericSmallStep" eSuperTypes="#//GenericStep"/>
15+
<eClassifiers xsi:type="ecore:EClass" name="GenericReferenceValue" abstract="true"
16+
eSuperTypes="#//GenericValue"/>
1517
<eClassifiers xsi:type="ecore:EClass" name="GenericDimension">
16-
<eStructuralFeatures xsi:type="ecore:EReference" name="dynamicProperty">
17-
<eType xsi:type="ecore:EClass" href="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
18-
</eStructuralFeatures>
19-
<eGenericSuperTypes>
20-
<eTypeArguments eClassifier="//GenericValue"/>
21-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//Dimension"/>
18+
<eStructuralFeatures xsi:type="ecore:EReference" name="dynamicProperty" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
19+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//Dimension">
20+
<eTypeArguments eClassifier="#//GenericValue"/>
2221
</eGenericSuperTypes>
2322
</eClassifiers>
2423
<eClassifiers xsi:type="ecore:EClass" name="GenericTracedObject">
25-
<eOperations name="getDimensionsInternal" upperBound="-1" eType="//GenericDimension">
24+
<eOperations name="getDimensionsInternal" upperBound="-1" eType="#//GenericDimension">
2625
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
2726
<details key="body" value="final EList&lt;GenericDimension> result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;GenericDimension>(Object.class);&#xA;result.addAll(super.getDimensionsInternal());&#xA;result.addAll(getAllDimensions());&#xA;return result;&#xA;"/>
2827
</eAnnotations>
2928
</eOperations>
30-
<eStructuralFeatures xsi:type="ecore:EReference" name="originalObject">
31-
<eType xsi:type="ecore:EClass" href="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
32-
</eStructuralFeatures>
33-
<eStructuralFeatures xsi:type="ecore:EReference" name="allDimensions" upperBound="-1" eType="//GenericDimension" containment="true"/>
34-
<eGenericSuperTypes>
35-
<eTypeArguments eClassifier="//GenericDimension"/>
36-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//TracedObject"/>
29+
<eStructuralFeatures xsi:type="ecore:EReference" name="originalObject" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
30+
<eStructuralFeatures xsi:type="ecore:EReference" name="allDimensions" upperBound="-1"
31+
eType="#//GenericDimension" containment="true"/>
32+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//TracedObject">
33+
<eTypeArguments eClassifier="#//GenericDimension"/>
3734
</eGenericSuperTypes>
3835
</eClassifiers>
3936
<eClassifiers xsi:type="ecore:EClass" name="GenericState">
40-
<eGenericSuperTypes>
41-
<eTypeArguments eClassifier="//GenericStep"/>
42-
<eTypeArguments eClassifier="//GenericValue"/>
43-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//State"/>
37+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//State">
38+
<eTypeArguments eClassifier="#//GenericStep"/>
39+
<eTypeArguments eClassifier="#//GenericValue"/>
4440
</eGenericSuperTypes>
4541
</eClassifiers>
4642
<eClassifiers xsi:type="ecore:EClass" name="GenericTrace">
4743
<eTypeParameters name="StepSubType">
48-
<eBounds eClassifier="//GenericStep"/>
44+
<eBounds eClassifier="#//GenericStep"/>
4945
</eTypeParameters>
50-
<eGenericSuperTypes>
51-
<eTypeArguments eTypeParameter="//GenericTrace/StepSubType"/>
52-
<eTypeArguments eClassifier="//GenericTracedObject"/>
53-
<eTypeArguments eClassifier="//GenericState"/>
54-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//Trace"/>
46+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//Trace">
47+
<eTypeArguments eTypeParameter="#//GenericTrace/StepSubType"/>
48+
<eTypeArguments eClassifier="#//GenericTracedObject"/>
49+
<eTypeArguments eClassifier="#//GenericState"/>
5550
</eGenericSuperTypes>
5651
</eClassifiers>
57-
<eClassifiers xsi:type="ecore:EClass" name="GenericAttributeValue" abstract="true" eSuperTypes="//GenericValue"/>
58-
<eClassifiers xsi:type="ecore:EClass" name="BooleanAttributeValue" eSuperTypes="//GenericAttributeValue">
59-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" defaultValueLiteral="false">
60-
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
61-
</eStructuralFeatures>
52+
<eClassifiers xsi:type="ecore:EClass" name="GenericAttributeValue" abstract="true"
53+
eSuperTypes="#//GenericValue"/>
54+
<eClassifiers xsi:type="ecore:EClass" name="BooleanAttributeValue" eSuperTypes="#//GenericAttributeValue">
55+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
56+
defaultValueLiteral="false"/>
6257
</eClassifiers>
63-
<eClassifiers xsi:type="ecore:EClass" name="IntegerAttributeValue" eSuperTypes="//GenericAttributeValue">
64-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue">
65-
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
66-
</eStructuralFeatures>
58+
<eClassifiers xsi:type="ecore:EClass" name="IntegerAttributeValue" eSuperTypes="#//GenericAttributeValue">
59+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
6760
</eClassifiers>
68-
<eClassifiers xsi:type="ecore:EClass" name="StringAttributeValue" eSuperTypes="//GenericAttributeValue">
69-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue">
70-
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
71-
</eStructuralFeatures>
61+
<eClassifiers xsi:type="ecore:EClass" name="StringAttributeValue" eSuperTypes="#//GenericAttributeValue">
62+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
63+
</eClassifiers>
64+
<eClassifiers xsi:type="ecore:EClass" name="ManyBooleanAttributeValue" eSuperTypes="#//GenericAttributeValue">
65+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" upperBound="-1"
66+
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
67+
</eClassifiers>
68+
<eClassifiers xsi:type="ecore:EClass" name="ManyIntegerAttributeValue" eSuperTypes="#//GenericAttributeValue">
69+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" upperBound="-1"
70+
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
71+
</eClassifiers>
72+
<eClassifiers xsi:type="ecore:EClass" name="ManyStringAttributeValue" eSuperTypes="#//GenericAttributeValue">
73+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" upperBound="-1"
74+
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
7275
</eClassifiers>
7376
<eClassifiers xsi:type="ecore:EClass" name="GenericStep" abstract="true">
74-
<eGenericSuperTypes>
75-
<eTypeArguments eClassifier="//GenericState"/>
76-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//Step"/>
77+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//Step">
78+
<eTypeArguments eClassifier="#//GenericState"/>
7779
</eGenericSuperTypes>
7880
</eClassifiers>
7981
<eClassifiers xsi:type="ecore:EClass" name="GenericValue" abstract="true">
80-
<eGenericSuperTypes>
81-
<eTypeArguments eClassifier="//GenericState"/>
82-
<eClassifier xsi:type="ecore:EClass" href="GenericTrace.ecore#//Value"/>
82+
<eGenericSuperTypes eClassifier="ecore:EClass GenericTrace.ecore#//Value">
83+
<eTypeArguments eClassifier="#//GenericState"/>
8384
</eGenericSuperTypes>
8485
</eClassifiers>
85-
<eClassifiers xsi:type="ecore:EClass" name="SingleReferenceValue" eSuperTypes="//GenericReferenceValue">
86-
<eStructuralFeatures xsi:type="ecore:EReference" name="referenceValue">
87-
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
88-
</eStructuralFeatures>
86+
<eClassifiers xsi:type="ecore:EClass" name="SingleReferenceValue" eSuperTypes="#//GenericReferenceValue">
87+
<eStructuralFeatures xsi:type="ecore:EReference" name="referenceValue" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
8988
</eClassifiers>
90-
<eClassifiers xsi:type="ecore:EClass" name="ManyReferenceValue" eSuperTypes="//GenericReferenceValue">
91-
<eStructuralFeatures xsi:type="ecore:EReference" name="referenceValues" upperBound="-1">
92-
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
93-
</eStructuralFeatures>
89+
<eClassifiers xsi:type="ecore:EClass" name="ManyReferenceValue" eSuperTypes="#//GenericReferenceValue">
90+
<eStructuralFeatures xsi:type="ecore:EReference" name="referenceValues" upperBound="-1"
91+
eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
9492
</eClassifiers>
9593
</ecore:EPackage>

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/model/LaunchConfiguration.ecore‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="launchconfiguration" nsURI="http://www.gemoc.org/launch_configuration" nsPrefix="launchconfiguration">
2+
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="launchconfiguration" nsURI="http://www.gemoc.org/launch_configuration"
4+
nsPrefix="launchconfiguration">
35
<eClassifiers xsi:type="ecore:EDataType" name="ISerializable" instanceClassName="byte[]"/>
46
<eClassifiers xsi:type="ecore:EClass" name="LaunchConfiguration">
5-
<eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" eType="//LaunchConfigurationParameter" containment="true"/>
6-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1">
7-
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
8-
</eStructuralFeatures>
7+
<eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
8+
eType="#//LaunchConfigurationParameter" containment="true"/>
9+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
910
</eClassifiers>
1011
<eClassifiers xsi:type="ecore:EClass" name="LaunchConfigurationParameter" abstract="true">
11-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" defaultValueLiteral="">
12-
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
13-
</eStructuralFeatures>
12+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
13+
defaultValueLiteral=""/>
1414
</eClassifiers>
15-
<eClassifiers xsi:type="ecore:EClass" name="LanguageNameParameter" eSuperTypes="//LaunchConfigurationParameter"/>
16-
<eClassifiers xsi:type="ecore:EClass" name="AddonExtensionParameter" eSuperTypes="//LaunchConfigurationParameter"/>
17-
<eClassifiers xsi:type="ecore:EClass" name="ModelURIParameter" eSuperTypes="//LaunchConfigurationParameter"/>
18-
<eClassifiers xsi:type="ecore:EClass" name="AnimatorURIParameter" eSuperTypes="//LaunchConfigurationParameter"/>
19-
<eClassifiers xsi:type="ecore:EClass" name="EntryPointParameter" eSuperTypes="//LaunchConfigurationParameter"/>
20-
<eClassifiers xsi:type="ecore:EClass" name="InitializationArgumentsParameter" eSuperTypes="//LaunchConfigurationParameter"/>
21-
<eClassifiers xsi:type="ecore:EClass" name="ModelRootParameter" eSuperTypes="//LaunchConfigurationParameter"/>
22-
<eClassifiers xsi:type="ecore:EClass" name="InitializationMethodParameter" eSuperTypes="//LaunchConfigurationParameter"/>
15+
<eClassifiers xsi:type="ecore:EClass" name="LanguageNameParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
16+
<eClassifiers xsi:type="ecore:EClass" name="AddonExtensionParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
17+
<eClassifiers xsi:type="ecore:EClass" name="ModelURIParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
18+
<eClassifiers xsi:type="ecore:EClass" name="AnimatorURIParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
19+
<eClassifiers xsi:type="ecore:EClass" name="EntryPointParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
20+
<eClassifiers xsi:type="ecore:EClass" name="InitializationArgumentsParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
21+
<eClassifiers xsi:type="ecore:EClass" name="ModelRootParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
22+
<eClassifiers xsi:type="ecore:EClass" name="InitializationMethodParameter" eSuperTypes="#//LaunchConfigurationParameter"/>
2323
</ecore:EPackage>

‎trace/commons/plugins/fr.inria.diverse.trace.commons.model/src/fr/inria/diverse/trace/commons/model/generictrace/GenerictraceFactory.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,33 @@ public interface GenerictraceFactory extends EFactory {
111111
*/
112112
StringAttributeValue createStringAttributeValue();
113113

114+
/**
115+
* Returns a new object of class '<em>Many Boolean Attribute Value</em>'.
116+
* <!-- begin-user-doc -->
117+
* <!-- end-user-doc -->
118+
* @return a new object of class '<em>Many Boolean Attribute Value</em>'.
119+
* @generated
120+
*/
121+
ManyBooleanAttributeValue createManyBooleanAttributeValue();
122+
123+
/**
124+
* Returns a new object of class '<em>Many Integer Attribute Value</em>'.
125+
* <!-- begin-user-doc -->
126+
* <!-- end-user-doc -->
127+
* @return a new object of class '<em>Many Integer Attribute Value</em>'.
128+
* @generated
129+
*/
130+
ManyIntegerAttributeValue createManyIntegerAttributeValue();
131+
132+
/**
133+
* Returns a new object of class '<em>Many String Attribute Value</em>'.
134+
* <!-- begin-user-doc -->
135+
* <!-- end-user-doc -->
136+
* @return a new object of class '<em>Many String Attribute Value</em>'.
137+
* @generated
138+
*/
139+
ManyStringAttributeValue createManyStringAttributeValue();
140+
114141
/**
115142
* Returns a new object of class '<em>Single Reference Value</em>'.
116143
* <!-- begin-user-doc -->

0 commit comments

Comments
 (0)