From: Matthew Khouzam Date: Mon, 22 Feb 2016 20:27:31 +0000 (-0500) Subject: tmf.all: use ITmfTimestamp#toNanos when possible X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=16801c72d947260f2c9e16afe569704773645c01;p=deliverable%2Ftracecompass.git tmf.all: use ITmfTimestamp#toNanos when possible The new helper replaces a longer line of timestamp.normalize(0, ITmfTimestamp.NANO_SCALE).getValue() with timestamp.toNanos(); It also can run faster as it has a quick exit on a match of scales, this saves an object allocation. Change-Id: Ic3c307944082aef38be4525e4c2d3547237b6d88 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/67091 Reviewed-by: Hudson CI Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse --- diff --git a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java index cdedc3b539..740698cbae 100644 --- a/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.graph.core/src/org/eclipse/tracecompass/analysis/graph/core/building/AbstractTmfGraphProvider.java @@ -15,7 +15,6 @@ import java.util.List; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.analysis.graph.core.base.TmfGraph; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; /** @@ -57,7 +56,7 @@ public abstract class AbstractTmfGraphProvider implements ITmfGraphProvider { @Override public long getStartTime() { - return fTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + return fTrace.getStartTime().toNanos(); } @Override diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java index 5395c876f2..a6ab3f5d4b 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/kernel/handlers/KernelEventHandlerUtils.java @@ -19,7 +19,6 @@ import org.eclipse.tracecompass.statesystem.core.exceptions.TimeRangeException; import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCpuAspect; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils; /** @@ -74,7 +73,7 @@ public final class KernelEventHandlerUtils { * @return the timestamp in long format */ public static long getTimestamp(ITmfEvent event) { - return event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + return event.getTimestamp().toNanos(); } /** diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java index c8d0ed0211..572516284b 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java +++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/scatter/AbstractSegmentStoreScatterGraphViewer.java @@ -44,7 +44,6 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; @@ -90,8 +89,8 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL } AbstractSegmentStoreAnalysisModule module = getAnalysisModule(); - final long startTimeInNanos = getTimeInNanos(fCurrentRange.getStartTime()); - final long endTimeInNanos = getTimeInNanos(fCurrentRange.getEndTime()); + final long startTimeInNanos = fCurrentRange.getStartTime().toNanos(); + final long endTimeInNanos = fCurrentRange.getEndTime().toNanos(); if (module == null) { setWindowRange(startTimeInNanos, endTimeInNanos); redraw(statusMonitor, startTimeInNanos, startTimeInNanos, Collections.EMPTY_LIST); @@ -277,8 +276,8 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL public void updateModel(@Nullable ISegmentStore dataInput) { // Update new window range TmfTimeRange currentRange = TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange(); - long currentStart = getTimeInNanos(currentRange.getStartTime()); - long currentEnd = getTimeInNanos(currentRange.getEndTime()); + long currentStart = currentRange.getStartTime().toNanos(); + long currentEnd = currentRange.getEndTime().toNanos(); if (dataInput == null) { if (!getDisplay().isDisposed()) { Display.getDefault().syncExec(new Runnable() { @@ -443,8 +442,8 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL if (trace != null) { final TmfTimeRange timeRange = TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange(); setWindowRange( - timeRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(), - timeRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + timeRange.getStartTime().toNanos(), + timeRange.getEndTime().toNanos()); setData(getSegmentStoreAnalysisModule(trace)); updateRange(timeRange); } @@ -468,8 +467,8 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL final AbstractSegmentStoreAnalysisModule analysisModuleOfClass = getSegmentStoreAnalysisModule(trace); final TmfTimeRange timeRange = TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange(); setWindowRange( - getTimeInNanos(timeRange.getStartTime()), - getTimeInNanos(timeRange.getEndTime())); + timeRange.getStartTime().toNanos(), + timeRange.getEndTime().toNanos()); setData(analysisModuleOfClass); } @@ -532,8 +531,4 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL private void setAnalysisModule(AbstractSegmentStoreAnalysisModule analysisModule) { fAnalysisModule = analysisModule; } - - private static long getTimeInNanos(final ITmfTimestamp currentTime) { - return currentTime.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - } } \ No newline at end of file diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java index 53708c9a31..1e49e5230c 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/event/EventContextTest.java @@ -18,7 +18,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; @@ -59,8 +58,8 @@ public class EventContextTest { fixture = CtfTmfTestTraceUtils.getTrace(testTrace); fixture.indexTrace(true); - startTime = fixture.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - endTime = fixture.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + startTime = fixture.getStartTime().toNanos(); + endTime = fixture.getEndTime().toNanos(); } /** diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java index e3b3e64332..d9966bf09f 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/request/TmfSchedulerTest.java @@ -79,8 +79,8 @@ public class TmfSchedulerTest { public void setUp() { fixture = CtfTmfTestTraceUtils.getTrace(testTrace); fixture.indexTrace(true); - fStartTime = fixture.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fEndTime = fixture.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fStartTime = fixture.getStartTime().toNanos(); + fEndTime = fixture.getEndTime().toNanos(); long foregroundStartTime = fStartTime + ((fEndTime - fStartTime) / 4); long foregroundEndTime = fStartTime + ((fEndTime - fStartTime) / 2); diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java index df5999f781..6d5b93422b 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java @@ -59,23 +59,22 @@ public class TmfTraceManagerTest { /** Time-out tests after 20 seconds */ @Rule - public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(20, TimeUnit.SECONDS); private static final int SCALE = ITmfTimestamp.NANOSECOND_SCALE; private static ITmfTrace trace1; private static final long t1start = 1331668247314038062L; - private static final long t1end = 1331668259054285979L; + private static final long t1end = 1331668259054285979L; private static ITmfTrace trace2; private static final long t2start = 1332170682440133097L; - private static final long t2end = 1332170692664579801L; + private static final long t2end = 1332170692664579801L; private static final long ONE_SECOND = 1000000000L; private TmfTraceManager tm; - /** * Test class initialization */ @@ -347,8 +346,8 @@ public class TmfTraceManagerTest { } /** - * Test selecting a range whose end time is after the trace's end time. - * The selected range should get clamped to the trace's range. + * Test selecting a range whose end time is after the trace's end time. The + * selected range should get clamped to the trace's range. */ @Test public void testTraceTimeRangeClampingEnd() { @@ -738,8 +737,8 @@ public class TmfTraceManagerTest { * Basically a "initial + offset" operation, but for ITmfTimetamp objects. */ private static @NonNull ITmfTimestamp calculateOffset(ITmfTimestamp initialTs, ITmfTimestamp offsetTs) { - long start = initialTs.normalize(0, SCALE).getValue(); - long offset = offsetTs.normalize(0, SCALE).getValue(); + long start = initialTs.toNanos(); + long offset = offsetTs.toNanos(); return new TmfTimestamp(start + offset, SCALE); } } diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java index 6a6d89bf4e..6660aa0cd3 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java @@ -35,7 +35,6 @@ import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; @@ -156,7 +155,7 @@ public abstract class AbstractProviderTest { /* Make sure the generated state system exists, but is empty */ ITmfStateSystem ss = module.getStateSystem(); assertNotNull(ss); - assertTrue(ss.getStartTime() >= ustTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + assertTrue(ss.getStartTime() >= ustTrace.getStartTime().toNanos()); assertEquals(0, ss.getNbAttributes()); } finally { if (module != null) { diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlPatternSegmentBuilder.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlPatternSegmentBuilder.java index 7817979858..ba651fb1ea 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlPatternSegmentBuilder.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlPatternSegmentBuilder.java @@ -97,8 +97,8 @@ public class TmfXmlPatternSegmentBuilder { */ public TmfXmlPatternSegment generatePatternSegment(ITmfEvent event, ITmfTimestamp start, ITmfTimestamp end) { int scale = event.getTimestamp().getScale(); - long startValue = start.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long endValue = end.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long startValue = start.toNanos(); + long endValue = end.toNanos(); String segmentName = getPatternSegmentName(event); Map fields = new HashMap<>(); setPatternSegmentContent(event, start, end, fields); diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java index 4790153c38..76c1ec9766 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/mipmap/TmfMipmapStateProviderStub.java @@ -69,7 +69,7 @@ class TmfMipmapStateProviderStub extends AbstractTmfMipmapStateProvider { @Override protected void eventHandle(ITmfEvent ev) { ITmfStateSystemBuilder ss = checkNotNull(getStateSystemBuilder()); - final long ts = ev.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long ts = ev.getTimestamp().toNanos(); try { int quark = ss.getQuarkAbsoluteAndAdd(TEST_ATTRIBUTE_NAME); ITmfStateValue value = (ITmfStateValue) ev.getContent().getValue(); diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/callstack/CallStackStateProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/callstack/CallStackStateProvider.java index b671c7af22..825f98d1a1 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/callstack/CallStackStateProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/callstack/CallStackStateProvider.java @@ -25,7 +25,6 @@ import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue; import org.eclipse.tracecompass.statesystem.core.statevalue.TmfStateValue; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; /** @@ -102,7 +101,7 @@ public abstract class CallStackStateProvider extends AbstractTmfStateProvider { /* Check if the event is a function entry */ String functionEntryName = functionEntry(event); if (functionEntryName != null) { - long timestamp = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long timestamp = event.getTimestamp().toNanos(); String thread = getThreadName(event); int threadQuark = ss.getQuarkAbsoluteAndAdd(THREADS, thread); Long threadId = getThreadId(event); @@ -118,7 +117,7 @@ public abstract class CallStackStateProvider extends AbstractTmfStateProvider { /* Check if the event is a function exit */ String functionExitName = functionExit(event); if (functionExitName != null) { - long timestamp = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long timestamp = event.getTimestamp().toNanos(); String thread = getThreadName(event); int quark = ss.getQuarkAbsoluteAndAdd(THREADS, thread, CALL_STACK); ITmfStateValue poppedValue = ss.popAttribute(timestamp, quark); diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java index 662e3b3466..1a82184c61 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/AbstractTmfStateProvider.java @@ -22,7 +22,6 @@ import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystemBuilder; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.TmfEvent; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; @@ -84,7 +83,7 @@ public abstract class AbstractTmfStateProvider implements ITmfStateProvider { @Override public long getStartTime() { - return fTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + return fTrace.getStartTime().toNanos(); } @Override @@ -210,7 +209,7 @@ public abstract class AbstractTmfStateProvider implements ITmfStateProvider { private void closeStateSystem() { ITmfEvent event = currentEvent; final long endTime = (event == null) ? 0 : - event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + event.getTimestamp().toNanos(); if (fSS != null) { fSS.closeHistory(endTime); diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfEventsStatistics.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfEventsStatistics.java index 7c4fca784d..31c411338a 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfEventsStatistics.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfEventsStatistics.java @@ -268,7 +268,7 @@ public class TmfEventsStatistics implements ITmfStatistics { public void handleData(ITmfEvent event) { super.handleData(event); if (event.getTrace() == trace) { - long ts = event.getTimestamp().normalize(0, SCALE).getValue(); + long ts = event.getTimestamp().toNanos(); Long key = results.floorKey(ts); if (key != null) { incrementValue(key); diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsEventTypesModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsEventTypesModule.java index b141784907..2966a83c9f 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsEventTypesModule.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsEventTypesModule.java @@ -28,7 +28,6 @@ import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.tracecompass.tmf.core.statistics.TmfStateStatistics.Attributes; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; /** @@ -131,7 +130,7 @@ public class TmfStatisticsEventTypesModule extends TmfStateSystemAnalysisModule /* Since this can be used for any trace types, normalize all the * timestamp values to nanoseconds. */ - final long ts = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long ts = event.getTimestamp().toNanos(); final String eventName = event.getName(); @@ -149,8 +148,8 @@ public class TmfStatisticsEventTypesModule extends TmfStateSystemAnalysisModule ITmfStateValue value1 = TmfStateValue.newValueInt((int) (curVal + le.getNbLostEvents())); ss.modifyAttribute(ts, value1, quark); - long lostEventsStartTime = le.getTimeRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long lostEventsEndTime = le.getTimeRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long lostEventsStartTime = le.getTimeRange().getStartTime().toNanos(); + long lostEventsEndTime = le.getTimeRange().getEndTime().toNanos(); int lostEventsQuark = ss.getQuarkAbsoluteAndAdd(Attributes.LOST_EVENTS); ITmfStateValue currentLostEventsEndTime = ss.queryOngoingState(lostEventsQuark); if (currentLostEventsEndTime.isNull() || currentLostEventsEndTime.unboxLong() < lostEventsStartTime) { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsTotalsModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsTotalsModule.java index c5adf11b22..fa4f63aa0c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsTotalsModule.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statistics/TmfStatisticsTotalsModule.java @@ -25,7 +25,6 @@ import org.eclipse.tracecompass.tmf.core.statesystem.AbstractTmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.tracecompass.tmf.core.statistics.TmfStateStatistics.Attributes; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; /** @@ -119,7 +118,7 @@ public class TmfStatisticsTotalsModule extends TmfStateSystemAnalysisModule { /* Since this can be used for any trace types, normalize all the * timestamp values to nanoseconds. */ - final long ts = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long ts = event.getTimestamp().toNanos(); try { /* Total number of events */ diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/synchronization/TimestampTransformFactory.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/synchronization/TimestampTransformFactory.java index ddb0a505ac..1eda402684 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/synchronization/TimestampTransformFactory.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/synchronization/TimestampTransformFactory.java @@ -96,7 +96,7 @@ public final class TimestampTransformFactory { if (factor == 1.0) { return createWithOffset(offset); } - return new TmfTimestampTransformLinearFast(factor, offset.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + return new TmfTimestampTransformLinearFast(factor, offset.toNanos()); } /** diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/ITmfTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/ITmfTimestamp.java index b636362ea2..5d55e5d8e9 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/ITmfTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/ITmfTimestamp.java @@ -85,7 +85,7 @@ public interface ITmfTimestamp extends Comparable { * @return the timestamp converted to a long value of nanoseconds * @since 2.0 */ - default long toNanos(){ + default long toNanos() { if (getScale() == NANOSECOND_SCALE) { return getValue(); } diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java index a277bf2e86..9ae49c1dd7 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java @@ -49,7 +49,7 @@ public class TmfNanoTimestamp extends TmfTimestamp { * The timestamp to copy */ public TmfNanoTimestamp(final ITmfTimestamp timestamp) { - super(timestamp.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(), ITmfTimestamp.NANOSECOND_SCALE); + super(timestamp.toNanos(), ITmfTimestamp.NANOSECOND_SCALE); } // ------------------------------------------------------------------------ diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java index aad90f298b..422a2736b7 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java @@ -313,8 +313,7 @@ public class TmfTimestamp implements ITmfTimestamp { @Override public String toString(final TmfTimestampFormat format) { try { - ITmfTimestamp ts = normalize(0, ITmfTimestamp.NANOSECOND_SCALE); - return format.format(ts.getValue()); + return format.format(toNanos()); } catch (ArithmeticException e) { return format.format(0); diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java index 77a43cb043..e82144403b 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java @@ -38,13 +38,13 @@ import org.eclipse.tracecompass.common.core.NonNullUtils; import org.eclipse.tracecompass.internal.tmf.core.Activator; import org.eclipse.tracecompass.tmf.core.TmfCommonConstants; import org.eclipse.tracecompass.tmf.core.signal.TmfEventFilterAppliedSignal; -import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager; -import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; @@ -282,12 +282,10 @@ public final class TmfTraceManager { final IFile editorFile = signal.getEditorFile(); final ITmfTimestamp startTs = trace.getStartTime(); - /* Calculate the initial time range */ - final int SCALE = ITmfTimestamp.NANOSECOND_SCALE; - long offset = trace.getInitialRangeOffset().normalize(0, SCALE).getValue(); - long endTime = startTs.normalize(0, SCALE).getValue() + offset; + long offset = trace.getInitialRangeOffset().toNanos(); + long endTime = startTs.toNanos() + offset; final TmfTimeRange selectionRange = new TmfTimeRange(startTs, startTs); - final TmfTimeRange windowRange = new TmfTimeRange(startTs, new TmfTimestamp(endTime, SCALE)); + final TmfTimeRange windowRange = new TmfTimeRange(startTs, new TmfTimestamp(endTime, ITmfTimestamp.NANOSECOND_SCALE)); final TmfTraceContext startCtx = new TmfTraceContext(selectionRange, windowRange, editorFile, null); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java index f1f4569c53..838dd48ce4 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java @@ -136,7 +136,7 @@ public class OffsetDialog extends Dialog { } else { try { ITmfTimestamp refTime = map.get(element); - long ref = refTime == null ? 0 : refTime.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long ref = refTime == null ? 0 : refTime.toNanos(); Long newVal = TIME_FORMAT.parseValue(string, ref); map.put((TmfTraceElement) element, new TmfNanoTimestamp(newVal)); } catch (ParseException e) { @@ -153,7 +153,7 @@ public class OffsetDialog extends Dialog { if (ts == null) { return ""; //$NON-NLS-1$ } - return TIME_FORMAT.format(ts.normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + return TIME_FORMAT.format(ts.toNanos()); } } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/statistics/StatisticsUpdateJob.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/statistics/StatisticsUpdateJob.java index 293128d2d1..1b8e9cbdff 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/statistics/StatisticsUpdateJob.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/viewers/statistics/StatisticsUpdateJob.java @@ -26,7 +26,6 @@ import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.tmf.core.statistics.ITmfStatistics; import org.eclipse.tracecompass.tmf.core.statistics.TmfStatisticsEventTypesModule; import org.eclipse.tracecompass.tmf.core.statistics.TmfStatisticsModule; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; @@ -48,10 +47,6 @@ class StatisticsUpdateJob extends Job { */ private static final long LIVE_UPDATE_DELAY = 1000; - /** - * Timestamp scale used for all statistics (nanosecond) - */ - private static final byte TIME_SCALE = ITmfTimestamp.NANOSECOND_SCALE; private TmfTimeRange fTimerange; /** @@ -122,8 +117,8 @@ class StatisticsUpdateJob extends Job { * The generic statistics are stored in nanoseconds, so we must make * sure the time range is scaled correctly. */ - start = localtimeRange.getStartTime().normalize(0, TIME_SCALE).getValue(); - end = localtimeRange.getEndTime().normalize(0, TIME_SCALE).getValue(); + start = localtimeRange.getStartTime().toNanos(); + end = localtimeRange.getEndTime().toNanos(); Map map = stats.getEventTypesInRange(start, end); updateStats(map); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/TmfTimeViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/TmfTimeViewer.java index 900c780429..b8d4754374 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/TmfTimeViewer.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/TmfTimeViewer.java @@ -14,15 +14,15 @@ package org.eclipse.tracecompass.tmf.ui.viewers; import org.eclipse.swt.widgets.Composite; -import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalThrottler; -import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceUpdatedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; @@ -121,7 +121,8 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide } /** - * Sets the start time and end of the current time range window (visible range) + * Sets the start time and end of the current time range window (visible + * range) * * @param windowStartTime * The start time to set @@ -249,14 +250,14 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide fTrace = trace; TmfTraceContext ctx = TmfTraceManager.getInstance().getCurrentTraceContext(); - long selectionStart = ctx.getSelectionRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long selectionEnd = ctx.getSelectionRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long selectionStart = ctx.getSelectionRange().getStartTime().toNanos(); + long selectionEnd = ctx.getSelectionRange().getEndTime().toNanos(); TmfTimeRange windowRange = ctx.getWindowRange(); - long windowStartTime = windowRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long windowEndTime = windowRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long startTime = fTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long endTime = fTrace.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long windowStartTime = windowRange.getStartTime().toNanos(); + long windowEndTime = windowRange.getEndTime().toNanos(); + long startTime = fTrace.getStartTime().toNanos(); + long endTime = fTrace.getEndTime().toNanos(); setSelectionRange(selectionStart, selectionEnd); @@ -335,9 +336,9 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide @TmfSignalHandler public void selectionRangeUpdated(TmfSelectionRangeUpdatedSignal signal) { if ((signal.getSource() != this) && (fTrace != null)) { - ITmfTimestamp selectedTime = signal.getBeginTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE); - ITmfTimestamp selectedEndTime = signal.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE); - setSelectionRange(selectedTime.getValue(), selectedEndTime.getValue()); + long selectedTime = signal.getBeginTime().toNanos(); + long selectedEndTime = signal.getEndTime().toNanos(); + setSelectionRange(selectedTime, selectedEndTime); } } @@ -360,8 +361,8 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide if (signal.getSource() != this) { // Update the time range - long windowStartTime = range.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long windowEndTime = range.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long windowStartTime = range.getStartTime().toNanos(); + long windowEndTime = range.getEndTime().toNanos(); setWindowRange(windowStartTime, windowEndTime); } @@ -383,8 +384,8 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide TmfTimeRange fullRange = signal.getRange(); - long traceStartTime = fullRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long traceEndTime = fullRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long traceStartTime = fullRange.getStartTime().toNanos(); + long traceEndTime = fullRange.getEndTime().toNanos(); setStartTime(traceStartTime); setEndTime(traceEndTime); @@ -402,8 +403,9 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide return; } TmfTimeRange fullRange = signal.getTrace().getTimeRange(); - long traceStartTime = fullRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long traceEndTime = fullRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + + long traceStartTime = fullRange.getStartTime().toNanos(); + long traceEndTime = fullRange.getEndTime().toNanos(); setStartTime(traceStartTime); setEndTime(traceEndTime); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java index bd29972d8c..05e9fcfb86 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java @@ -454,8 +454,8 @@ public class CallStackView extends AbstractTimeGraphView { if (signal.getSource() == this || getTrace() == null || isPinned()) { return; } - final long beginTime = signal.getBeginTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - final long endTime = signal.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long beginTime = signal.getBeginTime().toNanos(); + final long endTime = signal.getEndTime().toNanos(); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramCurrentTimeControl.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramCurrentTimeControl.java index 421b8a08b0..dd65a53637 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramCurrentTimeControl.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramCurrentTimeControl.java @@ -72,8 +72,8 @@ public class HistogramCurrentTimeControl extends HistogramTextControl { ITmfTrace trace = fParentView.getTrace(); if (trace != null) { TmfTimeRange range = trace.getTimeRange(); - long startTime = range.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long endTime = range.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long startTime = range.getStartTime().toNanos(); + long endTime = range.getEndTime().toNanos(); if (value < startTime) { value = startTime; } else if (value > endTime) { diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramRequest.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramRequest.java index 5ec5201352..79d322b76b 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramRequest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramRequest.java @@ -21,7 +21,6 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfLostEvent; import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; /** @@ -97,7 +96,7 @@ public class HistogramRequest extends TmfEventRequest { fHistogram.countLostEvent(lostEvents.getTimeRange(), lostEvents.getNbLostEvents(), fFullRange); } else { /* handle lost event */ - long timestamp = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long timestamp = event.getTimestamp().toNanos(); fHistogram.countEvent(getNbRead(), timestamp, event.getTrace()); } } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramView.java index f4ad39087e..ab16edadae 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramView.java @@ -717,8 +717,8 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { TmfTimeRange fullRange = signal.getRange(); - fTraceStartTime = fullRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fTraceEndTime = fullRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fTraceStartTime = fullRange.getStartTime().toNanos(); + fTraceEndTime = fullRange.getEndTime().toNanos(); fFullTraceHistogram.setFullRange(fTraceStartTime, fTraceEndTime); fTimeRangeHistogram.setFullRange(fTraceStartTime, fTraceEndTime); @@ -736,8 +736,8 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { return; } TmfTimeRange fullRange = signal.getTrace().getTimeRange(); - fTraceStartTime = fullRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fTraceEndTime = fullRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fTraceStartTime = fullRange.getStartTime().toNanos(); + fTraceEndTime = fullRange.getEndTime().toNanos(); fFullTraceHistogram.setFullRange(fTraceStartTime, fTraceEndTime); fTimeRangeHistogram.setFullRange(fTraceStartTime, fTraceEndTime); @@ -772,9 +772,10 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { } // Update the selected time range - ITmfTimestamp beginTime = signal.getBeginTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE); - ITmfTimestamp endTime = signal.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE); - updateDisplayedSelectionTime(beginTime.getValue(), endTime.getValue()); + long beginTime = signal.getBeginTime().toNanos(); + long endTime = signal.getEndTime().toNanos(); + + updateDisplayedSelectionTime(beginTime, endTime); } /** @@ -809,8 +810,8 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { } updateDisplayedTimeRange( - range.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(), - range.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + range.getStartTime().toNanos(), + range.getEndTime().toNanos()); // Send the event request to populate the small histogram sendTimeRangeRequest(fWindowStartTime, fWindowEndTime); @@ -827,10 +828,10 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { TmfTimeRange fullRange = updateTraceTimeRange(); TmfTraceContext ctx = TmfTraceManager.getInstance().getCurrentTraceContext(); - long selectionBeginTime = ctx.getSelectionRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long selectionEndTime = ctx.getSelectionRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long startTime = ctx.getWindowRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long duration = ctx.getWindowRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue() - startTime; + long selectionBeginTime = ctx.getSelectionRange().getStartTime().toNanos(); + long selectionEndTime = ctx.getSelectionRange().getEndTime().toNanos(); + long startTime = ctx.getWindowRange().getStartTime().toNanos(); + long duration = ctx.getWindowRange().getEndTime().toNanos() - startTime; if ((fTimeRangeRequest != null) && !fTimeRangeRequest.isCompleted()) { fTimeRangeRequest.cancel(); @@ -926,8 +927,8 @@ public class HistogramView extends TmfView implements ITmfTimeAligned { TmfTimeRange timeRange = fTrace.getTimeRange(); if (!timeRange.equals(TmfTimeRange.NULL_RANGE)) { - fTraceStartTime = timeRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fTraceEndTime = timeRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fTraceStartTime = timeRange.getStartTime().toNanos(); + fTraceEndTime = timeRange.getEndTime().toNanos(); } return timeRange; } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemViewer.java index 34205de860..cb29e26020 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemViewer.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/statesystem/TmfStateSystemViewer.java @@ -170,7 +170,7 @@ public class TmfStateSystemViewer extends AbstractTmfTreeViewer { fSelection = start; } else { TmfTraceContext ctx = TmfTraceManager.getInstance().getCurrentTraceContext(); - fSelection = ctx.getSelectionRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fSelection = ctx.getSelectionRange().getStartTime().toNanos(); } if (getTrace() == null) { diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartEvent.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartEvent.java index b2406292db..734d394f04 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartEvent.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartEvent.java @@ -29,8 +29,6 @@ import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.TimeEvent; */ public class TimeChartEvent implements ITimeEvent { - private static final byte TIMESTAMP_SCALE = -9; - private final TimeChartAnalysisEntry fParentEntry; private long fTime; private long fDuration; @@ -60,7 +58,7 @@ public class TimeChartEvent implements ITimeEvent { public TimeChartEvent(TimeChartAnalysisEntry parentEntry, ITmfEvent event, long rank, TimeChartDecorationProvider decorationProvider) { fParentEntry = parentEntry; - fTime = event.getTimestamp().normalize(0, TIMESTAMP_SCALE).getValue(); + fTime = event.getTimestamp().toNanos(); fDuration = 0; fFirstRank = fLastRank = rank; fRankRangeList = new RankRangeList(rank); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartView.java index 8abdb105ab..98990cf2a9 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timechart/TimeChartView.java @@ -159,8 +159,8 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I TmfTimeRange range = TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange(); updateTraceEntry(fTimeAnalysisEntry, Long.MAX_VALUE, - range.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(), - range.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue()); + range.getStartTime().toNanos(), + range.getEndTime().toNanos()); } } @@ -493,7 +493,7 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I if (event == null) { break; } - long eventTime = event.getTimestamp().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long eventTime = event.getTimestamp().toNanos(); if (eventTime >= timeChartEvent.getTime() && eventTime <= timeChartEvent.getTime() + timeChartEvent.getDuration()) { priority = Math.min(priority, ColorSettingsManager.getColorSettingPriority(event)); } @@ -650,8 +650,8 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I } } TmfTraceContext ctx = TmfTraceManager.getInstance().getCurrentTraceContext(); - long beginTime = ctx.getSelectionRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long endTime = ctx.getSelectionRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long beginTime = ctx.getSelectionRange().getStartTime().toNanos(); + long endTime = ctx.getSelectionRange().getEndTime().toNanos(); fViewer.setSelectionRange(beginTime, endTime, false); } } @@ -683,8 +683,10 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I */ @TmfSignalHandler public void selectionRangeUpdated(TmfSelectionRangeUpdatedSignal signal) { - final long beginTime = signal.getBeginTime().normalize(0, TIMESTAMP_SCALE).getValue(); - final long endTime = signal.getEndTime().normalize(0, TIMESTAMP_SCALE).getValue(); + final long beginTime = signal.getBeginTime().toNanos(); + final long endTime = signal.getEndTime().toNanos(); + + Display.getDefault().asyncExec(new Runnable() { @Override public void run() { @@ -714,8 +716,8 @@ public class TimeChartView extends TmfView implements ITimeGraphRangeListener, I if (signal.getSource() == this) { return; } - final long startTime = signal.getCurrentRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - final long endTime = signal.getCurrentRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long startTime = signal.getCurrentRange().getStartTime().toNanos(); + final long endTime = signal.getCurrentRange().getEndTime().toNanos(); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java index 6ad0a95602..d54ff4883f 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java @@ -77,7 +77,6 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; -import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; @@ -1391,8 +1390,8 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA if (signal.getSource() == this || fTrace == null) { return; } - final long beginTime = signal.getBeginTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - final long endTime = signal.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long beginTime = signal.getBeginTime().toNanos(); + final long endTime = signal.getEndTime().toNanos(); Display.getDefault().asyncExec(new Runnable() { @Override @@ -1425,8 +1424,8 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA if (signal.getCurrentRange().getIntersection(fTrace.getTimeRange()) == null) { return; } - final long startTime = signal.getCurrentRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - final long endTime = signal.getCurrentRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + final long startTime = signal.getCurrentRange().getStartTime().toNanos(); + final long endTime = signal.getCurrentRange().getEndTime().toNanos(); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { @@ -1469,8 +1468,8 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA if (fEntryList == null) { rebuild(); } else { - fStartTime = fTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fEndTime = fTrace.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + fStartTime = fTrace.getStartTime().toNanos(); + fEndTime = fTrace.getEndTime().toNanos(); refresh(); } } @@ -1734,10 +1733,10 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA fTimeGraphWrapper.getTimeGraphViewer().setTimeBounds(startBound, endBound); TmfTraceContext ctx = TmfTraceManager.getInstance().getCurrentTraceContext(); - long selectionBeginTime = fTrace == null ? SWT.DEFAULT : ctx.getSelectionRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long selectionEndTime = fTrace == null ? SWT.DEFAULT : ctx.getSelectionRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long startTime = fTrace == null ? SWT.DEFAULT : ctx.getWindowRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long endTime = fTrace == null ? SWT.DEFAULT : ctx.getWindowRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long selectionBeginTime = fTrace == null ? SWT.DEFAULT : ctx.getSelectionRange().getStartTime().toNanos(); + long selectionEndTime = fTrace == null ? SWT.DEFAULT : ctx.getSelectionRange().getEndTime().toNanos(); + long startTime = fTrace == null ? SWT.DEFAULT : ctx.getWindowRange().getStartTime().toNanos(); + long endTime = fTrace == null ? SWT.DEFAULT : ctx.getWindowRange().getEndTime().toNanos(); startTime = (fStartTime == Long.MAX_VALUE ? SWT.DEFAULT : Math.max(startTime, fStartTime)); endTime = (fEndTime == Long.MIN_VALUE ? SWT.DEFAULT : Math.min(endTime, fEndTime)); fTimeGraphWrapper.getTimeGraphViewer().setSelectionRange(selectionBeginTime, selectionEndTime, false); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java index 79adc7bf4a..f70075d85c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java @@ -31,15 +31,14 @@ import org.eclipse.tracecompass.tmf.core.component.TmfComponent; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.ITmfEventField; import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest; -import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest.ExecutionType; import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest; -import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler; -import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal; import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal; +import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; @@ -1181,7 +1180,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, fLock.lock(); try { TmfTimeRange currentRange = TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange(); - long offset = fTrace == null ? 0 : currentRange.getEndTime().getDelta(currentRange.getStartTime()).normalize(0, startTime.getScale()).getValue(); + long offset = fTrace == null ? 0 : currentRange.getEndTime().getDelta(currentRange.getStartTime()).toNanos(); TmfTimestamp initialEndOfWindow = new TmfTimestamp(startTime.getValue() + offset, startTime.getScale()); return new TmfTimeRange(startTime, initialEndOfWindow); }