timing: Make scatter viewer update only once
[deliverable/tracecompass.git] / analysis / org.eclipse.tracecompass.analysis.timing.ui / src / org / eclipse / tracecompass / analysis / timing / ui / views / segmentstore / scatter / AbstractSegmentStoreScatterGraphViewer.java
index 006b589505e36f492c0ac84df66f1e9385b2e77e..f8b680ef75e0da5566053d327f0b8ea4683c6614 100644 (file)
@@ -19,6 +19,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -30,7 +31,6 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.IAnalysisProgressListener;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.ISegmentStoreProvider;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.SubSecondTimeWithUnitFormat;
-import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.internal.analysis.timing.ui.Activator;
 import org.eclipse.tracecompass.internal.analysis.timing.ui.views.segmentstore.scatter.Messages;
 import org.eclipse.tracecompass.internal.analysis.timing.ui.views.segmentstore.scatter.SegmentStoreScatterGraphTooltipProvider;
@@ -42,7 +42,6 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTraceClosedSignal;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTraceOpenedSignal;
 import org.eclipse.tracecompass.tmf.core.signal.TmfTraceSelectedSignal;
-import org.eclipse.tracecompass.tmf.core.signal.TmfWindowRangeUpdatedSignal;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
@@ -66,64 +65,80 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
 
     private static final Format FORMAT = new SubSecondTimeWithUnitFormat();
 
+    private final AtomicInteger fDirty = new AtomicInteger();
+
     private final class CompactingSegmentStoreQuery extends Job {
         private static final long MAX_POINTS = 1000;
-        private final TmfTimeRange fCurrentRange;
+        private final long fStart;
+        private final long fEnd;
 
-        private CompactingSegmentStoreQuery(TmfTimeRange currentRange) {
+        private CompactingSegmentStoreQuery(long start, long end) {
             super(Messages.SegmentStoreScatterGraphViewer_compactTitle);
-            fCurrentRange = currentRange;
+            fStart = start;
+            fEnd = end;
         }
 
         @Override
         protected IStatus run(@Nullable IProgressMonitor monitor) {
             final IProgressMonitor statusMonitor = monitor;
-            if (statusMonitor == null) {
-                return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Monitor is null"); //$NON-NLS-1$
-            }
-
-            ISegmentStoreProvider segmentProvider = getSegmentProvider();
-            final long startTimeInNanos = fCurrentRange.getStartTime().toNanos();
-            final long endTimeInNanos = fCurrentRange.getEndTime().toNanos();
-            if (segmentProvider == null) {
-                setWindowRange(startTimeInNanos, endTimeInNanos);
-                redraw(statusMonitor, startTimeInNanos, startTimeInNanos, Collections.EMPTY_LIST);
-                return new Status(IStatus.WARNING, Activator.PLUGIN_ID, "segment provider not available"); //$NON-NLS-1$
-            }
+            try {
+                if (statusMonitor == null) {
+                    return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Monitor is null"); //$NON-NLS-1$
+                }
 
-            final ISegmentStore<ISegment> segStore = segmentProvider.getSegmentStore();
-            if (segStore == null) {
-                setWindowRange(startTimeInNanos, endTimeInNanos);
-                redraw(statusMonitor, startTimeInNanos, startTimeInNanos, Collections.EMPTY_LIST);
-                return new Status(IStatus.INFO, Activator.PLUGIN_ID, "Segment provider does not have segments"); //$NON-NLS-1$
-            }
+                ISegmentStoreProvider segmentProvider = getSegmentProvider();
+                final long startTime = fStart;
+                final long endTime = fEnd;
+                if (segmentProvider == null) {
+                    redraw(statusMonitor, startTime, startTime, Collections.EMPTY_LIST);
+                    return new Status(IStatus.WARNING, Activator.PLUGIN_ID, "segment provider not available"); //$NON-NLS-1$
+                }
 
-            final long startTime = fCurrentRange.getStartTime().getValue();
-            final long endTime = fCurrentRange.getEndTime().getValue();
-            fPixelStart = startTime;
-            fPixelSize = Math.max(1, (endTime - startTime) / MAX_POINTS);
-            final Iterable<ISegment> intersectingElements = segStore.getIntersectingElements(startTime, endTime);
+                final ISegmentStore<ISegment> segStore = segmentProvider.getSegmentStore();
+                if (segStore == null) {
+                    redraw(statusMonitor, startTime, startTime, Collections.EMPTY_LIST);
+                    return new Status(IStatus.INFO, Activator.PLUGIN_ID, "Segment provider does not have segments"); //$NON-NLS-1$
+                }
 
-            final List<ISegment> list = convertIterableToList(intersectingElements, statusMonitor);
-            final List<ISegment> displayData = (!list.isEmpty()) ? compactList(startTime, list, statusMonitor) : list;
+                fPixelStart = startTime;
+                fPixelSize = Math.max(1, (endTime - startTime) / MAX_POINTS);
+                final Iterable<ISegment> intersectingElements = segStore.getIntersectingElements(startTime, endTime);
+                final List<ISegment> list = convertIterableToList(intersectingElements, statusMonitor);
+                final List<ISegment> displayData = (!list.isEmpty()) ? compactList(startTime, list, statusMonitor) : list;
 
-            setWindowRange(startTimeInNanos, endTimeInNanos);
-            redraw(statusMonitor, startTime, endTime, displayData);
+                redraw(statusMonitor, startTime, endTime, displayData);
 
-            if (statusMonitor.isCanceled()) {
-                return Status.CANCEL_STATUS;
+                if (statusMonitor.isCanceled()) {
+                    return Status.CANCEL_STATUS;
+                }
+                return Status.OK_STATUS;
+            } finally {
+                /*
+                 * fDirty should have been incremented before creating a job, so
+                 * we decrement it once the job is done
+                 */
+                fDirty.decrementAndGet();
             }
-            return Status.OK_STATUS;
 
         }
 
         private void redraw(final IProgressMonitor statusMonitor, final long startTime, final long endTime, final List<ISegment> displayData) {
             fDisplayData = displayData;
+            /*
+             * Increment at every redraw, since the content of the view is not
+             * current
+             */
+            fDirty.incrementAndGet();
             Display.getDefault().asyncExec(new Runnable() {
 
                 @Override
                 public void run() {
-                    updateData(startTime, endTime, displayData.size(), statusMonitor);
+                    try {
+                        updateData(startTime, endTime, displayData.size(), statusMonitor);
+                    } finally {
+                        /* Decrement once the redraw is done */
+                        fDirty.decrementAndGet();
+                    }
                 }
             });
         }
@@ -195,7 +210,6 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             // Only update the model if trace that was analyzed is active trace
             if (segmentProvider.equals(getSegmentProvider())) {
                 updateModel(segmentStore);
-                updateRange(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange());
             }
         }
     }
@@ -252,7 +266,6 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             if (segmentStoreProvider != null) {
                 segmentStoreProvider.addListener(fListener);
                 setData(segmentStoreProvider);
-                updateRange(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange());
             }
         }
     }
