From 4fc7a1cf91494b224fff012c12d920a63e1c7c1a Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 8 Dec 2014 09:20:38 -0500 Subject: [PATCH] Bug 454293 - Allow extending classes to turn off CPU load Change-Id: I9fa14da634550c2fb852a4853290ca8971d78146 Signed-off-by: Marc Khouzam Reviewed-on: https://git.eclipse.org/r/37736 --- .../internal/ui/view/MulticoreVisualizerCanvas.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java index a32ba794bb8..7966741b417 100755 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/ui/view/MulticoreVisualizerCanvas.java @@ -18,6 +18,7 @@ * Marc Dumais (Ericsson) - Bug 405390 * Marc Dumais (Ericsson) - Bug 407321 * Xavier Raynaud (Kalray) - Bug 431935 + * Marc Khouzam (Ericsson) - Bug 454293 *******************************************************************************/ package org.eclipse.cdt.dsf.gdb.multicorevisualizer.internal.ui.view; @@ -412,6 +413,13 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas return max_edge; } + /** + * Allows overriding classes to change this behavior. + */ + protected boolean getCPULoadEnabled() { + return m_model == null ? false : m_model.getLoadMetersEnabled(); + } + /** Recache persistent objects (tiles, etc.) for new monitor */ // synchronized so we don't change recache flags while doing a recache public synchronized void recache() { @@ -466,7 +474,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas if (visualizerCpu != null) { // update CPUs load meter MulticoreVisualizerLoadMeter meter = visualizerCpu.getLoadMeter(); - meter.setEnabled(m_model.getLoadMetersEnabled()); + meter.setEnabled(getCPULoadEnabled()); meter.setLoad(modelCpu.getLoad()); meter.setHighLoadWatermark(modelCpu.getHighLoadWatermark()); @@ -510,7 +518,7 @@ public class MulticoreVisualizerCanvas extends GraphicCanvas } // make room when load meters are present, else use a more compact layout - int core_margin = m_model.getLoadMetersEnabled() ? 20 : 12; // margin around cores in a CPU + int core_margin = getCPULoadEnabled() ? 20 : 12; // margin around cores in a CPU int core_separation = 4; // spacing between cores int loadMeterWidth = core_margin*3/5;