tmf.ui: Add early exit to Histogram

Speed up histogram by not redrawing when the data is unchanged.

Change-Id: Iea05f628da6e1baea4fd0be3b6071f363099c9bb
Signed-off-by: Matthew Khouzam <[email protected]>
Signed-off-by: Arnaud Fiorini <[email protected]>

Author: MatthewKhouzam

tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/Histogram.java

@@ -52,8 +52,6 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.tracecompass.common.core.log.TraceCompassLog;
-import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils;
-import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.ScopeLog;
 import org.eclipse.tracecompass.internal.tmf.ui.views.histogram.HistogramTimeAdapter;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalHandler;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager;
@@ -73,6 +71,10 @@
 import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.ITimeDataProvider;
 import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphColorScheme;
 import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphScale;
+import org.eclipse.tracecompass.traceeventlogger.LogUtils;
+import org.eclipse.tracecompass.traceeventlogger.LogUtils.ScopeLog;
+
+import com.google.common.base.Objects;
 
 /**
  * Re-usable histogram widget.
@@ -661,12 +663,12 @@ protected void moveCursor(final int keyCode) {
      */
     @Override
     public void modelUpdated() {
-        try (TraceCompassLogUtils.FlowScopeLog fs = new TraceCompassLogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:ModelUpdated").setCategory("Histogram").build()) { //$NON-NLS-1$ //$NON-NLS-2$
+        try (LogUtils.FlowScopeLog fs = new LogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:ModelUpdated").setCategory("Histogram").build()) { //$NON-NLS-1$ //$NON-NLS-2$
             if (!fCanvas.isDisposed() && fCanvas.getDisplay() != null) {
                 fCanvas.getDisplay().asyncExec(() -> {
                     int canvasWidth = -1;
                     int canvasHeight = -1;
-                    try (TraceCompassLogUtils.FlowScopeLog fs1 = new TraceCompassLogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:getbounds").setParentScope(fs).build()) { //$NON-NLS-1$
+                    try (LogUtils.FlowScopeLog fs1 = new LogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:getBounds").setParentScope(fs).build()) { //$NON-NLS-1$
                         if (!fCanvas.isDisposed()) {
                             // Retrieve and normalize the data
                             canvasWidth = fCanvas.getBounds().width;
@@ -678,8 +680,14 @@ public void modelUpdated() {
                         return;
                     }
                     fDataModel.setSelection(fSelectionBegin, fSelectionEnd);
-                    fScaledData = fDataModel.scaleTo(canvasWidth, canvasHeight, 1);
-                    try (TraceCompassLogUtils.FlowScopeLog fs1 = new TraceCompassLogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:ui").setParentScope(fs).build()) { //$NON-NLS-1$
+                    try (LogUtils.FlowScopeLog fs1 = new LogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:scaleData").setParentScope(fs).build()) { //$NON-NLS-1$
+                        HistogramScaledData scaledData = fDataModel.scaleTo(canvasWidth, canvasHeight, 1);
+                        if (Objects.equal(scaledData, fScaledData)) {
+                            return;
+                        }
+                        fScaledData = scaledData;
+                    }
+                    try (LogUtils.FlowScopeLog fs1 = new LogUtils.FlowScopeLogBuilder(LOGGER, Level.FINER, "Histogram:redraw").setParentScope(fs).build()) { //$NON-NLS-1$
                         synchronized (fDataModel) {
                             if (fScaledData != null) {
                                 fCanvas.redraw();

tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramScaledData.java

@@ -20,6 +20,7 @@
 package org.eclipse.tracecompass.tmf.ui.views.histogram;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Convenience class/struct for scaled histogram data.
@@ -232,4 +233,33 @@ private int getOffsetIndex(int index) {
     public long getBucketEndTime(int index) {
         return getBucketStartTime(index + 1);
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Arrays.hashCode(fData);
+        result = prime * result + Arrays.hashCode(fLostEventsData);
+        result = prime * result
+                + Objects.hash(fBarWidth, fBucketDuration, fFirstBucketTime, fFirstEventTime, fHeight, fLastBucket, fMaxCombinedValue, fMaxValue, fScalingFactor, fScalingFactorCombined, fSelectionBeginBucket, fSelectionEndBucket, fWidth);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        HistogramScaledData other = (HistogramScaledData) obj;
+        return fBarWidth == other.fBarWidth && Double.doubleToLongBits(fBucketDuration) == Double.doubleToLongBits(other.fBucketDuration) && Arrays.equals(fData, other.fData) && fFirstBucketTime == other.fFirstBucketTime
+                && fFirstEventTime == other.fFirstEventTime && fHeight == other.fHeight && fLastBucket == other.fLastBucket && Arrays.equals(fLostEventsData, other.fLostEventsData) && fMaxCombinedValue == other.fMaxCombinedValue
+                && fMaxValue == other.fMaxValue && Double.doubleToLongBits(fScalingFactor) == Double.doubleToLongBits(other.fScalingFactor) && Double.doubleToLongBits(fScalingFactorCombined) == Double.doubleToLongBits(other.fScalingFactorCombined)
+                && fSelectionBeginBucket == other.fSelectionBeginBucket && fSelectionEndBucket == other.fSelectionEndBucket && fWidth == other.fWidth;
+    }
 }