tmf: update ITmfEvent.getType().getName() to be getName()
authorMatthew Khouzam <matthew.khouzam@ericsson.com>
Fri, 10 Apr 2015 17:25:21 +0000 (13:25 -0400)
committerMatthew Khouzam <matthew.khouzam@ericsson.com>
Mon, 20 Apr 2015 19:05:14 +0000 (15:05 -0400)
This could yield a performance boost
Also, substitute TmfUml2dSyncLoader's getType().toString()
with getName() as it is being used to get the event name

Change-Id: Ide3cb3f0a97f86d99f2e358f608dac107c730bef
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/45675
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
20 files changed:
org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/cpuusage/KernelCpuUsageStateProvider.java
org.eclipse.tracecompass.btf.core.tests/src/org/eclipse/tracecompass/btf/core/tests/utils/TestBtfTrace.java
org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/analysis/BtfStateProvider.java
org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/model/qemukvm/QemuKvmVmModel.java
org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/analysis/vm/module/VirtualMachineStateProvider.java
org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpEventMatching.java
org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/memoryusage/MemoryUsageStateProvider.java
org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/trace/callstack/LttngUstCallStackProvider.java
org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlEventHandler.java
org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateAttribute.java
org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/readwrite/TmfXmlReadWriteStateValue.java
org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/stub/XmlStubTraceTest.java
org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfEventsStatistics.java
org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsEventTypesModule.java
org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/commands/ExportToTextRequest.java
org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java

