From 4df4581d605de80a3ca2a5085c7b4a20e8533203 Mon Sep 17 00:00:00 2001 From: francois Date: Sat, 11 Feb 2012 14:32:03 -0500 Subject: [PATCH] Integrate the TmfEvent+ITmfTimestamp API --- .../lttng/core/event/LttngTimestamp.java | 2 +- .../core/request/LttngBaseEventRequest.java | 8 +-- .../evProcessor/state/AbsStateUpdate.java | 12 ++-- .../state/StateUpdateHandlers.java | 11 ++-- .../core/state/trace/IStateTraceManager.java | 4 +- .../core/state/trace/StateTraceManager.java | 17 +++--- .../lttng/core/trace/LTTngExperiment.java | 11 ++-- .../lttng/core/trace/LTTngTrace.java | 7 ++- .../ui/views/common/AbsTimeUpdateView.java | 9 +-- .../ui/views/histogram/HistogramView.java | 3 +- .../ui/views/timeframe/SpinnerGroup.java | 29 +++++----- .../ui/views/timeframe/TimeFrameView.java | 41 +++++++------- .../core/tests/event/TmfTimestampTest.java | 6 +- .../core/tests/trace/TmfCheckpointTest.java | 7 ++- .../tmf/core/tests/trace/TmfLocationTest.java | 3 +- .../tmf/core/component/TmfEventProvider.java | 6 +- .../tmf/core/event/ITmfTimestamp.java | 8 ++- .../linuxtools/tmf/core/event/TmfEvent.java | 12 ++-- .../tmf/core/event/TmfTimeRange.java | 28 +++++----- .../tmf/core/event/TmfTimestamp.java | 20 +++---- .../tmf/core/experiment/TmfExperiment.java | 55 ++++++++++--------- .../core/experiment/TmfExperimentContext.java | 8 +-- .../request/TmfCoalescedEventRequest.java | 8 +-- .../tmf/core/signal/TmfRangeSynchSignal.java | 8 +-- .../tmf/core/signal/TmfTimeSynchSignal.java | 8 +-- .../linuxtools/tmf/core/trace/ITmfTrace.java | 10 ++-- .../tmf/core/trace/TmfCheckpoint.java | 12 ++-- .../linuxtools/tmf/core/trace/TmfTrace.java | 29 +++++----- .../uml2sd/ITmfAsyncSequenceDiagramEvent.java | 4 +- .../uml2sd/ITmfSyncSequenceDiagramEvent.java | 4 +- .../uml2sd/TmfAsyncSequenceDiagramEvent.java | 7 ++- .../uml2sd/TmfSyncSequenceDiagramEvent.java | 6 +- .../tmf/ui/parsers/custom/CustomEvent.java | 3 +- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 2 +- .../tmf/ui/viewers/events/TmfEventsTable.java | 3 +- .../tmf/ui/views/uml2sd/DrawableToolTip.java | 5 +- .../tmf/ui/views/uml2sd/SDWidget.java | 9 +-- .../ui/views/uml2sd/TimeCompressionBar.java | 9 +-- .../ui/views/uml2sd/core/AsyncMessage.java | 13 +++-- .../tmf/ui/views/uml2sd/core/BasicFrame.java | 21 +++---- .../uml2sd/core/ExecutionOccurrence.java | 7 ++- .../tmf/ui/views/uml2sd/core/Frame.java | 3 +- .../tmf/ui/views/uml2sd/core/ITimeRange.java | 6 +- .../tmf/ui/views/uml2sd/core/SDTimeEvent.java | 8 +-- .../tmf/ui/views/uml2sd/core/SyncMessage.java | 9 +-- .../uml2sd/impl/TmfUml2SDSyncLoader.java | 17 +++--- 46 files changed, 274 insertions(+), 244 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java index 90aad15736..9fd4f773b6 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/event/LttngTimestamp.java @@ -46,7 +46,7 @@ public class LttngTimestamp extends TmfTimestamp { * * @param oldEventTime The timestamp object we want to copy from */ - public LttngTimestamp(TmfTimestamp oldEventTime) { + public LttngTimestamp(ITmfTimestamp oldEventTime) { this(oldEventTime.getValue()); } diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java index f6b7606fe4..5b13533c16 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/request/LttngBaseEventRequest.java @@ -13,8 +13,8 @@ package org.eclipse.linuxtools.lttng.core.request; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; @@ -39,7 +39,7 @@ public abstract class LttngBaseEventRequest extends TmfEventRequest * time of the request for base events is adjusted to the nearest check * point */ - private final TmfTimestamp fDispatchTime; + private final ITmfTimestamp fDispatchTime; // ======================================================================== // Constructors @@ -53,7 +53,7 @@ public abstract class LttngBaseEventRequest extends TmfEventRequest * @param traceState * @param listener */ - public LttngBaseEventRequest(TmfTimeRange range, TmfTimestamp dispatchTime, long offset, int nbEvents, + public LttngBaseEventRequest(TmfTimeRange range, ITmfTimestamp dispatchTime, long offset, int nbEvents, int maxBlockSize, ITmfDataRequest.ExecutionType execType) { super(LttngEvent.class, range, (int) offset, nbEvents, maxBlockSize, execType); fDispatchTime = dispatchTime; @@ -119,7 +119,7 @@ public abstract class LttngBaseEventRequest extends TmfEventRequest /** * @return The time to start dispatching events to the application */ - public TmfTimestamp getDispatchTime() { + public ITmfTimestamp getDispatchTime() { return fDispatchTime; } diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java index 03bf13e2d2..fe65963ce3 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/AbsStateUpdate.java @@ -25,7 +25,7 @@ import org.eclipse.linuxtools.lttng.core.state.model.LttngExecutionState; import org.eclipse.linuxtools.lttng.core.state.model.LttngIRQState; import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; public abstract class AbsStateUpdate extends AbsStateProcessing implements ILttngEventProcessor { @@ -39,7 +39,7 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements // push and pop from stack // ======================================================================= protected void push_state(Long cpu, StateStrings.ExecutionMode execMode, - String submode, int subModeId, TmfTimestamp eventTime, LttngTraceState traceSt) { + String submode, int subModeId, ITmfTimestamp eventTime, LttngTraceState traceSt) { LttngProcessState process = traceSt.getRunning_process().get(cpu); LttngExecutionState exe_state = new LttngExecutionState(); @@ -55,7 +55,7 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements } protected void pop_state(Long cpu, StateStrings.ExecutionMode execMode, - LttngTraceState traceSt, TmfTimestamp eventTime) { + LttngTraceState traceSt, ITmfTimestamp eventTime) { LttngProcessState process = traceSt.getRunning_process().get(cpu); @@ -200,7 +200,7 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements * @return */ protected LttngProcessState create_process(LttngTraceState traceSt, - Long cpu, Long pid, Long tgid, final TmfTimestamp timestamp) { + Long cpu, Long pid, Long tgid, final ITmfTimestamp timestamp) { LttngProcessState process = create_process(traceSt, cpu, pid, tgid, ProcessStatus.LTTV_STATE_UNNAMED.getInName(), timestamp); return process; @@ -217,7 +217,7 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements */ protected LttngProcessState create_process(LttngTraceState traceSt, Long cpu, Long pid, Long tgid, String name, - final TmfTimestamp timestamp) { + final ITmfTimestamp timestamp) { LttngProcessState process; process = new LttngProcessState(cpu, pid, tgid, name, timestamp.getValue(), traceSt.getTraceId()); traceSt.addProcessState(process); @@ -233,7 +233,7 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements * @return */ protected LttngProcessState lttv_state_find_process_or_create( - LttngTraceState ts, Long cpu, Long pid, final TmfTimestamp timestamp) { + LttngTraceState ts, Long cpu, Long pid, final ITmfTimestamp timestamp) { LttngProcessState process = lttv_state_find_process(ts, cpu, pid); /* Put ltt_time_zero creation time for non existing processes */ diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java index d4c3ab74bc..c65301b14c 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/evProcessor/state/StateUpdateHandlers.java @@ -37,6 +37,7 @@ import org.eclipse.linuxtools.lttng.core.state.model.LttngProcessState; import org.eclipse.linuxtools.lttng.core.state.model.LttngSoftIRQState; import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; import org.eclipse.linuxtools.lttng.core.state.model.LttngTrapState; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** @@ -791,7 +792,7 @@ class StateUpdateHandlers { public boolean process(LttngEvent trcEvent, LttngTraceState traceSt) { Long cpu = trcEvent.getCpuId(); - TmfTimestamp eventTime = trcEvent.getTimestamp(); + ITmfTimestamp eventTime = trcEvent.getTimestamp(); LttngProcessState process = traceSt.getRunning_process().get( cpu); @@ -939,7 +940,7 @@ class StateUpdateHandlers { Long cpu = trcEvent.getCpuId(); LttngProcessState process = traceSt.getRunning_process().get( cpu); - TmfTimestamp timeStamp = trcEvent.getTimestamp(); + ITmfTimestamp timeStamp = trcEvent.getTimestamp(); // /* Parent PID */ // Long parent_pid = getAFieldLong(trcEvent, traceSt, @@ -1311,7 +1312,7 @@ class StateUpdateHandlers { */ /* else, if stack[0] is unknown, set to user mode, running */ LttngProcessState[] processes = traceSt.getProcesses(); - TmfTimestamp time = trcEvent.getTimestamp(); + ITmfTimestamp time = trcEvent.getTimestamp(); for (int pos = 0; pos < processes.length; pos++) { fix_process(processes[pos], time); @@ -1334,7 +1335,7 @@ class StateUpdateHandlers { * @param timestamp */ private void fix_process(LttngProcessState process, - TmfTimestamp timestamp) { + ITmfTimestamp timestamp) { LttngExecutionState es; @@ -1500,7 +1501,7 @@ class StateUpdateHandlers { if (process == null) { parent_process = lttv_state_find_process(traceSt, ANY_CPU, parent_pid); - TmfTimestamp eventTime = trcEvent.getTimestamp(); + ITmfTimestamp eventTime = trcEvent.getTimestamp(); process = create_process(traceSt, cpu, pid, tgid, command, eventTime); if (parent_process != null) { diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java index acd7b4d2c5..a8e087a9ae 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/IStateTraceManager.java @@ -2,8 +2,8 @@ package org.eclipse.linuxtools.lttng.core.state.trace; import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; import org.eclipse.linuxtools.lttng.core.state.model.LttngTraceState; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; @@ -45,7 +45,7 @@ public interface IStateTraceManager { * state, null sent if input is invalid */ public abstract TmfCheckpoint restoreCheckPointByTimestamp( - TmfTimestamp eventTime); + ITmfTimestamp eventTime); /** * Restore to the closest checkpoint from index diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java index 3533589772..8b57f793b8 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/state/trace/StateTraceManager.java @@ -18,8 +18,8 @@ import java.util.Vector; import org.eclipse.linuxtools.lttng.core.TraceDebug; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent; -import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.core.event.LttngSyntheticEvent.SequenceInd; +import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.core.model.LTTngTreeNode; import org.eclipse.linuxtools.lttng.core.request.ILttngSyntEventRequest; import org.eclipse.linuxtools.lttng.core.request.IRequestStatusListener; @@ -32,6 +32,7 @@ import org.eclipse.linuxtools.lttng.core.state.model.StateModelFactory; import org.eclipse.linuxtools.lttng.core.state.resource.ILttngStateContext; import org.eclipse.linuxtools.lttng.core.trace.LTTngTextTrace; import org.eclipse.linuxtools.lttng.core.trace.LTTngTrace; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -54,7 +55,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag private TmfExperiment fExperiment = null; // immutable Objects - private final ITmfTrace fTrace; + private final ITmfTrace fTrace; private int fcpuNumber = -1; private final ITransEventProcessor fStateUpdateProcessor; @@ -80,7 +81,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @param trace * @throws LttngStateException */ - public StateTraceManager(Long id, LTTngTreeNode parent, String name, ITmfTrace trace) throws LttngStateException { + public StateTraceManager(Long id, LTTngTreeNode parent, String name, ITmfTrace trace) throws LttngStateException { super(id, parent, name, trace); if (trace == null) { @@ -128,7 +129,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see org.eclipse.linuxtools.lttng.state.IStateManager#getEventLog() */ @Override - public ITmfTrace getStateTrace() { + public ITmfTrace getStateTrace() { return fTrace; } @@ -145,7 +146,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * * @return boolean True if a checkpoint was saved, false otherwise */ - private void saveCheckPointIfNeeded(Long eventCounter, TmfTimestamp eventTime) { + private void saveCheckPointIfNeeded(Long eventCounter, ITmfTimestamp eventTime) { // Save a checkpoint every LTTNG_STATE_SAVE_INTERVAL event if ((eventCounter.longValue() % fcheckPointInterval) == 0) { @@ -194,7 +195,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag */ @Override @SuppressWarnings("unchecked") - public TmfCheckpoint restoreCheckPointByTimestamp(TmfTimestamp eventTime) { + public TmfCheckpoint restoreCheckPointByTimestamp(ITmfTimestamp eventTime) { TmfTimeRange experimentRange = fExperiment.getTimeRange(); TmfCheckpoint checkpoint = new TmfCheckpoint(fTrace.getStartTime(), new TmfLocation(0L)); @@ -433,7 +434,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @param count * @param time */ - public void saveCheckPoint(Long count, TmfTimestamp time) { + public void saveCheckPoint(Long count, ITmfTimestamp time) { } } @@ -513,7 +514,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * () */ @Override - public ITmfTrace getTraceIdRef() { + public ITmfTrace getTraceIdRef() { return fTrace; } diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java index 0cae078123..92a7b42fb4 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngExperiment.java @@ -15,6 +15,7 @@ package org.eclipse.linuxtools.lttng.core.trace; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; import org.eclipse.linuxtools.lttng.core.event.LttngTimestamp; import org.eclipse.linuxtools.lttng.jni.JniTrace; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -22,8 +23,8 @@ import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentContext; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperimentLocation; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; -import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; @@ -136,7 +137,7 @@ public class LTTngExperiment extends TmfExperiment { return null; } int trace = TmfExperimentContext.NO_TRACE; - TmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; if (eventArray.length == 1) { if (eventArray[0] != null) { timestamp = eventArray[0].getTimestamp(); @@ -146,7 +147,7 @@ public class LTTngExperiment extends TmfExperiment { for (int i = 0; i < eventArray.length; i++) { TmfEvent event = eventArray[i]; if (event != null && event.getTimestamp() != null) { - TmfTimestamp otherTS = event.getTimestamp(); + ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { trace = i; timestamp = otherTS; @@ -199,7 +200,7 @@ public class LTTngExperiment extends TmfExperiment { ; return; } - for (ITmfTrace trace : fTraces) { + for (ITmfTrace trace : fTraces) { if (trace instanceof LTTngTrace) { JniTrace jniTrace = ((LTTngTrace) trace).getCurrentJniTrace(); if (jniTrace != null && !jniTrace.isLiveTraceSupported()) { @@ -229,7 +230,7 @@ public class LTTngExperiment extends TmfExperiment { } long startTime = Long.MAX_VALUE; long endTime = Long.MIN_VALUE; - for (ITmfTrace trace : getTraces()) { + for (ITmfTrace trace : getTraces()) { if (trace instanceof LTTngTrace) { LTTngTrace lttngTrace = (LTTngTrace) trace; JniTrace jniTrace = lttngTrace.getCurrentJniTrace(); diff --git a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java index 97f892f7df..88fe458559 100644 --- a/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/lttng/core/trace/LTTngTrace.java @@ -33,6 +33,7 @@ import org.eclipse.linuxtools.lttng.jni.JniTracefile; import org.eclipse.linuxtools.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; @@ -418,7 +419,7 @@ public class LTTngTrace extends TmfTrace { * @see org.eclipse.linuxtools.tmf.core.trace.TmfContext */ @Override - public synchronized TmfContext seekEvent(TmfTimestamp timestamp) { + public synchronized TmfContext seekEvent(ITmfTimestamp timestamp) { if (PrintDebug) { System.out.println("seekEvent(timestamp) timestamp -> " + timestamp); //$NON-NLS-1$ @@ -462,7 +463,7 @@ public class LTTngTrace extends TmfTrace { System.out.println("seekEvent(position) position -> " + position); //$NON-NLS-1$ } - TmfTimestamp timestamp = null; + ITmfTimestamp timestamp = null; long index = position / getCacheSize(); // Get the timestamp of the closest check point to the given position @@ -607,7 +608,7 @@ public class LTTngTrace extends TmfTrace { // this method was extracted for profiling purposes private void setPreviousAndCurrentTimes(TmfContext context, LttngEvent returnedEvent, LttngLocation curLocation) { - TmfTimestamp eventTimestamp = returnedEvent.getTimestamp(); + ITmfTimestamp eventTimestamp = returnedEvent.getTimestamp(); // long eventTime = eventTimestamp.getValue(); previousLocation.setOperationTime(eventTimestamp.getValue()); curLocation.setOperationTime(eventTimestamp.getValue()); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java index 9fab6d2a36..6e8df14d7d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java @@ -27,12 +27,13 @@ import org.eclipse.linuxtools.lttng.core.request.RequestStartedSignal; import org.eclipse.linuxtools.lttng.core.state.evProcessor.ITransEventProcessor; import org.eclipse.linuxtools.lttng.ui.TraceDebug; import org.eclipse.linuxtools.lttng.ui.model.trange.ItemContainer; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; -import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; +import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest; import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentDisposedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; @@ -443,7 +444,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu Long fCount = getSynEventCount(); ITransEventProcessor processor = getProcessor(); - TmfTimestamp frunningTimeStamp; + ITmfTimestamp frunningTimeStamp; /* * (non-Javadoc) @@ -547,8 +548,8 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu * @return */ protected TmfTimeRange getInitTRange(TmfTimeRange experimentTRange) { - TmfTimestamp expStartTime = experimentTRange.getStartTime(); - TmfTimestamp expEndTime = experimentTRange.getEndTime(); + ITmfTimestamp expStartTime = experimentTRange.getStartTime(); + ITmfTimestamp expEndTime = experimentTRange.getEndTime(); TmfTimestamp initialEndOfWindow = new LttngTimestamp(expStartTime .getValue() + INITIAL_WINDOW_OFFSET); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java index 32f9dc11bf..d9d92eabab 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java @@ -17,6 +17,7 @@ package org.eclipse.linuxtools.lttng.ui.views.histogram; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; @@ -366,7 +367,7 @@ public class HistogramView extends TmfView { assert (signal != null); // Update the selected event time - TmfTimestamp currentTime = signal.getCurrentTime(); + ITmfTimestamp currentTime = signal.getCurrentTime(); fCurrentTimestamp = currentTime.getValue(); // Notify the relevant widgets diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java index eb0686581c..d08ee40fa5 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/SpinnerGroup.java @@ -12,6 +12,7 @@ package org.eclipse.linuxtools.lttng.ui.views.timeframe; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.swt.SWT; @@ -52,17 +53,17 @@ public class SpinnerGroup { private Spinner nanosec; // The valid time range - start time - private TmfTimestamp startTime; + private ITmfTimestamp startTime; private int startSeconds; private int startNanosec; // The valid time range - end time - private TmfTimestamp endTime; + private ITmfTimestamp endTime; private int endSeconds; private int endNanosec; // The current time value - private TmfTimestamp currentTime; + private ITmfTimestamp currentTime; private int currentSeconds; private int currentNanosec; @@ -81,7 +82,7 @@ public class SpinnerGroup { * @param range - the valid time range (start/end time) * @param current - the current time */ - public SpinnerGroup(TimeFrameView owner, Composite parent, String groupName, TmfTimeRange range, TmfTimestamp current) { + public SpinnerGroup(TimeFrameView owner, Composite parent, String groupName, TmfTimeRange range, ITmfTimestamp current) { fOwner = owner; @@ -147,15 +148,15 @@ public class SpinnerGroup { // Get/Set // ==================================================================== - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return startTime; } - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return endTime; } - public TmfTimestamp getCurrentTime() { + public ITmfTimestamp getCurrentTime() { return currentTime; } @@ -169,7 +170,7 @@ public class SpinnerGroup { return range; } - public void setStartTime(TmfTimestamp ts) { + public void setStartTime(ITmfTimestamp ts) { try { startTime = (TmfTimestamp) ts.getDelta(new TmfTimestamp(0, NS_SCALING_FACTOR)); startSeconds = (int) (startTime.getValue() / NS_PER_SECOND); @@ -179,7 +180,7 @@ public class SpinnerGroup { } } - public void setEndTime(TmfTimestamp ts) { + public void setEndTime(ITmfTimestamp ts) { try { endTime = (TmfTimestamp) ts.getDelta(new TmfTimestamp(0, NS_SCALING_FACTOR)); endSeconds = (int) (endTime.getValue() / NS_PER_SECOND); @@ -189,7 +190,7 @@ public class SpinnerGroup { } } - public void setCurrentTime(TmfTimestamp ts) { + public void setCurrentTime(ITmfTimestamp ts) { try { currentTime = (TmfTimestamp) ts.getDelta(new TmfTimestamp(0, NS_SCALING_FACTOR)); currentSeconds = (int) (currentTime.getValue() / NS_PER_SECOND); @@ -214,12 +215,12 @@ public class SpinnerGroup { * @param range * @param current */ - public void setContent(TmfTimeRange range, TmfTimestamp current) { + public void setContent(TmfTimeRange range, ITmfTimestamp current) { if (range != null) { // Extract the time range - TmfTimestamp start = range.getStartTime(); - TmfTimestamp end = range.getEndTime(); + ITmfTimestamp start = range.getStartTime(); + ITmfTimestamp end = range.getEndTime(); // Assume start time is OK setStartTime(start); @@ -256,7 +257,7 @@ public class SpinnerGroup { * @param range * @param current */ - public void setValue(TmfTimestamp current) { + public void setValue(ITmfTimestamp current) { // Make sure [start time <= current time <= end time] // If not: current = min(max(start, current), end); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java index 87e20b2b7d..48be6c3079 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.lttng.ui.views.timeframe; import org.eclipse.linuxtools.lttng.core.event.LttngEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; @@ -61,10 +62,10 @@ public class TimeFrameView extends TmfView { // ------------------------------------------------------------------------ // The event log timestamp characteristics - private TmfTimestamp fTraceStartTime = new TmfTimestamp(); - private TmfTimestamp fTraceEndTime = new TmfTimestamp(); + private ITmfTimestamp fTraceStartTime = new TmfTimestamp(); + private ITmfTimestamp fTraceEndTime = new TmfTimestamp(); - private TmfTimestamp fCurrentTime = new TmfTimestamp(); + private ITmfTimestamp fCurrentTime = new TmfTimestamp(); private TmfTimeRange fTraceTimeRange = new TmfTimeRange(fTraceStartTime, fTraceEndTime); private TmfTimeRange fTraceSpan = new TmfTimeRange(fTraceStartTime, fTraceEndTime); @@ -145,10 +146,10 @@ public class TimeFrameView extends TmfView { boolean trangeUpdated = false; // Collect the data - TmfTimestamp startTime = fStartGroup.getCurrentTime(); - TmfTimestamp endTime = fEndGroup.getCurrentTime(); - TmfTimestamp timeRange = fRangeGroup.getCurrentTime(); - TmfTimestamp currentTime = fCurrentGroup.getCurrentTime(); + ITmfTimestamp startTime = fStartGroup.getCurrentTime(); + ITmfTimestamp endTime = fEndGroup.getCurrentTime(); + ITmfTimestamp timeRange = fRangeGroup.getCurrentTime(); + ITmfTimestamp currentTime = fCurrentGroup.getCurrentTime(); // If startTime was set beyond endTime, adjust endTime and interval if (trigger == fStartGroup) { @@ -170,7 +171,7 @@ public class TimeFrameView extends TmfView { if (trigger == fRangeGroup) { long start = startTime.getValue(); long span = timeRange.getValue(); - TmfTimestamp ts = new TmfTimestamp(start + span, startTime.getScale(), 0); + ITmfTimestamp ts = new TmfTimestamp(start + span, startTime.getScale(), 0); if (ts.compareTo(fTraceEndTime, false) > 0) { ts = fTraceEndTime.clone(); } @@ -181,7 +182,7 @@ public class TimeFrameView extends TmfView { // Compute the new time range TmfTimeRange subrange = new TmfTimeRange(startTime, endTime); int scale = startTime.getScale(); - TmfTimestamp interval = (TmfTimestamp) startTime.getDelta(endTime); + ITmfTimestamp interval = (TmfTimestamp) startTime.getDelta(endTime); // Update the spinner groups fStartGroup.setContent(fTraceTimeRange, startTime); @@ -229,10 +230,10 @@ public class TimeFrameView extends TmfView { @Override public void handleEvent(Event event) { int ratio = fSlider.getSelection(); - TmfTimestamp span = fCurrentGroup.getSpan(); + ITmfTimestamp span = fCurrentGroup.getSpan(); long value = span.getValue() * ratio / SLIDER_RANGE; - TmfTimestamp start = fCurrentGroup.getStartTime(); - TmfTimestamp current = new TmfTimestamp(start.getValue() + value, start.getScale(), 0); + ITmfTimestamp start = fCurrentGroup.getStartTime(); + ITmfTimestamp current = new TmfTimestamp(start.getValue() + value, start.getScale(), 0); fCurrentGroup.setValue(current); } }); @@ -243,7 +244,7 @@ public class TimeFrameView extends TmfView { * @param range * @param timestamp */ - private void updateSlider(TmfTimeRange range, TmfTimestamp timestamp) { + private void updateSlider(TmfTimeRange range, ITmfTimestamp timestamp) { // Ignore update if disposed if (fSlider.isDisposed()) @@ -307,10 +308,10 @@ public class TimeFrameView extends TmfView { fCurrentTime = fTraceStartTime; - TmfTimestamp delta = (TmfTimestamp) fTraceStartTime.getDelta(fTraceEndTime); + ITmfTimestamp delta = fTraceStartTime.getDelta(fTraceEndTime); fTraceSpan = new TmfTimeRange(new TmfTimestamp(0, fScale, 0), delta); // fRangeGroup.setContent(fTraceSpan, delta); - TmfTimestamp start = new TmfTimestamp(1, (byte) -1, 0); + ITmfTimestamp start = new TmfTimestamp(1, (byte) -1, 0); fRangeGroup.setContent(fTraceSpan, start); } @@ -332,7 +333,7 @@ public class TimeFrameView extends TmfView { fEndGroup.setContent(fTraceTimeRange, fTraceEndTime); fCurrentGroup.setContent(fTraceTimeRange, fCurrentGroup.getCurrentTime()); - TmfTimestamp delta = (TmfTimestamp) fTraceStartTime.getDelta(fTraceEndTime); + ITmfTimestamp delta = fTraceStartTime.getDelta(fTraceEndTime); fTraceSpan = new TmfTimeRange(new TmfTimestamp(0, fScale, 0), delta); fRangeGroup.setContent(fTraceSpan, delta); } @@ -345,8 +346,8 @@ public class TimeFrameView extends TmfView { if (signal.getSource() != this) { // Update the time frame TmfTimeRange selTimeRange = signal.getCurrentRange(); - TmfTimestamp selStart = (TmfTimestamp) selTimeRange.getStartTime().normalize(0, fScale); - TmfTimestamp selEnd = (TmfTimestamp) selTimeRange.getEndTime().normalize(0, fScale); + ITmfTimestamp selStart = selTimeRange.getStartTime().normalize(0, fScale); + ITmfTimestamp selEnd = selTimeRange.getEndTime().normalize(0, fScale); fupdateExternalListeners = false; // Update the widgets and prevent broadcast notifications to @@ -355,7 +356,7 @@ public class TimeFrameView extends TmfView { fStartGroup.setContent(fTraceTimeRange, selStart); fEndGroup.setContent(fTraceTimeRange, selEnd); - TmfTimestamp delta = (TmfTimestamp) selStart.getDelta(selEnd); + ITmfTimestamp delta = selStart.getDelta(selEnd); fRangeGroup.setContent(fTraceSpan, delta); } @@ -374,7 +375,7 @@ public class TimeFrameView extends TmfView { if (signal.getSource() != this) { // prevent loop to external notifications fupdateExternalListeners = false; - fCurrentTime = (TmfTimestamp) signal.getCurrentTime().normalize(0, fStartGroup.getCurrentTime().getScale()); + fCurrentTime = signal.getCurrentTime().normalize(0, fStartGroup.getCurrentTime().getScale()); if (fStartGroup.getCurrentTime().compareTo(fCurrentTime, false) > 0) { fStartGroup.setContent(new TmfTimeRange(fCurrentTime, fEndGroup.getCurrentTime()), fCurrentTime); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java index 5733064efe..30be0b8345 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java @@ -40,8 +40,8 @@ public class TmfTimestampTest extends TestCase { private final TmfTimestamp ts0copy2 = new TmfTimestamp(); private final TmfTimestamp ts1copy2 = new TmfTimestamp(12345); - private final TmfTimestamp bigBang = new TmfTimestamp(TmfTimestamp.BigBang); - private final TmfTimestamp bigCrunch = new TmfTimestamp(TmfTimestamp.BigCrunch); + private final ITmfTimestamp bigBang = TmfTimestamp.BigBang; + private final ITmfTimestamp bigCrunch = TmfTimestamp.BigCrunch; // ------------------------------------------------------------------------ // Housekeping @@ -196,7 +196,7 @@ public class TmfTimestampTest extends TestCase { } public void testClone() throws Exception { - TmfTimestamp timestamp = ts0.clone(); + ITmfTimestamp timestamp = ts0.clone(); assertEquals("clone", timestamp, ts0); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java index 31eaf26421..ed5f738664 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.TestCase; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.TmfCheckpoint; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; @@ -30,9 +31,9 @@ public class TmfCheckpointTest extends TestCase { // Variables // ------------------------------------------------------------------------ - TmfTimestamp fTimestamp1 = new TmfTimestamp(); - TmfTimestamp fTimestamp2 = TmfTimestamp.BigBang; - TmfTimestamp fTimestamp3 = TmfTimestamp.BigCrunch; + ITmfTimestamp fTimestamp1 = new TmfTimestamp(); + ITmfTimestamp fTimestamp2 = TmfTimestamp.BigBang; + ITmfTimestamp fTimestamp3 = TmfTimestamp.BigCrunch; Long aLong1 = 12345L; Long aLong2 = 23456L; diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java index ccc57b1f74..132a63e0e4 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.core.tests.trace; import junit.framework.TestCase; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.TmfLocation; @@ -98,7 +99,7 @@ public class TmfLocationTest extends TestCase { public void testSetLocation() { String aString2 = "some other location"; Long aLong2 = 1234567L; - TmfTimestamp aTimestamp2 = TmfTimestamp.BigBang; + TmfTimestamp aTimestamp2 = (TmfTimestamp) TmfTimestamp.BigBang; fLocation1.setLocation(aString2); fLocation2.setLocation(aLong2); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index cb32ef5555..9f7294b289 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -13,13 +13,13 @@ package org.eclipse.linuxtools.tmf.core.component; import org.eclipse.linuxtools.tmf.core.Tracer; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; +import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest; import org.eclipse.linuxtools.tmf.core.request.TmfCoalescedEventRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; -import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest.ExecutionType; /** * TmfEventProvider @@ -59,7 +59,7 @@ public abstract class TmfEventProvider extends TmfDataProvid public boolean isCompleted(ITmfDataRequest request, T data, int nbRead) { boolean requestCompleted = super.isCompleted(request, data, nbRead); if (!requestCompleted && request instanceof ITmfEventRequest) { - TmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); + ITmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); return data.getTimestamp().compareTo(endTime, false) > 0; } return requestCompleted; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java index 853f254737..02658822a6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java @@ -16,7 +16,7 @@ package org.eclipse.linuxtools.tmf.core.event; * ITmfTimestamp *

*/ -public interface ITmfTimestamp { +public interface ITmfTimestamp extends Cloneable, Comparable { /** * @return the timestamp value (magnitude) @@ -59,4 +59,10 @@ public interface ITmfTimestamp { */ public ITmfTimestamp getDelta(ITmfTimestamp ts); + // Cloneable + public ITmfTimestamp clone(); + + // Comparable + public int compareTo(ITmfTimestamp ts); + } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index c8ddeb5417..cf6cf69280 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -37,7 +37,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { // Attributes // ------------------------------------------------------------------------ - protected TmfTimestamp fTimestamp; + protected ITmfTimestamp fTimestamp; // ------------------------------------------------------------------------ // Constructors @@ -59,7 +59,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { * @param type the event type * @param reference the event reference */ - public TmfEvent(ITmfTrace trace, long rank, TmfTimestamp timestamp, String source, + public TmfEvent(ITmfTrace trace, long rank, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { super(trace, rank, source, type, null, reference); @@ -69,7 +69,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { /** * Constructor - no rank */ - public TmfEvent(ITmfTrace parentTrace, TmfTimestamp timestamp, String source, + public TmfEvent(ITmfTrace parentTrace, ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { this(parentTrace, -1, timestamp, source, type, reference); @@ -78,7 +78,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { /** * Constructor - no trace, no rank */ - public TmfEvent(TmfTimestamp timestamp, String source, TmfEventType type, String reference) { + public TmfEvent(ITmfTimestamp timestamp, String source, TmfEventType type, String reference) { this(null, -1, timestamp, source, type, reference); } @@ -89,7 +89,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { */ public TmfEvent(TmfEvent event) { super(event); - fTimestamp = event.fTimestamp != null ? new TmfTimestamp(event.fTimestamp) : null; + fTimestamp = event.fTimestamp != null ? event.fTimestamp.clone() : null; } // ------------------------------------------------------------------------ @@ -99,7 +99,7 @@ public class TmfEvent extends TmfDataEvent implements Cloneable { /** * @return the effective event timestamp */ - public TmfTimestamp getTimestamp() { + public ITmfTimestamp getTimestamp() { return fTimestamp; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java index 544d56422a..cbc9ae8355 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java @@ -30,8 +30,8 @@ public class TmfTimeRange { // Attributes // ------------------------------------------------------------------------ - private final TmfTimestamp fStartTime; - private final TmfTimestamp fEndTime; + private final ITmfTimestamp fStartTime; + private final ITmfTimestamp fEndTime; // ------------------------------------------------------------------------ // Constructors @@ -46,12 +46,12 @@ public class TmfTimeRange { * @param startTime * @param endTime */ - public TmfTimeRange(TmfTimestamp startTime, TmfTimestamp endTime) { + public TmfTimeRange(ITmfTimestamp startTime, ITmfTimestamp endTime) { if (startTime == null || endTime == null) { throw new IllegalArgumentException(); } - fStartTime = new TmfTimestamp(startTime); - fEndTime = new TmfTimestamp(endTime); + fStartTime = startTime.clone(); + fEndTime = endTime.clone(); } /** @@ -62,8 +62,8 @@ public class TmfTimeRange { if (other == null) { throw new IllegalArgumentException(); } - fStartTime = new TmfTimestamp(other.fStartTime); - fEndTime = new TmfTimestamp(other.fEndTime); + fStartTime = other.getStartTime().clone(); + fEndTime = other.getEndTime().clone(); } // ------------------------------------------------------------------------ @@ -73,15 +73,15 @@ public class TmfTimeRange { /** * @return The time range start time */ - public TmfTimestamp getStartTime() { - return new TmfTimestamp(fStartTime); + public ITmfTimestamp getStartTime() { + return fStartTime; } /** * @return The time range end time */ - public TmfTimestamp getEndTime() { - return new TmfTimestamp(fEndTime); + public ITmfTimestamp getEndTime() { + return fEndTime; } // ------------------------------------------------------------------------ @@ -94,7 +94,7 @@ public class TmfTimeRange { * @param ts * @return */ - public boolean contains(TmfTimestamp ts) { + public boolean contains(ITmfTimestamp ts) { // Zero acts as a "universal donor" timestamp if (ts.equals(TmfTimestamp.Zero)) return true; return (fStartTime.compareTo(ts, true) <= 0) && (fEndTime.compareTo(ts, true) >= 0); @@ -124,8 +124,8 @@ public class TmfTimeRange { * @return */ public boolean contains(TmfTimeRange range) { - TmfTimestamp startTime = range.getStartTime(); - TmfTimestamp endTime = range.getEndTime(); + ITmfTimestamp startTime = range.getStartTime(); + ITmfTimestamp endTime = range.getEndTime(); return (fStartTime.compareTo(startTime, true) <= 0) && (fEndTime.compareTo(endTime, true) >= 0); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java index db2e216263..a84447f52c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java @@ -19,7 +19,7 @@ package org.eclipse.linuxtools.tmf.core.event; *

* A generic implementation of ITmfTimestamp. */ -public class TmfTimestamp implements ITmfTimestamp, Cloneable, Comparable { +public class TmfTimestamp implements ITmfTimestamp { // ------------------------------------------------------------------------ // Constants @@ -86,12 +86,12 @@ public class TmfTimestamp implements ITmfTimestamp, Cloneable, Comparable extends TmfEventProvider imple protected TmfTimeRange fTimeRange; // The experiment reference timestamp (default: Zero) - protected TmfTimestamp fEpoch; + protected ITmfTimestamp fEpoch; // The experiment index protected Vector fCheckpoints = new Vector(); @@ -111,11 +112,11 @@ public class TmfExperiment extends TmfEventProvider imple * @param epoch * @param indexPageSize */ - public TmfExperiment(Class type, String id, ITmfTrace[] traces, TmfTimestamp epoch, int indexPageSize) { + public TmfExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize) { this(type, id, traces, TmfTimestamp.Zero, indexPageSize, false); } - public TmfExperiment(Class type, String id, ITmfTrace[] traces, TmfTimestamp epoch, int indexPageSize, boolean preIndexExperiment) { + public TmfExperiment(Class type, String id, ITmfTrace[] traces, ITmfTimestamp epoch, int indexPageSize, boolean preIndexExperiment) { super(id, type); fTraces = traces; @@ -223,12 +224,12 @@ public class TmfExperiment extends TmfEventProvider imple } @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return fTimeRange.getStartTime(); } @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return fTimeRange.getEndTime(); } @@ -248,7 +249,7 @@ public class TmfExperiment extends TmfEventProvider imple return fCurrentExperiment; } - public TmfTimestamp getEpoch() { + public ITmfTimestamp getEpoch() { return fEpoch; } @@ -264,7 +265,7 @@ public class TmfExperiment extends TmfEventProvider imple * @return */ @Override - public long getRank(TmfTimestamp timestamp) { + public long getRank(ITmfTimestamp timestamp) { TmfExperimentContext context = seekEvent(timestamp); return context.getRank(); } @@ -275,7 +276,7 @@ public class TmfExperiment extends TmfEventProvider imple * @param index * @return */ - public TmfTimestamp getTimestamp(int index) { + public ITmfTimestamp getTimestamp(int index) { TmfExperimentContext context = seekEvent(index); TmfEvent event = getNextEvent(context); return (event != null) ? event.getTimestamp() : null; @@ -289,14 +290,14 @@ public class TmfExperiment extends TmfEventProvider imple * Update the global time range */ protected void updateTimeRange() { - TmfTimestamp startTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getStartTime() : TmfTimestamp.BigCrunch; - TmfTimestamp endTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getEndTime() : TmfTimestamp.BigBang; + ITmfTimestamp startTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getStartTime() : TmfTimestamp.BigCrunch; + ITmfTimestamp endTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getEndTime() : TmfTimestamp.BigBang; for (ITmfTrace trace : fTraces) { - TmfTimestamp traceStartTime = trace.getStartTime(); + ITmfTimestamp traceStartTime = trace.getStartTime(); if (traceStartTime.compareTo(startTime, true) < 0) startTime = traceStartTime; - TmfTimestamp traceEndTime = trace.getEndTime(); + ITmfTimestamp traceEndTime = trace.getEndTime(); if (traceEndTime.compareTo(endTime, true) > 0) endTime = traceEndTime; } @@ -309,7 +310,7 @@ public class TmfExperiment extends TmfEventProvider imple @Override public ITmfContext armRequest(ITmfDataRequest request) { // Tracer.trace("Ctx: Arming request - start"); - TmfTimestamp timestamp = (request instanceof ITmfEventRequest) ? ((ITmfEventRequest) request).getRange().getStartTime() + ITmfTimestamp timestamp = (request instanceof ITmfEventRequest) ? ((ITmfEventRequest) request).getRange().getStartTime() : null; if (TmfTimestamp.BigBang.equals(timestamp) || request.getIndex() > 0) { @@ -402,7 +403,7 @@ public class TmfExperiment extends TmfEventProvider imple * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools .tmf.event.TmfTimestamp) */ @Override - public synchronized TmfExperimentContext seekEvent(TmfTimestamp timestamp) { + public synchronized TmfExperimentContext seekEvent(ITmfTimestamp timestamp) { // Tracer.trace("Ctx: seekEvent(TS) - start"); @@ -571,7 +572,7 @@ public class TmfExperiment extends TmfEventProvider imple return null; } int trace = TmfExperimentContext.NO_TRACE; - TmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; if (eventArray.length == 1) { if (eventArray[0] != null) { timestamp = eventArray[0].getTimestamp(); @@ -581,7 +582,7 @@ public class TmfExperiment extends TmfEventProvider imple for (int i = 0; i < eventArray.length; i++) { TmfEvent event = eventArray[i]; if (event != null && event.getTimestamp() != null) { - TmfTimestamp otherTS = event.getTimestamp(); + ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { trace = i; timestamp = otherTS; @@ -617,7 +618,7 @@ public class TmfExperiment extends TmfEventProvider imple return event; } - public synchronized void updateIndex(ITmfContext context, TmfTimestamp timestamp) { + public synchronized void updateIndex(ITmfContext context, ITmfTimestamp timestamp) { // Build the index as we go along long rank = context.getRank(); if (context.isValidRank() && (rank % fIndexPageSize) == 0) { @@ -664,11 +665,11 @@ public class TmfExperiment extends TmfEventProvider imple // Scan the candidate events and identify the "next" trace to read from int trace = TmfExperimentContext.NO_TRACE; - TmfTimestamp timestamp = TmfTimestamp.BigCrunch; + ITmfTimestamp timestamp = TmfTimestamp.BigCrunch; for (int i = 0; i < expContext.getTraces().length; i++) { TmfEvent event = expContext.getEvents()[i]; if (event != null && event.getTimestamp() != null) { - TmfTimestamp otherTS = event.getTimestamp(); + ITmfTimestamp otherTS = event.getTimestamp(); if (otherTS.compareTo(timestamp, true) < 0) { trace = i; timestamp = otherTS; @@ -768,8 +769,8 @@ public class TmfExperiment extends TmfEventProvider imple // long indexingStart = System.nanoTime(); - TmfTimestamp startTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getStartTime(); - TmfTimestamp lastTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getEndTime(); + ITmfTimestamp startTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getStartTime(); + ITmfTimestamp lastTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getEndTime(); long initialNbEvents = fNbEvents; @Override @@ -781,10 +782,10 @@ public class TmfExperiment extends TmfEventProvider imple public void handleData(TmfEvent event) { super.handleData(event); if (event != null) { - TmfTimestamp ts = event.getTimestamp(); + ITmfTimestamp ts = event.getTimestamp(); if (startTime == null) - startTime = new TmfTimestamp(ts); - lastTime = new TmfTimestamp(ts); + startTime = ts.clone(); + lastTime = ts.clone(); if ((getNbRead() % fIndexPageSize) == 1 && getNbRead() != 1) { updateExperiment(); } @@ -825,7 +826,7 @@ public class TmfExperiment extends TmfEventProvider imple private void updateExperiment() { int nbRead = getNbRead(); if (startTime != null) { - fTimeRange = new TmfTimeRange(startTime, new TmfTimestamp(lastTime)); + fTimeRange = new TmfTimeRange(startTime, lastTime.clone()); } if (nbRead != 0) { // updateTimeRange(); @@ -876,8 +877,8 @@ public class TmfExperiment extends TmfEventProvider imple if (fIndexingPendingRange == TmfTimeRange.Null) { fIndexingPendingRange = signal.getRange(); } else { - TmfTimestamp startTime = fIndexingPendingRange.getStartTime(); - TmfTimestamp endTime = fIndexingPendingRange.getEndTime(); + ITmfTimestamp startTime = fIndexingPendingRange.getStartTime(); + ITmfTimestamp endTime = fIndexingPendingRange.getEndTime(); if (signal.getRange().getStartTime().compareTo(startTime) < 0) { startTime = signal.getRange().getStartTime(); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java index 72b22b13a3..548367f5b6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java @@ -43,7 +43,7 @@ public class TmfExperimentContext extends TmfContext { // Attributes // ------------------------------------------------------------------------ - private ITmfTrace[] fTraces = new ITmfTrace[0]; + private ITmfTrace[] fTraces = new ITmfTrace[0]; private TmfContext[] fContexts; private TmfEvent[] fEvents; private int lastTraceRead; @@ -52,7 +52,7 @@ public class TmfExperimentContext extends TmfContext { // Constructors // ------------------------------------------------------------------------ - public TmfExperimentContext(ITmfTrace[] traces, TmfContext[] contexts) { + public TmfExperimentContext(ITmfTrace[] traces, TmfContext[] contexts) { super(); fTraces = traces; fContexts = contexts; @@ -74,7 +74,7 @@ public class TmfExperimentContext extends TmfContext { lastTraceRead = NO_TRACE; } - public TmfExperimentContext(ITmfTrace[] traces) { + public TmfExperimentContext(ITmfTrace[] traces) { this(traces, new TmfContext[traces.length]); } @@ -98,7 +98,7 @@ public class TmfExperimentContext extends TmfContext { // Accessors // ------------------------------------------------------------------------ - public ITmfTrace[] getTraces() { + public ITmfTrace[] getTraces() { return fTraces; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java index 13327067bd..54f29da646 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfCoalescedEventRequest.java @@ -12,9 +12,9 @@ package org.eclipse.linuxtools.tmf.core.request; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfCoalescedEventRequest @@ -98,8 +98,8 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDa ok &= getIndex() == request.getIndex(); ok &= getExecType() == request.getExecType(); if (ok) { - TmfTimestamp startTime = ((ITmfEventRequest) request).getRange().getStartTime(); - TmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); + ITmfTimestamp startTime = ((ITmfEventRequest) request).getRange().getStartTime(); + ITmfTimestamp endTime = ((ITmfEventRequest) request).getRange().getEndTime(); if (!fRange.contains(startTime)) fRange = new TmfTimeRange(startTime, fRange.getEndTime()); if (!fRange.contains(endTime)) @@ -124,7 +124,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDa if (request instanceof TmfEventRequest) { TmfEventRequest req = (TmfEventRequest) request; if (!req.isCompleted()) { - TmfTimestamp ts = data.getTimestamp(); + ITmfTimestamp ts = data.getTimestamp(); if (req.getRange().contains(ts)) { req.handleData(data); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java index 1892b3cb3c..a6dc79e77d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfRangeSynchSignal.java @@ -12,8 +12,8 @@ package org.eclipse.linuxtools.tmf.core.signal; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfRangeSynchSignal @@ -22,9 +22,9 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; public class TmfRangeSynchSignal extends TmfSignal { private final TmfTimeRange fCurrentRange; - private final TmfTimestamp fCurrentTime; + private final ITmfTimestamp fCurrentTime; - public TmfRangeSynchSignal(Object source, TmfTimeRange range, TmfTimestamp ts) { + public TmfRangeSynchSignal(Object source, TmfTimeRange range, ITmfTimestamp ts) { super(source); fCurrentRange = range; fCurrentTime = ts; @@ -34,7 +34,7 @@ public class TmfRangeSynchSignal extends TmfSignal { return fCurrentRange; } - public TmfTimestamp getCurrentTime() { + public ITmfTimestamp getCurrentTime() { return fCurrentTime; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java index 1b7cb09570..5855afa8fa 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/signal/TmfTimeSynchSignal.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.signal; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * TmfTimeSynchSignal @@ -21,14 +21,14 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; */ public class TmfTimeSynchSignal extends TmfSignal { - private final TmfTimestamp fCurrentTime; + private final ITmfTimestamp fCurrentTime; - public TmfTimeSynchSignal(Object source, TmfTimestamp ts) { + public TmfTimeSynchSignal(Object source, ITmfTimestamp ts) { super(source); fCurrentTime = ts; } - public TmfTimestamp getCurrentTime() { + public ITmfTimestamp getCurrentTime() { return fCurrentTime; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index 920bf75a3b..a8b899cc61 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -16,9 +16,9 @@ import java.io.FileNotFoundException; import org.eclipse.core.resources.IProject; import org.eclipse.linuxtools.tmf.core.component.ITmfComponent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * ITmfTrace @@ -68,9 +68,9 @@ public interface ITmfTrace extends ITmfComponent { */ public TmfTimeRange getTimeRange(); - public TmfTimestamp getStartTime(); + public ITmfTimestamp getStartTime(); - public TmfTimestamp getEndTime(); + public ITmfTimestamp getEndTime(); /** * Positions the trace at the first event with the specified timestamp or index (i.e. the nth event in the trace). @@ -84,7 +84,7 @@ public interface ITmfTrace extends ITmfComponent { */ public TmfContext seekLocation(ITmfLocation location); - public TmfContext seekEvent(TmfTimestamp timestamp); + public TmfContext seekEvent(ITmfTimestamp timestamp); public TmfContext seekEvent(long rank); @@ -117,7 +117,7 @@ public interface ITmfTrace extends ITmfComponent { * @param timestamp * @return */ - public long getRank(TmfTimestamp timestamp); + public long getRank(ITmfTimestamp timestamp); /** * Return the event pointed by the supplied context (or null if no event left) and updates the context to the next diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java index 4e0881dd3d..c9dcbe2f20 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java @@ -12,7 +12,7 @@ package org.eclipse.linuxtools.tmf.core.trace; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * TmfCheckpoint @@ -26,7 +26,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { // Attributes // ------------------------------------------------------------------------ - private TmfTimestamp fTimestamp; + private ITmfTimestamp fTimestamp; private ITmfLocation fLocation; // ------------------------------------------------------------------------ @@ -43,7 +43,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { * @param ts the checkpoint timestamp * @param location the corresponding trace location */ - public TmfCheckpoint(TmfTimestamp ts, ITmfLocation location) { + public TmfCheckpoint(ITmfTimestamp ts, ITmfLocation location) { fTimestamp = ts; fLocation = location; } @@ -55,7 +55,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { public TmfCheckpoint(TmfCheckpoint other) { if (other == null) throw new IllegalArgumentException(); - fTimestamp = (TmfTimestamp) other.fTimestamp.clone(); + fTimestamp = other.fTimestamp.clone(); fLocation = other.fLocation.clone(); } @@ -66,7 +66,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { /** * @return the checkpoint timestamp */ - public TmfTimestamp getTimestamp() { + public ITmfTimestamp getTimestamp() { return fTimestamp; } @@ -86,7 +86,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { TmfCheckpoint result = null; try { result = (TmfCheckpoint) super.clone(); - result.fTimestamp = new TmfTimestamp(fTimestamp); + result.fTimestamp = fTimestamp.clone(); result.fLocation = fLocation.clone(); return result; } catch (CloneNotSupportedException e) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index a81b9c37cf..380befbc45 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -80,8 +81,8 @@ public abstract class TmfTrace extends TmfEventProvider i protected long fNbEvents = 0; // The time span of the event stream - private TmfTimestamp fStartTime = TmfTimestamp.BigCrunch; - private TmfTimestamp fEndTime = TmfTimestamp.BigBang; + private ITmfTimestamp fStartTime = TmfTimestamp.BigCrunch; + private ITmfTimestamp fEndTime = TmfTimestamp.BigBang; // ------------------------------------------------------------------------ // Constructors @@ -183,8 +184,8 @@ public abstract class TmfTrace extends TmfEventProvider i public TmfTrace clone() throws CloneNotSupportedException { TmfTrace clone = (TmfTrace) super.clone(); clone.fCheckpoints = fCheckpoints; - clone.fStartTime = new TmfTimestamp(fStartTime); - clone.fEndTime = new TmfTimestamp(fEndTime); + clone.fStartTime = fStartTime.clone(); + clone.fEndTime = fEndTime.clone(); return clone; } @@ -228,7 +229,7 @@ public abstract class TmfTrace extends TmfEventProvider i * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getStartTime() */ @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return fStartTime; } @@ -236,7 +237,7 @@ public abstract class TmfTrace extends TmfEventProvider i * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#getEndTime() */ @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return fEndTime; } @@ -253,7 +254,7 @@ public abstract class TmfTrace extends TmfEventProvider i * @return */ @Override - public long getRank(TmfTimestamp timestamp) { + public long getRank(ITmfTimestamp timestamp) { TmfContext context = seekEvent(timestamp); return context.getRank(); } @@ -315,7 +316,7 @@ public abstract class TmfTrace extends TmfEventProvider i * @see org.eclipse.linuxtools.tmf.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.event.TmfTimestamp) */ @Override - public TmfContext seekEvent(TmfTimestamp timestamp) { + public TmfContext seekEvent(ITmfTimestamp timestamp) { if (timestamp == null) { timestamp = TmfTimestamp.BigBang; @@ -411,7 +412,7 @@ public abstract class TmfTrace extends TmfEventProvider i return event; } - protected synchronized void updateIndex(ITmfContext context, long rank, TmfTimestamp timestamp) { + protected synchronized void updateIndex(ITmfContext context, long rank, ITmfTimestamp timestamp) { if (fStartTime.compareTo(timestamp, false) > 0) fStartTime = timestamp; if (fEndTime.compareTo(timestamp, false) < 0) @@ -489,17 +490,17 @@ public abstract class TmfTrace extends TmfEventProvider i ITmfEventRequest request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.Eternity, TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) { - TmfTimestamp startTime = null; - TmfTimestamp lastTime = null; + ITmfTimestamp startTime = null; + ITmfTimestamp lastTime = null; @Override public void handleData(TmfEvent event) { super.handleData(event); if (event != null) { - TmfTimestamp ts = event.getTimestamp(); + ITmfTimestamp ts = event.getTimestamp(); if (startTime == null) - startTime = new TmfTimestamp(ts); - lastTime = new TmfTimestamp(ts); + startTime = ts.clone(); + lastTime = ts.clone(); if ((getNbRead() % fIndexPageSize) == 0) { updateTrace(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java index 74b7ac4a9b..b42ac070d8 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfAsyncSequenceDiagramEvent.java @@ -11,11 +11,11 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; public interface ITmfAsyncSequenceDiagramEvent extends ITmfSyncSequenceDiagramEvent { /** * @return End timestamp of message (i.e. receive time) */ - public TmfTimestamp getEndTime(); + public ITmfTimestamp getEndTime(); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java index e13b0070a9..e655888cda 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/ITmfSyncSequenceDiagramEvent.java @@ -11,7 +11,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.core.uml2sd; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; public interface ITmfSyncSequenceDiagramEvent { @@ -33,5 +33,5 @@ public interface ITmfSyncSequenceDiagramEvent { /** * @return Start timestamp of message (i.e. send time) */ - public TmfTimestamp getStartTime(); + public ITmfTimestamp getStartTime(); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java index 0ddee4eb72..d9db597ed6 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfAsyncSequenceDiagramEvent.java @@ -11,8 +11,8 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.core.uml2sd; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfAsyncSequenceDiagramEvent @@ -25,7 +25,8 @@ public class TmfAsyncSequenceDiagramEvent extends TmfSyncSequenceDiagramEvent im // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - final protected TmfTimestamp fEndTime; + + final protected ITmfTimestamp fEndTime; // ------------------------------------------------------------------------ // Constructors @@ -48,7 +49,7 @@ public class TmfAsyncSequenceDiagramEvent extends TmfSyncSequenceDiagramEvent im * @see org.eclipse.linuxtools.tmf.uml2sd.ITmfAsyncSequenceDiagramEvent#getEndTime() */ @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return fEndTime; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java index 4a16c780e0..6cba15e487 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/uml2sd/TmfSyncSequenceDiagramEvent.java @@ -11,8 +11,8 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.core.uml2sd; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; /** * TmfSyncSequenceDiagramEvent @@ -25,7 +25,7 @@ public class TmfSyncSequenceDiagramEvent implements ITmfSyncSequenceDiagramEvent // ------------------------------------------------------------------------ // Attributes // ------------------------------------------------------------------------ - final protected TmfTimestamp fStartTime; + final protected ITmfTimestamp fStartTime; final protected String fSender; final protected String fReceiver; final protected String fName; @@ -86,7 +86,7 @@ public class TmfSyncSequenceDiagramEvent implements ITmfSyncSequenceDiagramEvent * @see org.eclipse.linuxtools.tmf.uml2sd.ITmfSyncSequenceDiagramEvent#getStartTime() */ @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return fStartTime; } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java index dee82c02cc..e007b0dcf8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java @@ -18,6 +18,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @@ -52,7 +53,7 @@ public class CustomEvent extends TmfEvent { } @Override - public TmfTimestamp getTimestamp() { + public ITmfTimestamp getTimestamp() { if (fData != null) processData(); return super.getTimestamp(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java index 06c1d89719..01f5169951 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -306,7 +306,7 @@ public class CustomTxtTrace extends TmfTrace { } public CustomTxtEvent parseFirstLine(CustomTxtTraceContext context) { - CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, TmfTimestamp.Zero, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ + CustomTxtEvent event = new CustomTxtEvent(fDefinition, this, (TmfTimestamp) TmfTimestamp.Zero, "", fEventType, ""); //$NON-NLS-1$ //$NON-NLS-2$ event.processGroups(context.inputLine, context.firstLineMatcher); event.setContent(new CustomEventContent(event, new StringBuffer(context.firstLine))); return event; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java index b4cb307eb5..3c570034b9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java @@ -44,6 +44,7 @@ import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.LocalResourceManager; import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider; import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventContent; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; @@ -1621,7 +1622,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS return; } // Verify if event is within the trace range - final TmfTimestamp timestamp[] = new TmfTimestamp[1]; + final ITmfTimestamp timestamp[] = new TmfTimestamp[1]; timestamp[0] = ts; // signal.getCurrentTime(); if (timestamp[0].compareTo(fTrace.getStartTime(), true) == -1) { timestamp[0] = fTrace.getStartTime(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java index a9dfead06e..ddd8718002 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java @@ -12,6 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages; @@ -47,7 +48,7 @@ public class DrawableToolTip implements PaintListener { * Time range data */ protected TmfTimeRange minMaxRange; - protected TmfTimestamp currentValue; + protected ITmfTimestamp currentValue; private static int H_MARGIN = 10; private static int V_MARGIN = 10; @@ -92,7 +93,7 @@ public class DrawableToolTip implements PaintListener { * @param _max the scale max * @param unit the scale unit */ - public void showToolTip(TmfTimestamp _value, TmfTimestamp min, TmfTimestamp max) { + public void showToolTip(ITmfTimestamp _value, ITmfTimestamp min, ITmfTimestamp max) { minMaxRange = new TmfTimeRange(min.clone(), max.clone()); currentValue = _value.clone(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java index e05f59f8ce..e456141e4b 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java @@ -23,6 +23,7 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.ITmfImageConstants; import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin; @@ -591,15 +592,15 @@ public class SDWidget extends ScrollView implements SelectionListener, IProperty postfix = " -> " + currentGraphNode.getName() + "\n" + SDMessages._138 + " "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //double delta = ((ITimeRange)toolTipNode).getLastTime()-((ITimeRange)currentGraphNode).getLastTime(); - TmfTimestamp firstTime = ((ITimeRange) currentGraphNode).getEndTime(); - TmfTimestamp lastTime = ((ITimeRange) toolTipNode).getEndTime(); + ITmfTimestamp firstTime = ((ITimeRange) currentGraphNode).getEndTime(); + ITmfTimestamp lastTime = ((ITimeRange) toolTipNode).getEndTime(); TmfTimestamp delta = (TmfTimestamp) lastTime.getDelta(firstTime); postfix += delta.toString(); } else { if ((toolTipNode instanceof ITimeRange) && ((ITimeRange) toolTipNode).hasTimeInfo()) { postfix = "\n";//$NON-NLS-1$ - TmfTimestamp firstTime = ((ITimeRange) toolTipNode).getStartTime(); - TmfTimestamp lastTime = ((ITimeRange) toolTipNode).getEndTime(); + ITmfTimestamp firstTime = ((ITimeRange) toolTipNode).getStartTime(); + ITmfTimestamp lastTime = ((ITimeRange) toolTipNode).getEndTime(); if (firstTime != null) { if (lastTime != null && firstTime.compareTo(lastTime, true) != 0) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java index 8fc1cc68d3..98b6e031fc 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/TimeCompressionBar.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessage; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.AsyncMessageReturn; @@ -68,8 +69,8 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { protected Frame frame = null; protected List nodeList = null; - protected TmfTimestamp min = new TmfTimestamp(); - protected TmfTimestamp max = new TmfTimestamp(); + protected ITmfTimestamp min = new TmfTimestamp(); + protected ITmfTimestamp max = new TmfTimestamp(); protected float zoomValue = 1; protected DrawableToolTip tooltip = null; @@ -528,8 +529,8 @@ public class TimeCompressionBar extends ScrollView implements DisposeListener { ITimeRange t1 = (ITimeRange) mes1; ITimeRange t2 = (ITimeRange) mes2; - TmfTimestamp time1 = t1.getStartTime(); - TmfTimestamp time2 = t2.getStartTime(); + ITmfTimestamp time1 = t1.getStartTime(); + ITmfTimestamp time2 = t2.getStartTime(); int event1 = mes1.getEventOccurrence(); int event2 = mes2.getEventOccurrence(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java index 1d11035ba4..5dfaa9e972 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/AsyncMessage.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; import java.util.Comparator; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; @@ -54,12 +55,12 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { /** * The time when the message begin */ - protected TmfTimestamp endTime = new TmfTimestamp(); + protected ITmfTimestamp endTime = new TmfTimestamp(); /** * The time when the message end */ - protected TmfTimestamp startTime = new TmfTimestamp(); + protected ITmfTimestamp startTime = new TmfTimestamp(); /** * The associated message. @@ -329,7 +330,7 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { * * @param time the time when the message end */ - public void setEndTime(TmfTimestamp time) { + public void setEndTime(ITmfTimestamp time) { endTime = time.clone(); hasTime = true; if (getStartLifeline() != null && getStartLifeline().getFrame() != null) @@ -343,7 +344,7 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { * * @param time the time when the message start */ - public void setStartTime(TmfTimestamp time) { + public void setStartTime(ITmfTimestamp time) { startTime = time.clone(); hasTime = true; if (getStartLifeline() != null && getStartLifeline().getFrame() != null) @@ -358,7 +359,7 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { * @return the time */ @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return endTime; } @@ -368,7 +369,7 @@ public class AsyncMessage extends BaseMessage implements ITimeRange { * @return the time */ @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return startTime; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java index c65a7e60af..3bff886a37 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/BasicFrame.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; @@ -39,11 +40,11 @@ public class BasicFrame extends GraphNode { /** * Contains the max elapsed time between two consecutive messages in the whole frame */ - protected TmfTimestamp maxTime = new TmfTimestamp(0); + protected ITmfTimestamp maxTime = new TmfTimestamp(0); /** * Contains the min elapsed time between two consecutive messages in the whole frame */ - protected TmfTimestamp minTime = new TmfTimestamp(0); + protected ITmfTimestamp minTime = new TmfTimestamp(0); /** * Indicate if the min and max elapsed time between two consecutive messages in the whole frame need to be computed @@ -82,8 +83,8 @@ public class BasicFrame extends GraphNode { protected boolean customMinMax = false; - protected TmfTimestamp minSDTime = new TmfTimestamp(); - protected TmfTimestamp maxSDTime = new TmfTimestamp(); + protected ITmfTimestamp minSDTime = new TmfTimestamp(); + protected ITmfTimestamp maxSDTime = new TmfTimestamp(); protected boolean initSDMin = true; /** @@ -361,7 +362,7 @@ public class BasicFrame extends GraphNode { * * @return the minimum GraphNode time */ - public TmfTimestamp getMinTime() { + public ITmfTimestamp getMinTime() { if (lastExternalTimePref != SDViewPref.getInstance().excludeExternalTime()) { lastExternalTimePref = SDViewPref.getInstance().excludeExternalTime(); computeMinMax = true; @@ -393,7 +394,7 @@ public class BasicFrame extends GraphNode { * * @return the maximum GraphNode time */ - public TmfTimestamp getMaxTime() { + public ITmfTimestamp getMaxTime() { if (lastExternalTimePref != SDViewPref.getInstance().excludeExternalTime()) { lastExternalTimePref = SDViewPref.getInstance().excludeExternalTime(); computeMinMax = true; @@ -426,12 +427,12 @@ public class BasicFrame extends GraphNode { } } - public TmfTimestamp getSDMinTime() { + public ITmfTimestamp getSDMinTime() { computeMaxMinTime(); return minSDTime; } - public TmfTimestamp getSDMaxTime() { + public ITmfTimestamp getSDMaxTime() { computeMaxMinTime(); return maxSDTime; } @@ -453,7 +454,7 @@ public class BasicFrame extends GraphNode { } protected void updateMinMax(SDTimeEvent m1, SDTimeEvent m2) { - TmfTimestamp delta = (TmfTimestamp) m2.getTime().getDelta(m1.getTime()); + ITmfTimestamp delta = m2.getTime().getDelta(m1.getTime()); if (computeMinMax) { minTime = delta.clone(); if (minTime.compareTo(TmfTimestamp.Zero, false) < 0) { @@ -485,7 +486,7 @@ public class BasicFrame extends GraphNode { Object timedNode = list.get(i); if ((timedNode instanceof ITimeRange) && ((ITimeRange) timedNode).hasTimeInfo()) { int event = ((GraphNode) list.get(i)).getStartOccurrence(); - TmfTimestamp time = ((ITimeRange) list.get(i)).getStartTime(); + ITmfTimestamp time = ((ITimeRange) list.get(i)).getStartTime(); SDTimeEvent f = new SDTimeEvent(time, event, (ITimeRange) list.get(i)); timeArray.add(f); if (event != ((GraphNode) list.get(i)).getEndOccurrence()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java index f1c2edd199..721274eb87 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ExecutionOccurrence.java @@ -12,6 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; @@ -32,7 +33,7 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi protected int[] strokeRGB; protected IImage image, ellipsesImage; - protected TmfTimestamp startTime, endTime; + protected ITmfTimestamp startTime, endTime; protected boolean hasTime; /** @@ -119,7 +120,7 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi * @return the time */ @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return startTime; } @@ -129,7 +130,7 @@ public class ExecutionOccurrence extends BasicExecutionOccurrence implements ITi * @return the time */ @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return endTime; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java index 1c26438679..b481188c70 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/Frame.java @@ -17,6 +17,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; @@ -619,7 +620,7 @@ public class Frame extends BasicFrame { ExecutionOccurrence eo = (ExecutionOccurrence) o; if (eo.hasTimeInfo()) { int event = eo.getStartOccurrence(); - TmfTimestamp time = eo.getStartTime(); + ITmfTimestamp time = eo.getStartTime(); SDTimeEvent f = new SDTimeEvent(time, event, eo); timeArray.add(f); if (executionOccurrencesWithTime == null) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java index aadc496234..3a80f30802 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/ITimeRange.java @@ -12,7 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * @author sveyrier @@ -20,9 +20,9 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; */ public interface ITimeRange { - public TmfTimestamp getStartTime(); + public ITmfTimestamp getStartTime(); - public TmfTimestamp getEndTime(); + public ITmfTimestamp getEndTime(); public boolean hasTimeInfo(); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java index 5b353b3ecb..0c7fbf833c 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SDTimeEvent.java @@ -12,7 +12,7 @@ **********************************************************************/ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; -import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; /** * @author sveyrier @@ -20,17 +20,17 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; */ public class SDTimeEvent { - protected TmfTimestamp time; + protected ITmfTimestamp time; protected int event; protected ITimeRange node; - public SDTimeEvent(TmfTimestamp _time, int _event, ITimeRange _node) { + public SDTimeEvent(ITmfTimestamp _time, int _event, ITimeRange _node) { time = _time; event = _event; node = _node; } - public TmfTimestamp getTime() { + public ITmfTimestamp getTime() { return time; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java index 021666df57..e9ebbe463c 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/core/SyncMessage.java @@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.core; import java.util.Comparator; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IGC; import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.ISDPreferences; @@ -58,7 +59,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange { /** * The time when the message occurs */ - protected TmfTimestamp eventTime = new TmfTimestamp(); + protected ITmfTimestamp eventTime = new TmfTimestamp(); public static final String SYNC_MESS_TAG = "SyncMessage"; //$NON-NLS-1$ @@ -181,7 +182,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange { * * @param time the time when the message occurs */ - public void setTime(TmfTimestamp time) { + public void setTime(ITmfTimestamp time) { eventTime = time.clone(); hasTime = true; if (getStartLifeline() != null && getStartLifeline().getFrame() != null) @@ -196,7 +197,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange { * @return the time */ @Override - public TmfTimestamp getEndTime() { + public ITmfTimestamp getEndTime() { return eventTime; } @@ -206,7 +207,7 @@ public class SyncMessage extends BaseMessage implements ITimeRange { * @return the time */ @Override - public TmfTimestamp getStartTime() { + public ITmfTimestamp getStartTime() { return eventTime; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java index 422482eb71..10d5f53e69 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/impl/TmfUml2SDSyncLoader.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.linuxtools.tmf.core.component.TmfComponent; +import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfNoSuchFieldException; @@ -94,7 +95,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, // Checkpoint and page attributes protected List fCheckPoints = new ArrayList(MAX_NUM_OF_MSG); volatile protected int fCurrentPage = 0; - protected TmfTimestamp fCurrentTime = null; + protected ITmfTimestamp fCurrentTime = null; volatile protected boolean fIsSelect = false; // Search attributes @@ -128,7 +129,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, /** * @return returns the current time if available else null */ - public TmfTimestamp getCurrentTime() { + public ITmfTimestamp getCurrentTime() { fLock.lock(); try { if (fCurrentTime != null) { @@ -178,8 +179,8 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, fIndexRequest = new TmfEventRequest(TmfEvent.class, window, TmfDataRequest.ALL_DATA, DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) { - private TmfTimestamp fFirstTime = null; - private TmfTimestamp fLastTime = null; + private ITmfTimestamp fFirstTime = null; + private ITmfTimestamp fLastTime = null; private int fNbSeqEvents = 0; private List fSdEvents = new ArrayList(MAX_NUM_OF_MSG); @@ -1004,7 +1005,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, * @param time The timestamp * @return page that contains the time */ - protected int getPage(TmfTimestamp time) { + protected int getPage(ITmfTimestamp time) { int page; int size; fLock.lock(); @@ -1059,7 +1060,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, * @param startTime The start time of time range. * @return */ - protected TmfTimeRange getSignalTimeRange(TmfTimestamp startTime) { + protected TmfTimeRange getSignalTimeRange(ITmfTimestamp startTime) { fLock.lock(); try { TmfTimestamp initialEndOfWindow = new TmfTimestamp(startTime.getValue() + fInitialWindow, startTime.getScale(), startTime.getPrecision()); @@ -1217,7 +1218,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, private IProgressMonitor fMonitor; private boolean fIsFound = false; - private TmfTimestamp fFoundTime = null; + private ITmfTimestamp fFoundTime = null; /** * Constructor @@ -1315,7 +1316,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, /** * @return timestamp of found time. */ - public TmfTimestamp getFoundTime() { + public ITmfTimestamp getFoundTime() { return fFoundTime; } } -- 2.34.1