ctf: support int tags in variants

Add variant definition constructor for CTF2

Change-Id: I21f56a284c6fcee147d3714445ed30d81b706c1a
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/VariantDeclaration.java

@@ -14,8 +14,8 @@
 
 package org.eclipse.tracecompass.ctf.core.event.types;
 
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -44,7 +44,8 @@ public class VariantDeclaration extends Declaration {
 
     private String fTag = null;
     private static final long ALIGNMENT = 1;
-    private final Map<String, IDeclaration> fFields = Collections.synchronizedMap(new HashMap<String, IDeclaration>());
+    private final Map<String, IDeclaration> fFields = new HashMap<>();
+    private IDeclaration[] fFieldArray = new IDeclaration[0];
     private IDeclaration fDeclarationToPopulate;
 
     // ------------------------------------------------------------------------
@@ -122,16 +123,32 @@ public VariantDefinition createDefinition(IDefinitionScope definitionScope,
             String fieldName, BitBuffer input) throws CTFException {
         alignRead(input);
         IDefinition def = definitionScope.lookupDefinition(fTag);
-        EnumDefinition tagDef = (EnumDefinition) ((def instanceof EnumDefinition) ? def : null);
-        if (tagDef == null) {
-            throw new CTFException("Tag is not defined " + fTag); //$NON-NLS-1$
-        }
-        String varFieldName = tagDef.getStringValue();
-        if (varFieldName == null) {
-            throw new CTFException("Undefined enum selector for variant " + //$NON-NLS-1$
-                    definitionScope.getScopePath().getPath());
+        String varFieldName = fTag;
+        SimpleDatatypeDefinition tagDef = null;
+        if (def instanceof IntegerDefinition) {
+            tagDef = (SimpleDatatypeDefinition) def;
+            Long tagValue = ((IntegerDefinition) tagDef).getIntegerValue();
+            String mappings = ((IntegerDefinition) tagDef).getMappings();
+            if (mappings != null) {
+                fDeclarationToPopulate = fFields.get(mappings);
+            } else if (tagValue != null) {
+                if (tagValue < 0 || tagValue >= fFieldArray.length) {
+                    throw new CTFException("Unknown value of " + tagValue + " for the variant " + toString()); //$NON-NLS-1$ //$NON-NLS-2$
+                }
+                fDeclarationToPopulate = fFieldArray[(tagValue.intValue())];
+            }
+        } else {
+            tagDef = (EnumDefinition) ((def instanceof EnumDefinition) ? def : null);
+            if (tagDef == null) {
+                throw new CTFException("Tag is not defined " + fTag); //$NON-NLS-1$
+            }
+            varFieldName = tagDef.getStringValue();
+            if (varFieldName == null) {
+                throw new CTFException("Undefined enum selector for variant " + //$NON-NLS-1$
+                        definitionScope.getScopePath().getPath());
+            }
+            fDeclarationToPopulate = fFields.get(varFieldName);
         }
-        fDeclarationToPopulate = fFields.get(varFieldName);
         if (fDeclarationToPopulate == null) {
             throw new CTFException("Unknown enum selector for variant " + //$NON-NLS-1$
                     definitionScope.getScopePath().getPath());
@@ -150,6 +167,9 @@ public VariantDefinition createDefinition(IDefinitionScope definitionScope,
      */
     public void addField(String fieldTag, IDeclaration declaration) {
         fFields.put(fieldTag, declaration);
+        int size = fFields.size();
+        fFieldArray = Arrays.copyOf(fFieldArray, size);
+        fFieldArray[size - 1] = declaration;
     }
 
     @Override

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/event/types/VariantDefinition.java

@@ -36,12 +36,39 @@ public final class VariantDefinition extends ScopedDefinition {
     private final Definition fDefinition;
     private final String fCurrentField;
     private final String fFieldName;
-    private final EnumDefinition fTagDef;
+    private final SimpleDatatypeDefinition fTagDef;
 
     // ------------------------------------------------------------------------
     // Constructors
     // ------------------------------------------------------------------------
 
+    /**
+     * Constructor
+     *
+     * @param declaration
+     *            the parent declaration
+     * @param definitionScope
+     *            the parent scope
+     * @param tagDef
+     *            the tagging definition
+     * @param selectedField
+     *            the selected field
+     * @param fieldName
+     *            the field name
+     * @param fieldValue
+     *            the field value
+     * @since 5.1
+     */
+    public VariantDefinition(@NonNull VariantDeclaration declaration, IDefinitionScope definitionScope, SimpleDatatypeDefinition tagDef, String selectedField, @NonNull String fieldName, Definition fieldValue) {
+        super(declaration, definitionScope, fieldName);
+
+        fTagDef = tagDef;
+        fFieldName = fieldName;
+        fCurrentField = selectedField;
+        fDefinition = fieldValue;
+    }
+
+
     /**
      * Constructor
      *
@@ -68,6 +95,7 @@ public VariantDefinition(@NonNull VariantDeclaration declaration, IDefinitionSco
         fDefinition = fieldValue;
     }
 
+
     // ------------------------------------------------------------------------
     // Getters/Setters/Predicates
     // ------------------------------------------------------------------------