GH-85 filter a flat profile for sampled CPU snapshot using its instrumentation filter

Author: thurka

visualvm/libs.profiler/lib.profiler/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.jfluid/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/ResultsSnapshot.java

@@ -43,6 +43,7 @@
 
 package org.graalvm.visualvm.lib.jfluid.results;
 
+import org.graalvm.visualvm.lib.jfluid.ProfilerEngineSettings;
 import org.graalvm.visualvm.lib.jfluid.utils.StringUtils;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -136,4 +137,8 @@ private void debugValues() {
         LOGGER.finest("beginTime: " + beginTime); // NOI18N
         LOGGER.finest("timeTaken: " + timeTaken); // NOI18N
     }
+
+    // used by LoadedSnapshot when loading from file
+    public void setProfilerSettings(ProfilerEngineSettings pes) {
+    }
 }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCCTContainer.java

@@ -540,6 +540,7 @@ protected FlatProfileContainer postGenerateFlatProfile() {
         invPerMethodId = null;
         methodsOnStack = null;
 
+        fpc.filterOriginalData(cpuResSnapshot.filter);
         return fpc;
     }
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUResultsSnapshot.java

@@ -57,7 +57,10 @@
 import java.util.ResourceBundle;
 import java.util.WeakHashMap;
 import java.util.logging.Level;
+import org.graalvm.visualvm.lib.jfluid.ProfilerEngineSettings;
 import org.graalvm.visualvm.lib.jfluid.client.ClientUtils;
+import org.graalvm.visualvm.lib.jfluid.filters.InstrumentationFilter;
+import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
 import org.graalvm.visualvm.lib.jfluid.results.CCTNode;
 import org.graalvm.visualvm.lib.jfluid.results.FilterSortSupport;
 import org.graalvm.visualvm.lib.jfluid.utils.Wildcards;
