From 6651c1b4b51292c75376cd6baa40153bcf7c0b66 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Julien Date: Thu, 28 Aug 2014 16:48:23 -0400 Subject: [PATCH] tmf: lttngControl: fix: way to retrieve probe and function information Change-Id: Ie47ac49b58de165397be92b23161f90faf43772d Signed-off-by: Jonathan Rajotte Julien Reviewed-on: https://git.eclipse.org/r/32440 Tested-by: Hudson CI Reviewed-by: Alexandre Montplaisir Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- .../core/model/impl/ProbeEventInfo.java | 1 + .../views/service/LTTngControlServiceMI.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java index 357c509f4a..69068ee8c9 100644 --- a/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java +++ b/org.eclipse.linuxtools.lttng2.control.core/src/org/eclipse/linuxtools/internal/lttng2/control/core/model/impl/ProbeEventInfo.java @@ -78,6 +78,7 @@ public class ProbeEventInfo extends EventInfo implements IProbeEventInfo { setLogLevelType(eventInfo.getLogLevelType()); setLogLevel(eventInfo.getLogLevel()); setFilterExpression(eventInfo.getFilterExpression()); + setEventType(eventInfo.getEventType()); } // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java index 9fb3ea9751..8bb18a5613 100644 --- a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java +++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/service/LTTngControlServiceMI.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.internal.lttng2.control.ui.views.service; import java.io.IOException; import java.io.StringReader; +import java.math.BigInteger; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -835,20 +836,19 @@ public class LTTngControlServiceMI extends LTTngControlService { if (isProbeFunction) { IProbeEventInfo probeEvent = new ProbeEventInfo(eventInfo); eventInfo = probeEvent; - // get attributes - Node rawAttributes = getFirstOf(rawInfos, MIStrings.ATTRIBUTES); - if (rawAttributes == null) { - throw new ExecutionException(Messages.TraceControl_MiMissingRequiredError); - } Node rawDataNode = null; switch (probeEvent.getEventType()) { - case PROBE: - rawDataNode = getFirstOf(rawAttributes.getChildNodes(), MIStrings.PROBE_ATTRIBUTES); - break; case FUNCTION: - rawDataNode = getFirstOf(rawAttributes.getChildNodes(), MIStrings.FUNCTION_ATTRIBUTES); + case PROBE: { + // get attributes + Node rawAttributes = getFirstOf(rawInfos, MIStrings.ATTRIBUTES); + if (rawAttributes == null) { + throw new ExecutionException(Messages.TraceControl_MiMissingRequiredError); + } + rawDataNode = getFirstOf(rawAttributes.getChildNodes(), MIStrings.PROBE_ATTRIBUTES); break; + } case SYSCALL: case TRACEPOINT: case UNKNOWN: @@ -869,10 +869,10 @@ public class LTTngControlServiceMI extends LTTngControlService { probeEvent.setSymbol(rawData.getTextContent()); break; case MIStrings.ADDRESS: - probeEvent.setAddress(rawData.getTextContent()); + probeEvent.setAddress(String.format("%#016x", new BigInteger(rawData.getTextContent()))); //$NON-NLS-1$ break; case MIStrings.OFFSET: - probeEvent.setOffset(rawData.getTextContent()); + probeEvent.setOffset(String.format("%#016x", new BigInteger(rawData.getTextContent()))); //$NON-NLS-1$ break; default: break; -- 2.34.1