stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8283684: IGV: speed up filter application

Browse Source 
Reviewed-by: thartmann, kvn
This commit is contained in:
Roberto Castañeda Lozano 2022-05-03 07:42:18 +00:00
parent 7a4835178d
commit af1ee1cc55
3 changed files with 70 additions and 56 deletions
src/utils/IdealGraphVisualizer
Filter/src/main/java/com/sun/hotspot/igv/filter
CustomFilter.java
FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow
FilterTopComponent.java
View/src/main/java/com/sun/hotspot/igv/view
DiagramViewModel.java

52
src/utils/IdealGraphVisualizer/Filter/src/main/java/com/sun/hotspot/igv/filter/CustomFilter.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,16 +25,8 @@
package com.sun.hotspot.igv.filter;
import com.sun.hotspot.igv.graph.Diagram;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.script.*;
import org.openide.cookies.OpenCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
/**
@ -43,13 +35,14 @@ import org.openide.util.Exceptions;
*/
public class CustomFilter extends AbstractFilter {
public static final String JAVASCRIPT_HELPER_ID = "JavaScriptHelper";
private String code;
private String name;
private ScriptEngine engine;
public CustomFilter(String name, String code) {
public CustomFilter(String name, String code, ScriptEngine engine) {
this.name = name;
this.code = code;
this.engine = engine;
getProperties().setProperty("name", name);
}
@ -96,46 +89,13 @@ public class CustomFilter extends AbstractFilter {
return getName();
}
private static String getJsHelperText() {
InputStream is = null;
StringBuilder sb = new StringBuilder("if (typeof importPackage === 'undefined') { try { load('nashorn:mozilla_compat.js'); } catch (e) {} }"
+ "importPackage(Packages.com.sun.hotspot.igv.filter);"
+ "importPackage(Packages.com.sun.hotspot.igv.graph);"
+ "importPackage(Packages.com.sun.hotspot.igv.data);"
+ "importPackage(Packages.com.sun.hotspot.igv.util);"
+ "importPackage(java.awt);");
try {
FileObject fo = FileUtil.getConfigRoot().getFileObject(JAVASCRIPT_HELPER_ID);
is = fo.getInputStream();
BufferedReader r = new BufferedReader(new InputStreamReader(is));
String s;
while ((s = r.readLine()) != null) {
sb.append(s);
sb.append("\n");
}
} catch (IOException ex) {
Logger.getLogger("global").log(Level.SEVERE, null, ex);
} finally {
try {
is.close();
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
}
return sb.toString();
}
@Override
public void apply(Diagram d) {
try {
ScriptEngineManager sem = new ScriptEngineManager();
ScriptEngine e = sem.getEngineByName("ECMAScript");
e.eval(getJsHelperText());
Bindings b = e.getContext().getBindings(ScriptContext.ENGINE_SCOPE);
Bindings b = engine.getContext().getBindings(ScriptContext.ENGINE_SCOPE);
b.put("graph", d);
b.put("IO", System.out);
e.eval(code, b);
engine.eval(code, b);
} catch (ScriptException ex) {
Exceptions.printStackTrace(ex);
}

49
src/utils/IdealGraphVisualizer/FilterWindow/src/main/java/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,6 +35,9 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.*;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.script.*;
import javax.swing.JComboBox;
import javax.swing.UIManager;
import javax.swing.border.Border;
@ -67,10 +70,12 @@ public final class FilterTopComponent extends TopComponent implements LookupList
public static final String AFTER_ID = "after";
public static final String ENABLED_ID = "enabled";
public static final String PREFERRED_ID = "FilterTopComponent";
public static final String JAVASCRIPT_HELPER_ID = "JavaScriptHelper";
private CheckListView view;
private ExplorerManager manager;
private FilterChain filterChain;
private FilterChain sequence;
private ScriptEngine engine;
private Lookup.Result<FilterChain> result;
private JComboBox comboBox;
private List<FilterSetting> filterSettings;
@ -300,6 +305,36 @@ public final class FilterTopComponent extends TopComponent implements LookupList
return filterChain;
}
private static String getJsHelperText() {
InputStream is = null;
StringBuilder sb = new StringBuilder("if (typeof importPackage === 'undefined') { try { load('nashorn:mozilla_compat.js'); } catch (e) {} }"
+ "importPackage(Packages.com.sun.hotspot.igv.filter);"
+ "importPackage(Packages.com.sun.hotspot.igv.graph);"
+ "importPackage(Packages.com.sun.hotspot.igv.data);"
+ "importPackage(Packages.com.sun.hotspot.igv.util);"
+ "importPackage(java.awt);");
try {
FileObject fo = FileUtil.getConfigRoot().getFileObject(JAVASCRIPT_HELPER_ID);
is = fo.getInputStream();
BufferedReader r = new BufferedReader(new InputStreamReader(is));
String s;
while ((s = r.readLine()) != null) {
sb.append(s);
sb.append("\n");
}
} catch (IOException ex) {
Logger.getLogger("global").log(Level.SEVERE, null, ex);
} finally {
try {
is.close();
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
}
return sb.toString();
}
private FilterTopComponent() {
filterSettingsChangedEvent = new ChangedEvent<>(this);
initComponents();
@ -309,6 +344,14 @@ public final class FilterTopComponent extends TopComponent implements LookupList
sequence = new FilterChain();
filterChain = new FilterChain();
ScriptEngineManager sem = new ScriptEngineManager();
engine = sem.getEngineByName("ECMAScript");
try {
engine.eval(getJsHelperText());
} catch (ScriptException ex) {
Exceptions.printStackTrace(ex);
}
engine.getContext().getBindings(ScriptContext.ENGINE_SCOPE).put("IO", System.out);
initFilters();
manager = new ExplorerManager();
manager.setRootContext(new AbstractNode(new FilterChildren()));
@ -339,7 +382,7 @@ public final class FilterTopComponent extends TopComponent implements LookupList
}
public void newFilter() {
CustomFilter cf = new CustomFilter("My custom filter", "");
CustomFilter cf = new CustomFilter("My custom filter", "", engine);
if (cf.openInEditor()) {
sequence.addFilter(cf);
FileObject fo = getFileObject(cf);
@ -437,7 +480,7 @@ public final class FilterTopComponent extends TopComponent implements LookupList
String displayName = fo.getName();
final CustomFilter cf = new CustomFilter(displayName, code);
final CustomFilter cf = new CustomFilter(displayName, code, engine);
map.put(displayName, cf);
String after = (String) fo.getAttribute(AFTER_ID);

25
src/utils/IdealGraphVisualizer/View/src/main/java/com/sun/hotspot/igv/view/DiagramViewModel.java

@ -27,15 +27,22 @@ package com.sun.hotspot.igv.view;
import com.sun.hotspot.igv.data.*;
import com.sun.hotspot.igv.data.services.Scheduler;
import com.sun.hotspot.igv.difference.Difference;
import com.sun.hotspot.igv.filter.CustomFilter;
import com.sun.hotspot.igv.filter.ColorFilter;
import com.sun.hotspot.igv.filter.FilterChain;
import com.sun.hotspot.igv.graph.Diagram;
import com.sun.hotspot.igv.graph.Figure;
import com.sun.hotspot.igv.graph.MatcherSelector;
import com.sun.hotspot.igv.settings.Settings;
import com.sun.hotspot.igv.util.RangeSliderModel;
import java.awt.Color;
import java.util.*;
import org.openide.util.Lookup;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
/**
*
@ -442,6 +449,10 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
setPositions(index, index);
}
private static ColorFilter.ColorRule stateColorRule(String state, Color color) {
return new ColorFilter.ColorRule(new MatcherSelector(new Properties.RegexpPropertyMatcher("state", state)), color);
}
public Diagram getDiagramToView() {
if (diagram == null) {
@ -458,11 +469,11 @@ public class DiagramViewModel extends RangeSliderModel implements ChangedListene
Settings.get().get(Settings.NODE_TINY_TEXT, Settings.NODE_TINY_TEXT_DEFAULT));
getFilterChain().apply(diagram, getSequenceFilterChain());
if (getFirstPosition() != getSecondPosition()) {
CustomFilter f = new CustomFilter(
"difference", "colorize('state', 'same', white);"
+ "colorize('state', 'changed', orange);"
+ "colorize('state', 'new', green);"
+ "colorize('state', 'deleted', red);");
ColorFilter f = new ColorFilter("");
f.addRule(stateColorRule("same", Color.white));
f.addRule(stateColorRule("changed", Color.orange));
f.addRule(stateColorRule("new", Color.green));
f.addRule(stateColorRule("deleted", Color.red));
f.apply(diagram);
}
}