@@ -163,6 +166,7 @@ public static class NoDataAvailableException extends Exception {
     protected PrestimeCPUCCTNode[] rootNode; // Per-view root nodes
     protected CPUCCTContainer[][] threadCCTContainers; // [method|class|package aggregation level][0-nThreads] -> CPUCCTContainer
     protected boolean collectingTwoTimeStamps;
+    protected InstrumentationFilter filter;
 
     // Number of instrumented methods - may be smaller than the size of the above arrays
     protected int nInstrMethods;
@@ -179,9 +183,19 @@ public CPUResultsSnapshot() { // No-arg constructor needed for above serializati
     public CPUResultsSnapshot(long beginTime, long timeTaken, CPUCCTProvider cctProvider, boolean collectingTwoTimestamps,
                               String[] instrClassNames, String[] instrMethodNames, String[] instrMethodSigs, int nInstrMethods)
                        throws NoDataAvailableException {
+        this(beginTime, timeTaken, cctProvider,
+             collectingTwoTimestamps, null,
+             instrClassNames, instrMethodNames, instrMethodSigs, nInstrMethods);
+    }
+
+    public CPUResultsSnapshot(long beginTime, long timeTaken,
+                              CPUCCTProvider cctProvider, boolean collectingTwoTimestamps, InstrumentationFilter filter,
+                              String[] instrClassNames, String[] instrMethodNames, String[] instrMethodSigs, int nInstrMethods)
+                       throws NoDataAvailableException {
         super(beginTime, timeTaken);
 
         this.collectingTwoTimeStamps = collectingTwoTimestamps;
+        this.filter = filter;
 
         this.instrMethodClassesViews = new String[3][];
         this.instrMethodClassesViews[METHOD_LEVEL_VIEW] = instrClassNames;
@@ -216,6 +230,13 @@ public CPUResultsSnapshot(long beginTime, long timeTaken, CPUCCTProvider cctProv
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
 
+    @Override
+    public void setProfilerSettings(ProfilerEngineSettings pes) {
+        if (pes.getCPUProfilingType() == CommonConstants.CPU_SAMPLED) {
+            filter = pes.getInstrumentationFilter();
+        }
+    }
+
     public boolean isCollectingTwoTimeStamps() {
         return collectingTwoTimeStamps;
     }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/FlatProfileContainer.java

@@ -44,6 +44,7 @@
 package org.graalvm.visualvm.lib.jfluid.results.cpu;
 
 import org.graalvm.visualvm.lib.jfluid.client.ClientUtils;
+import org.graalvm.visualvm.lib.jfluid.filters.InstrumentationFilter;
 import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
 import org.graalvm.visualvm.lib.jfluid.utils.IntSorter;
 import org.graalvm.visualvm.lib.jfluid.utils.LongSorter;
@@ -189,6 +190,41 @@ public void filterOriginalData(String[] filters, int type, double valueFilter) {
 //        }
     }
 
+    public void filterOriginalData(InstrumentationFilter filter) {
+        if (filter == null || filter.isEmpty()) {
+            nRows = totalMethods; // Effectively removes all filtering
+
+            return;
+        }
+        // Now go through all methods and move those that don't pass filter to the end of the array
+        nRows = totalMethods;
+
+        for (int i = 0; i < nRows; i++) {
+            if (!filter.passes(getMethodNameAtRow(i).replace('.', '/'))) {
+                int endIdx = --nRows;
+
+                if (i >= endIdx) {
+                    continue;
+                }
+
+                // Swap the current element and the one at (nRows - 1) index
+                swap(i, endIdx);
+
+                swap(methodIds,i,endIdx);
+                swap(timeInMcs0,i,endIdx);
+                swap(totalTimeInMcs0,i,endIdx);
+
+                if (collectingTwoTimeStamps) {
+                    swap(timeInMcs1,i,endIdx);
+                    swap(totalTimeInMcs1,i,endIdx);
+                }
+
+                swap(nInvocations,i,endIdx);
+                i--; // Because we've just put an unchecked element at the current position
+            }
+        }
+    }
+
     public void sortBy(int sortCrit, boolean order) {
 //        switch (sortCrit) {
 //            case SORT_BY_NAME:
@@ -559,17 +595,17 @@ private boolean passedFilter(String value, String filter, int type) {
 //        arr[i2] = itmp;
 //    }
 //
-//    private static void swap(long[] arr, int i1, int i2) {
-//        long itmp = arr[i1];
-//        arr[i1] = arr[i2];
-//        arr[i2] = itmp;
-//    }
-//    
-//    private static void swap(int[] arr, int i1, int i2) {
-//        int itmp = arr[i1];
-//        arr[i1] = arr[i2];
-//        arr[i2] = itmp;
-//    }
+    private static void swap(long[] arr, int i1, int i2) {
+        long itmp = arr[i1];
+        arr[i1] = arr[i2];
+        arr[i2] = itmp;
+    }
+
+    private static void swap(int[] arr, int i1, int i2) {
+        int itmp = arr[i1];
+        arr[i1] = arr[i2];
+        arr[i2] = itmp;
+    }
 
     protected void swap(int a, int b) {}
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java

@@ -679,7 +679,9 @@ public final CPUResultsSnapshot createSnapshot(
                 instrMethodSigs[counter] = mi.signature;
                 counter++;
             }
-            return new CPUResultsSnapshot(since, System.currentTimeMillis(), ccgb, ccgb.isCollectingTwoTimeStamps(), instrMethodClasses, instrMethodNames, instrMethodSigs, miCount);
+            return new CPUResultsSnapshot(since, System.currentTimeMillis(),
+                    ccgb, ccgb.isCollectingTwoTimeStamps(), filter,
+                    instrMethodClasses, instrMethodNames, instrMethodSigs, miCount);
         }
     }
 

visualvm/libs.profiler/profiler/nbproject/project.xml

@@ -74,7 +74,7 @@ made subject to such option by the copyright holder.
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.1</specification-version>
+                        <specification-version>2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/LoadedSnapshot.java

@@ -65,6 +65,7 @@
 import javax.management.openmbean.CompositeData;
 import javax.swing.SwingUtilities;
 import org.graalvm.visualvm.lib.common.ProfilingSettingsPresets;
+import org.graalvm.visualvm.lib.jfluid.ProfilerEngineSettings;
 import org.graalvm.visualvm.lib.jfluid.results.cpu.StackTraceSnapshotBuilder;
 import org.graalvm.visualvm.lib.jfluid.results.jdbc.JdbcResultsSnapshot;
 import org.graalvm.visualvm.lib.jfluid.results.memory.SampledMemoryResultsSnapshot;
@@ -502,6 +503,9 @@ private boolean load(DataInputStream dis) throws IOException {
 
             return false;
         }
+        ProfilerEngineSettings pes = new ProfilerEngineSettings();
+        settings.applySettings(pes);
+        snapshot.setProfilerSettings(pes);
 
         return true;
     }