From 619d7d7f50e303bcef209f74c34ed8fdf6699fc8 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Wed, 16 May 2012 17:36:36 -0400 Subject: [PATCH] Fix some minor issues in TMF for CTF support --- .../linuxtools/tmf/core/event/TmfTimeRange.java | 2 +- .../linuxtools/tmf/core/event/TmfTimestamp.java | 11 +---------- .../tmf/core/experiment/TmfExperiment.java | 4 ---- .../tmf/core/experiment/TmfLegacyExperiment.java | 2 +- .../tmf/core/trace/TmfCheckpointIndexer.java | 8 -------- .../eclipse/linuxtools/tmf/core/trace/TmfTrace.java | 13 ------------- .../tmf/ui/views/histogram/HistogramView.java | 6 +++--- 7 files changed, 6 insertions(+), 40 deletions(-) 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 5b52285ab2..71886dbbd2 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 @@ -220,7 +220,7 @@ public final class TmfTimeRange implements Cloneable { @Override @SuppressWarnings("nls") public String toString() { - return "TmfTimeRange [" + fStartTime + ", " + fEndTime + "]"; + return "TmfTimeRange [fStartTime=" + fStartTime + ", fEndTime=" + fEndTime + "]"; } } 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 e79a54ffd4..601ac3f829 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 @@ -355,16 +355,7 @@ public class TmfTimestamp implements ITmfTimestamp, Cloneable { @Override @SuppressWarnings("nls") public String toString() { - if (equals(BIG_BANG)) { - return "BIG_BANG"; - } - if (equals(BIG_CRUNCH)) { - return "BIG_CRUNCH"; - } - if (equals(ZERO)) { - return "ZERO"; - } - return "[" + fValue + "," + fScale + "," + fPrecision + "]"; + return "TmfTimestamp [fValue=" + fValue + ", fScale=" + fScale + ", fPrecision=" + fPrecision + "]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java index 2d0b0fcdc1..3c3d689933 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java @@ -84,7 +84,6 @@ public class TmfExperiment extends TmfTrace implements I try { super.initTrace(resource, path, type); } catch (TmfTraceException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -208,9 +207,6 @@ public class TmfExperiment extends TmfTrace implements I timestamp = null; } - if (request.getIndex() == 600001) { - System.out.println("Aie"); //$NON-NLS-1$ - } ITmfContext context = null; if (timestamp != null) { // Seek by timestamp context = seekEvent(timestamp); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java index 2de95e36db..1d4976fd62 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfLegacyExperiment.java @@ -724,7 +724,7 @@ public class TmfLegacyExperiment extends TmfExperiment { // The index page size private static final int DEFAULT_INDEX_PAGE_SIZE = 5000; // protected int fIndexPageSize; - protected boolean fIndexing = false; +// protected boolean fIndexing = false; protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.NULL_RANGE; // private Integer fEndSynchReference; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java index f1605e0419..d6b62f86ca 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.linuxtools.internal.tmf.core.Tracer; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange; @@ -126,8 +125,6 @@ public class TmfCheckpointIndexer> implements ITm }; job.schedule(); - System.out.println("TmfCheckpointIndexer.buildIndex()");; - // Clear the checkpoints fTraceIndex.clear(); @@ -149,10 +146,6 @@ public class TmfCheckpointIndexer> implements ITm } lastTime = timestamp.clone(); - if (Tracer.isEventTraced()) { - Tracer.traceEvent(fTrace, this, event); - } - // Update the trace status at regular intervals if ((getNbRead() % fCheckpointInterval) == 0) { updateTraceStatus(); @@ -215,7 +208,6 @@ public class TmfCheckpointIndexer> implements ITm if (fTraceIndex.size() == position) { final ITmfLocation location = context.getLocation().clone(); fTraceIndex.add(new TmfCheckpoint(timestamp.clone(), location)); - System.out.println("TmfCheckpointIndexer.updateIndex()" + "[" + (fTraceIndex.size() - 1) + "] " + timestamp + ", " + location.toString()); } } } 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 530169f567..fa637436b9 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 @@ -554,19 +554,6 @@ public abstract class TmfTrace extends TmfEventProvider return seekEvent(request.getIndex()); } -// /* (non-Javadoc) -// * @see org.eclipse.linuxtools.tmf.core.component.TmfDataProvider#getNext(org.eclipse.linuxtools.tmf.core.trace.ITmfContext) -// */ -// @Override -// @SuppressWarnings("unchecked") -// public T getNext(final ITmfContext context) { -// if (context instanceof TmfContext) { -// return (T) readNextEvent(context); -// } -// return null; -// } - - // ------------------------------------------------------------------------ // toString // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java index 8e16c1f046..7db1d481e2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java @@ -473,9 +473,9 @@ public class HistogramView extends TmfView { if (fFullTraceRequest != null && !fFullTraceRequest.isCompleted()) { fFullTraceRequest.cancel(); } -// if (fullRange.equals(TmfTimeRange.NULL_RANGE)) { -// return; -// } + if (fullRange.equals(TmfTimeRange.NULL_RANGE)) { + return; + } int cacheSize = fCurrentExperiment.getCacheSize(); fFullTraceRequest = new HistogramRequest(fFullTraceHistogram.getDataModel(), fullRange, (int) fFullTraceHistogram.fDataModel.getNbEvents(), TmfDataRequest.ALL_DATA, cacheSize, ExecutionType.BACKGROUND); -- 2.34.1