@@ -291,7 +304,7 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             fDisplayData = list;
         }
         setWindowRange(currentStart, currentEnd);
-        updateRange(currentRange);
+        updateContent();
     }
 
     @Override
@@ -310,7 +323,7 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
         Collection<ISegment> data = fDisplayData;
 
         final int dataSize = (nb == 0) ? data.size() : nb;
-        if (dataSize == 0 || end == start) {
+        if (end == start) {
             return;
         }
 
@@ -325,7 +338,7 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
             ySeries.add((double) segment.getLength());
         }
         setXAxis(Doubles.toArray(xSeries));
-        setSeries(Messages.SegmentStoreScatterGraphViewer_legend, Doubles.toArray(ySeries)); // $NON-NLS-1$
+        setSeries(Messages.SegmentStoreScatterGraphViewer_legend, Doubles.toArray(ySeries));
         updateDisplay();
     }
 
@@ -406,7 +419,7 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
                     timeRange.getStartTime().toNanos(),
                     timeRange.getEndTime().toNanos());
             setData(getSegmentStoreProvider(trace));
-            updateRange(timeRange);
+            updateContent();
         }
     }
 
@@ -435,12 +448,18 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
 
     }
 
-    private void updateRange(final @Nullable TmfTimeRange timeRange) {
+    @Override
+    protected void updateContent() {
+        /*
+         * Update is requested, content is not up to date, fDirty will be
+         * decremented in the compacting job
+         */
+        fDirty.incrementAndGet();
         Job compactingJob = fCompactingJob;
         if (compactingJob != null && compactingJob.getState() == Job.RUNNING) {
             compactingJob.cancel();
         }
-        compactingJob = new CompactingSegmentStoreQuery(NonNullUtils.checkNotNull(timeRange));
+        compactingJob = new CompactingSegmentStoreQuery(getWindowStartTime(), getWindowEndTime());
         fCompactingJob = compactingJob;
         compactingJob.schedule();
     }
@@ -466,25 +485,6 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
         refresh();
     }
 
-    /**
-     * @param signal
-     *            Signal received when window range is updated
-     */
-    @Override
-    @TmfSignalHandler
-    public void windowRangeUpdated(@Nullable TmfWindowRangeUpdatedSignal signal) {
-        super.windowRangeUpdated(signal);
-        if (signal == null) {
-            return;
-        }
-        if (getTrace() != null) {
-            final TmfTimeRange currentRange = signal.getCurrentRange();
-            updateRange(currentRange);
-        } else {
-            Activator.getDefault().logInfo("No Trace to update"); //$NON-NLS-1$
-        }
-    }
-
     private @Nullable ISegmentStoreProvider getSegmentProvider() {
         return fSegmentProvider;
     }
@@ -492,4 +492,10 @@ public abstract class AbstractSegmentStoreScatterGraphViewer extends TmfCommonXL
     private void setSegmentProvider(ISegmentStoreProvider provider) {
         fSegmentProvider = provider;
     }
+
+    @Override
+    public boolean isDirty() {
+        /* Check the parent's or this view's own dirtiness */
+        return super.isDirty() || (fDirty.get() != 0);
+    }
 }
\ No newline at end of file
This page took 0.028429 seconds and 5 git commands to generate.