tmf: keep event fields ordering as per ctf metadata

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core / src / org / eclipse / linuxtools / tmf / core / ctfadaptor / CtfTmfEventFactory.java

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java
index f4f15435c943e70331a3e44f441901b00cba3113..b2974d24f84e755b32dbb09af8eb7d313d469944 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventFactory.java
@@ -13,15 +13,13 @@
 package org.eclipse.linuxtools.tmf.core.ctfadaptor;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.linuxtools.ctf.core.event.CTFCallsite;
 import org.eclipse.linuxtools.ctf.core.event.EventDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.Definition;
-import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition;
 import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -36,10 +34,12 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
  * @author Alexandre Montplaisir
  * @since 2.0
  */
-public abstract class CtfTmfEventFactory {
+public final class CtfTmfEventFactory {
 
-    /* Prefix for context information stored as CtfTmfEventfield's */
-    private static final String CONTEXT_FIELD_PREFIX = "context."; //$NON-NLS-1$
+    /**
+     * Don't let anyone instantiate this class.
+     */
+    private CtfTmfEventFactory() {}
 
     /**
      * Factory method to instantiate new {@link CtfTmfEvent}'s.
@@ -63,7 +63,7 @@ public abstract class CtfTmfEventFactory {
         int sourceCPU = eventDef.getCPU();
 
         ITmfEventField content = new TmfEventField(
-                ITmfEventField.ROOT_FIELD_ID, parseFields(originTrace, eventDef));
+                ITmfEventField.ROOT_FIELD_ID, parseFields(eventDef));
 
         String reference = fileName == null ? CtfTmfEvent.NO_STREAM : fileName;
 
@@ -99,11 +99,11 @@ public abstract class CtfTmfEventFactory {
      * Extract the field information from the structDefinition haze-inducing
      * mess, and put them into something ITmfEventField can cope with.
      */
-    private static CtfTmfEventField[] parseFields(CtfTmfTrace trace, EventDefinition eventDef) {
+    private static CtfTmfEventField[] parseFields(EventDefinition eventDef) {
         List<CtfTmfEventField> fields = new ArrayList<CtfTmfEventField>();
 
         StructDefinition structFields = eventDef.getFields();
-        HashMap<String, Definition> definitions = structFields.getDefinitions();
+        Map<String, Definition> definitions = structFields.getDefinitions();
         String curFieldName = null;
         Definition curFieldDef;
         CtfTmfEventField curField;
@@ -117,7 +117,6 @@ public abstract class CtfTmfEventFactory {
         }
 
         /* Add context information as CtfTmfEventField */
-        long ip = -1;
         StructDefinition structContext = eventDef.getContext();
         if (structContext != null) {
             definitions = structContext.getDefinitions();
@@ -127,32 +126,13 @@ public abstract class CtfTmfEventFactory {
             it = definitions.entrySet().iterator();
             while(it.hasNext()) {
                 Entry<String, Definition> entry = it.next();
-                /* This is to get the instruction pointer if available */
-                if (entry.getKey().equals("_ip") && //$NON-NLS-1$
-                        (entry.getValue() instanceof IntegerDefinition)) {
-                    ip = ((IntegerDefinition) entry.getValue()).getValue();
-                }
-                /* Prefix field name to */
-                curContextName = CONTEXT_FIELD_PREFIX + entry.getKey();
+                /* Prefix field name */
+                curContextName = CtfConstants.CONTEXT_FIELD_PREFIX + entry.getKey();
                 curContextDef = entry.getValue();
                 curContext = CtfTmfEventField.parseField(curContextDef, curContextName);
                 fields.add(curContext);
             }
         }
-        /* Add callsite */
-        final String name = eventDef.getDeclaration().getName();
-        List<CTFCallsite> eventList = trace.getCTFTrace().getCallsiteCandidates(name);
-        if (!eventList.isEmpty()) {
-            final String callsite = "callsite"; //$NON-NLS-1$
-            if (eventList.size() == 1 || ip == -1) {
-                CTFCallsite cs = eventList.get(0);
-                fields.add(new CTFStringField(cs.toString(), callsite));
-            } else {
-                fields.add(new CTFStringField(
-                        trace.getCTFTrace().getCallsite(name, ip).toString(),
-                        callsite));
-            }
-        }
         return fields.toArray(new CtfTmfEventField[fields.size()]);
     }
 }