index af358ec46945dfa9fc6a397b54085370aa140911..2935214f012515209dc85c011f8a63a7c2bfd5a6 100644 (file)
@@ -88,7 +88,7 @@ public class KernelCpuUsageStateProvider extends AbstractTmfStateProvider {
         if (event == null) {
             return;
         }
-        final String eventName = event.getType().getName();
+        final String eventName = event.getName();
 
         if (eventName.equals(fLayout.eventSchedSwitch())) {
             Object cpuObj = TmfTraceUtils.resolveEventAspectOfClassForEvent(event.getTrace(), TmfCpuAspect.class, event);
index 0b4832909915cbc2a45325ca6fc9260998f96628..1fcf4f48a8464c76bcbed320bd922424e926eb50 100644 (file)
@@ -62,7 +62,7 @@ public class TestBtfTrace {
         if (event == null) {
             System.out.println("null");
         } else {
-            System.out.println(event.getRank() + " " + event.getTimestamp().getValue() + " " + event.getType().getName() + " " + event.getContent().toString());
+            System.out.println(event.getRank() + " " + event.getTimestamp().getValue() + " " + event.getName() + " " + event.getContent().toString());
         }
     }
 
index 752ab9cc57c09edb58e52239388abc81fab63c30..6cece218604dc64c68c2d7157324db990c2c3e84 100644 (file)
@@ -260,7 +260,7 @@ public class BtfStateProvider extends AbstractTmfStateProvider {
             final long ts, BtfEvent event,
             TmfNamedStateValue stateValue)
             throws AttributeNotFoundException {
-        String name = event.getType().getName();
+        String name = event.getName();
         if (name.equals("Task")) { //$NON-NLS-1$
             String task = event.getTarget();
             int quark = ssb.getQuarkAbsoluteAndAdd(ATTRIBUTE_TASKS, task);
index 999d1d21544dfa48cece4dde00d45831dac0f764..f641e41137029af0b15281f8d3a9ccd1125cb12b 100644 (file)
@@ -95,7 +95,7 @@ public class QemuKvmVmModel implements IVirtualMachineModel {
          * machines are all cached and the method returns earlier
          */
         /* Try to get the virtual machine from the event */
-        String eventName = event.getType().getName();
+        String eventName = event.getName();
         if (eventName.startsWith(KVM)) {
             /* Only the host machine has kvm_* events, so this is a host */
             machine = VirtualMachine.newHostMachine(hostId);
@@ -146,7 +146,7 @@ public class QemuKvmVmModel implements IVirtualMachineModel {
 
     @Override
     public @Nullable VirtualCPU getVCpuExitingHypervisorMode(ITmfEvent event, HostThread ht) {
-        final String eventName = event.getType().getName();
+        final String eventName = event.getName();
 
         /* TODO: Use event layouts for this part also */
         /*
@@ -180,7 +180,7 @@ public class QemuKvmVmModel implements IVirtualMachineModel {
 
     @Override
     public @Nullable VirtualCPU getVCpuEnteringHypervisorMode(ITmfEvent event, HostThread ht) {
-        final String eventName = event.getType().getName();
+        final String eventName = event.getName();
         /*
          * The KVM_EXIT event means we are exiting a virtual CPU, so entering
          * hypervisor mode
@@ -200,7 +200,7 @@ public class QemuKvmVmModel implements IVirtualMachineModel {
     @Override
     public void handleEvent(ITmfEvent event) {
         /* Is the event handled by this model */
-        final String eventName = event.getType().getName();
+        final String eventName = event.getName();
         if (!eventName.equals(QemuKvmStrings.VMSYNC_GH_HOST)) {
             return;
         }
index 85e35f6357720ddfe66214c1401e71b75c3116b2..b2a0a6da487709bd25490a9d2969263a6af66bae 100644 (file)
@@ -152,7 +152,7 @@ public class VirtualMachineStateProvider extends AbstractTmfStateProvider {
         }
 
         /* Is the event managed by this analysis */
-        final String eventName = event.getType().getName();
+        final String eventName = event.getName();
 
         /* TODO When requirements work again, don't hardcode this */
         if (!eventName.equals("sched_switch") && //$NON-NLS-1$
index 208fc898dbd8d63915890ab3eaa1b392d68d739f..2feeb23663bed477795a1bf8ab254c48c0d05f55 100644 (file)
@@ -59,7 +59,7 @@ public class TcpEventMatching implements ITmfMatchEventDefinition {
      */
     @Override
     public Direction getDirection(ITmfEvent event) {
-        String evname = event.getType().getName();
+        String evname = event.getName();
 
         if (!canMatchPacket(event)) {
             return null;
index 461c5d6a00a486029c5718ff09302641c398acd4..89ff6997cfb925957b1de930d6e87eb8f0ad87b3 100644 (file)
@@ -78,7 +78,7 @@ public class TcpLttngEventMatching implements ITmfMatchEventDefinition {
      */
     @Override
     public Direction getDirection(ITmfEvent event) {
-        String evname = event.getType().getName();
+        String evname = event.getName();
 
         /* Is the event a tcp socket in or out event */
         if (evname.equals(TcpEventStrings.NETIF_RECEIVE_SKB) && canMatchPacket(event)) {
index 66a36384fe906a56ef870502933f99f1932cf284..b83d9ece25ff3a8976ce565e61643f512f49e0c9 100644 (file)
@@ -62,7 +62,7 @@ public class MemoryUsageStateProvider extends AbstractTmfStateProvider {
 
     @Override
     protected void eventHandle(ITmfEvent event) {
-        String name = event.getType().getName();
+        String name = event.getName();
         switch (name) {
         case UstMemoryStrings.MALLOC: {
             Long ptr = (Long) event.getContent().getField(UstMemoryStrings.FIELD_PTR).getValue();
index a2007ee58a2e4d57b36c11390febdd5539fcb26a..345cd006961bc7f4ebe6bd17d002c68b130aa508 100644 (file)
@@ -124,7 +124,7 @@ public class LttngUstCallStackProvider extends CallStackStateProvider {
 
     @Override
     public String functionEntry(ITmfEvent event) {
-        String eventName = event.getType().getName();
+        String eventName = event.getName();
         if (!FUNC_ENTRY_EVENTS.contains(eventName)) {
             return null;
         }
@@ -134,7 +134,7 @@ public class LttngUstCallStackProvider extends CallStackStateProvider {
 
     @Override
     public String functionExit(ITmfEvent event) {
-        String eventName = event.getType().getName();
+        String eventName = event.getName();
         if (!FUNC_EXIT_EVENTS.contains(eventName)) {
             return null;
         }
index 37243d129d6c41d41eda643cec5fc3f6b15402a6..abd24f4434837bc1fc5f333fbe64634f953428cc 100644 (file)
@@ -79,7 +79,7 @@ public class TmfXmlEventHandler {
     }
 
     private boolean appliesToEvent(ITmfEvent event) {
-        String eventName = event.getType().getName();
+        String eventName = event.getName();
 
         /* test for full name */
         if (eventName.equals(fName)) {
index d715aaada14591a9b851b11c671ecb1717156274..670b3ffc080a1b62278c8537a16848190d11850f 100644 (file)
@@ -326,7 +326,7 @@ public abstract class TmfXmlStateAttribute implements ITmfXmlStateAttribute {
                     Activator.logWarning("XML State attribute: looking for an eventname, but event is null"); //$NON-NLS-1$
                     return quark;
                 }
-                quark = getQuarkRelativeAndAdd(startQuark, event.getType().getName());
+                quark = getQuarkRelativeAndAdd(startQuark, event.getName());
                 return quark;
             }
             case SELF:
index 740fd63d9741f67e002351eb06758158f03a8568..a9264234a6f0cce75b943cc842c84fed7403fb49 100644 (file)
@@ -300,7 +300,7 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue {
                 Activator.logWarning("XML State value: request event name, but event is null"); //$NON-NLS-1$
                 return TmfStateValue.nullValue();
             }
-            return TmfStateValue.newValueString(event.getType().getName());
+            return TmfStateValue.newValueString(event.getName());
         }
 
     }
index 15361b6c3a3c4e85715d789759c54f2cc976fcf6..b171c511434caab9b66d2423bb38843da015a3c7 100644 (file)
@@ -183,7 +183,7 @@ public class XmlStubTraceTest {
     }
 
     private static IStatus testEvent(ITmfEvent event) {
-        switch (event.getType().getName()) {
+        switch (event.getName()) {
         case EVENT_A: {
             ITmfEventField content = event.getContent();
             if (content.getField(FIELD_A) == null) {
index 221d57a089fafa3121c33e39e2284c250283c1c8..e7cbb71f2d622180a699fe44a5a1c762714ed226 100644 (file)
@@ -196,7 +196,7 @@ public class TmfEventsStatistics implements ITmfStatistics {
         public void handleData(final ITmfEvent event) {
             super.handleData(event);
             if (event.getTrace() == trace) {
-                String eventType = event.getType().getName();
+                String eventType = event.getName();
                 /*
                  * Special handling for lost events: instead of counting just
                  * one, we will count how many actual events it represents.
index a26225bce92c069113e6e5dd1206d8dbd27d3124..0ad0c8b652593e5f2b6f790db194b56876f71740 100644 (file)
@@ -125,7 +125,7 @@ public class TmfStatisticsEventTypesModule extends TmfStateSystemAnalysisModule
              * timestamp values to nanoseconds. */
             final long ts = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue();
 
-            final String eventName = event.getType().getName();
+            final String eventName = event.getName();
 
             try {
                 /* Special handling for lost events */
index acaa1f7b94e29733d387f7a9e4dc11c878936aeb..29c1d54ac17289e510df354f667bf21c1189a279 100644 (file)
@@ -105,9 +105,9 @@ public class TmfBaseColumnDataProviderTest {
         fStatsData.getOrCreateNode(fTestName, Messages.TmfStatisticsData_EventTypes);
 
         fStatsData.setTotal(fTestName, true, 3);
-        fStatsData.setTypeCount(fTestName, fEvent1.getType().getName(), true, 1);
-        fStatsData.setTypeCount(fTestName, fEvent2.getType().getName(), true, 1);
-        fStatsData.setTypeCount(fTestName, fEvent3.getType().getName(), true, 1);
+        fStatsData.setTypeCount(fTestName, fEvent1.getName(), true, 1);
+        fStatsData.setTypeCount(fTestName, fEvent2.getName(), true, 1);
+        fStatsData.setTypeCount(fTestName, fEvent3.getName(), true, 1);
 
         provider = new TmfBaseColumnDataProvider();
     }
@@ -126,8 +126,8 @@ public class TmfBaseColumnDataProviderTest {
         assertEquals("getColumnData", 4, columnsData.size());
 
         TmfStatisticsTreeNode parentNode = fStatsData.getNode(fTestName);
-        TmfStatisticsTreeNode treeNode1 = fStatsData.getNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName());
-        TmfStatisticsTreeNode treeNode2 = fStatsData.getNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent3.getType().getName());
+        TmfStatisticsTreeNode treeNode1 = fStatsData.getNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getName());
+        TmfStatisticsTreeNode treeNode2 = fStatsData.getNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent3.getName());
         ViewerComparator vComp = null;
         for (TmfBaseColumnData columnData : columnsData) {
             assertNotNull("getColumnData", columnData);
index 962f5aec1976af7b819749342863fbeae64eb98d..1e7f7ebe2c8cecd29c48c050412e48d340ace979 100755 (executable)
@@ -121,8 +121,8 @@ public class TmfBaseStatisticsDataTest {
         assertEquals("getChildren", Messages.TmfStatisticsData_EventTypes, treeNode.getName());
 
         Vector<String> keyExpected = new Vector<>();
-        keyExpected.add(fEvent1.getType().getName());
-        keyExpected.add(fEvent3.getType().getName());
+        keyExpected.add(fEvent1.getName());
+        keyExpected.add(fEvent3.getName());
         // Getting children of a category
         childrenTreeNode = treeNode.getChildren();
         assertEquals("getChildren", 2, childrenTreeNode.size());
index 34c3b1339c5ca986b0fe0099277c807c35a36fc9..a5b3e159f02f0e3f9bc23d7d574dd6b9ce9a8be0 100755 (executable)
@@ -86,8 +86,8 @@ public class TmfTreeContentProviderTest {
         fStatsData = new TmfStatisticsTree();
 
         fStatsData.setTotal(fTestName, true, 2);
-        fStatsData.setTypeCount(fTestName, fEvent1.getType().getName(), true, 1);
-        fStatsData.setTypeCount(fTestName, fEvent2.getType().getName(), true, 1);
+        fStatsData.setTypeCount(fTestName, fEvent1.getName(), true, 1);
+        fStatsData.setTypeCount(fTestName, fEvent2.getName(), true, 1);
 
         treeProvider = new TmfTreeContentProvider();
     }
@@ -107,8 +107,8 @@ public class TmfTreeContentProviderTest {
         TmfStatisticsTreeNode[] childrenNode = Arrays.asList(objectArray).toArray(new TmfStatisticsTreeNode[0]);
 
         String[][] childrenExpected = new String[][] {
-                new String[] { fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName() },
-                new String[] { fTestName, Messages.TmfStatisticsData_EventTypes, fEvent2.getType().getName() }
+                new String[] { fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getName() },
+                new String[] { fTestName, Messages.TmfStatisticsData_EventTypes, fEvent2.getName() }
         };
 
         assertEquals("getChildren", childrenExpected.length, childrenNode.length);
@@ -166,7 +166,7 @@ public class TmfTreeContentProviderTest {
         hasChildren = treeProvider.hasChildren(fStatsData.getOrCreateNode(fTestName, Messages.TmfStatisticsData_EventTypes));
         assertTrue("hasChildren", hasChildren);
 
-        hasChildren = treeProvider.hasChildren(fStatsData.getOrCreateNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName()));
+        hasChildren = treeProvider.hasChildren(fStatsData.getOrCreateNode(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getName()));
         assertFalse("hasChildren", hasChildren);
     }
 
index e1aec6a9fbeaf25de1106d446155a154cd9bb258..ffe6edf8805d69933fedec851da257f08698df9a 100644 (file)
@@ -80,7 +80,7 @@ public class ExportToTextRequest extends TmfEventRequest {
                 } else { // fallback to default formatting
                     fWriter.write(event.getTimestamp().toString());
                     fWriter.write('\t');
-                    fWriter.write(event.getType().getName());
+                    fWriter.write(event.getName());
                     fWriter.write('\t');
                     ITmfEventField content = event.getContent();
                     Object value = content.getValue();
index 0590ee77c5e6497884c4f420e0c107974c19d9a8..79adc7bf4acccd647254c72d2e5fbc0f44218c04 100644 (file)
@@ -1468,8 +1468,8 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader,
     protected ITmfSyncSequenceDiagramEvent getSequenceDiagramEvent(ITmfEvent tmfEvent){
         //type = .*RECEIVE.* or .*SEND.*
         //content = sender:<sender name>:receiver:<receiver name>,signal:<signal name>
-        String eventType = tmfEvent.getType().toString();
-        if (eventType.contains(Messages.TmfUml2SDSyncLoader_EventTypeSend) || eventType.contains(Messages.TmfUml2SDSyncLoader_EventTypeReceive)) {
+        String eventName = tmfEvent.getName();
+        if (eventName.contains(Messages.TmfUml2SDSyncLoader_EventTypeSend) || eventName.contains(Messages.TmfUml2SDSyncLoader_EventTypeReceive)) {
             Object sender = tmfEvent.getContent().getField(Messages.TmfUml2SDSyncLoader_FieldSender);
             Object receiver = tmfEvent.getContent().getField(Messages.TmfUml2SDSyncLoader_FieldReceiver);
             Object name = tmfEvent.getContent().getField(Messages.TmfUml2SDSyncLoader_FieldSignal);
This page took 0.039818 seconds and 5 git commands to generate.