linux.ui: make Kernel Memory view handle out of range requests

[deliverable/tracecompass.git] / analysis / org.eclipse.tracecompass.analysis.os.linux.ui / src / org / eclipse / tracecompass / internal / analysis / os / linux / ui / views / kernelmemoryusage / KernelMemoryUsageTreeViewer.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/kernelmemoryusage/KernelMemoryUsageTreeViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/kernelmemoryusage/KernelMemoryUsageTreeViewer.java
index 2a239a6fad8992b0d0a6c8c0b087c6eb99699245..7b009a0bb1ab81a5324b31f81b8a83a9888b52cd 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/kernelmemoryusage/KernelMemoryUsageTreeViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/kernelmemoryusage/KernelMemoryUsageTreeViewer.java
@@ -170,7 +170,12 @@ public class KernelMemoryUsageTreeViewer extends AbstractTmfTreeViewer {
         List<ITmfTreeViewerEntry> entryList = root.getChildren();
 
         try {
-            List<ITmfStateInterval> memoryStates = ss.queryFullState(start);
+            long newStart = Math.max(start, ss.getStartTime());
+            long newEnd = Math.min(end, ss.getCurrentEndTime());
+            if (ss.getStartTime() > newEnd || ss.getCurrentEndTime() < start) {
+                return root;
+            }
+            List<ITmfStateInterval> memoryStates = ss.queryFullState(newStart);
             List<Integer> threadQuarkList = ss.getSubAttributes(ITmfStateSystem.ROOT_ATTRIBUTE, false);
 
             for (Integer threadQuark : threadQuarkList) {