diff options
| author | Patrick Tasse | 2014-08-21 20:35:14 +0000 |
|---|---|---|
| committer | Patrick Tasse | 2014-08-28 13:56:48 +0000 |
| commit | 6ab9d3cd3263dcac7ca6bb14d424c284595b2dc4 (patch) | |
| tree | 2fde7dab7b3e7bc430f2b72c75b3036158c5d098 | |
| parent | 5a908cc21a80e432b6e2412c824c9431d6f5454c (diff) | |
| download | org.eclipse.linuxtools-6ab9d3cd3263dcac7ca6bb14d424c284595b2dc4.tar.gz org.eclipse.linuxtools-6ab9d3cd3263dcac7ca6bb14d424c284595b2dc4.tar.xz org.eclipse.linuxtools-6ab9d3cd3263dcac7ca6bb14d424c284595b2dc4.zip | |
tmf: Fix time unit of time stamp in TmfTrace.createTimestamp()
Change-Id: If0dc752f3d09dd447a70967909a68e68f6beaddc
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/32113
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
(cherry picked from commit 839eb070df5e6a46cd6f40fb9827355b639b014a)
Reviewed-on: https://git.eclipse.org/r/32441
2 files changed, 3 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index 8632c6af6a..0be8abb4d1 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -444,7 +444,7 @@ public interface ITmfTrace extends ITmfEventProvider { * Creates a timestamp for this trace, using the transformation formula * * @param ts - * The time in long with which to create the timestamp + * The time in nanoseconds with which to create the timestamp * @return The new timestamp * @since 3.0 */ diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index 7282bf00a1..54228e1334 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -54,6 +54,7 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; import org.eclipse.linuxtools.tmf.core.synchronization.ITmfTimestampTransform; import org.eclipse.linuxtools.tmf.core.synchronization.TimestampTransformFactory; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; +import org.eclipse.linuxtools.tmf.core.timestamp.TmfNanoTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; @@ -844,7 +845,7 @@ public abstract class TmfTrace extends TmfEventProvider implements ITmfTrace, IT */ @Override public ITmfTimestamp createTimestamp(long ts) { - return new TmfTimestamp(getTimestampTransform().transform(ts)); + return new TmfNanoTimestamp(getTimestampTransform().transform(ts)); } // ------------------------------------------------------------------------ |