Mercurial > hg > truffle
changeset 3196:240d921078f3
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Fri, 08 Jul 2011 18:02:04 +0200 |
parents | da99d8a05d9a (current diff) 2bc8c1134534 (diff) |
children | ccae0eb6c652 |
files | |
diffstat | 6 files changed, 35 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java Fri Jul 08 18:01:29 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java Fri Jul 08 18:02:04 2011 +0200 @@ -28,6 +28,7 @@ import com.sun.hotspot.igv.data.services.GroupOrganizer; import com.sun.hotspot.igv.data.Pair; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -41,27 +42,17 @@ } public List<Pair<String, List<Group>>> organize(List<String> subFolders, List<Group> groups) { - List<Pair<String, List<Group>>> result = new ArrayList<Pair<String, List<Group>>>(); - if (groups.size() == 1 && subFolders.size() > 0) { result.add(new Pair<String, List<Group>>("", groups)); } else { for (Group g : groups) { - List<Group> children = new ArrayList<Group>(); - children.add(g); - if(false && g.getGraphs().size() == 1) { - //g.getGraphs().get(0).setName(g.getName() + " / " + g.getGraphs().get(0).getName()); - result.add(new Pair<String, List<Group>>("", children)); - } else { - Pair<String, List<Group>> p = new Pair<String, List<Group>>(); - p.setLeft(g.getName()); - p.setRight(children); - result.add(p); - } + Pair<String, List<Group>> p = new Pair<String, List<Group>>(); + p.setLeft(g.getName()); + p.setRight(Arrays.asList(g)); + result.add(p); } } - return result; } }
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Fri Jul 08 18:01:29 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Fri Jul 08 18:02:04 2011 +0200 @@ -186,6 +186,10 @@ } public Collection<InputBlock> schedule(InputGraph graph) { + if (graph.getNodes().isEmpty()) { + return Collections.emptyList(); + } + if (graph.getBlocks().size() > 0) { Collection<InputNode> tmpNodes = new ArrayList<InputNode>(graph.getNodes()); for (InputNode n : tmpNodes) { @@ -207,7 +211,6 @@ buildCommonDominators(); scheduleLatest(); - InputBlock noBlock = null; for (InputNode n : graph.getNodes()) { if (graph.getBlock(n) == null) { @@ -225,9 +228,7 @@ } } - public void scheduleLatest() { - - + private void scheduleLatest() { Node root = findRoot(); if(root == null) { assert false : "No root found!"; @@ -552,21 +553,30 @@ } private Node findRoot() { - + Node minNode = null; Node alternativeRoot = null; - for (Node n : nodes) { - InputNode inputNode = n.inputNode; + + for (Node node : nodes) { + InputNode inputNode = node.inputNode; String s = inputNode.getProperties().get("name"); if (s != null && s.equals("Root")) { - return n; + return node; } - if (n.preds.size() == 0) { - alternativeRoot = n; + if (alternativeRoot == null && node.preds.isEmpty()) { + alternativeRoot = node; + } + + if (minNode == null || node.inputNode.getId() < minNode.inputNode.getId()) { + minNode = node; } } - return alternativeRoot; + if (alternativeRoot != null) { + return alternativeRoot; + } else { + return minNode; + } } public void buildUpGraph() {
--- a/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties Fri Jul 08 18:01:29 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties Fri Jul 08 18:02:04 2011 +0200 @@ -1,7 +1,7 @@ -currentVersion=IdealGraphVisualizer {0} -LBL_splash_window_title=Starting IdealGraphVisualizer -SPLASH_WIDTH=475 -SplashProgressBarBounds=0,268,473,6 -SplashProgressBarColor=0xFFFFFF -SplashRunningTextBounds=10,281,459,12 -SplashRunningTextColor=0xFFFFFF +currentVersion=IdealGraphVisualizer {0} +LBL_splash_window_title=Starting IdealGraphVisualizer +SPLASH_WIDTH=475 +SplashProgressBarBounds=0,273,475,6 +SplashProgressBarColor=0xFFFFFF +SplashRunningTextBounds=10,283,460,12 +SplashRunningTextColor=0xFFFFFF
Binary file src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif has changed
Binary file src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif has changed
--- a/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties Fri Jul 08 18:01:29 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties Fri Jul 08 18:02:04 2011 +0200 @@ -1,2 +1,2 @@ -CTL_MainWindow_Title=IdealGraphVisualizer {0} -CTL_MainWindow_Title_No_Project=IdealGraphVisualizer {0} +CTL_MainWindow_Title=IdealGraphVisualizer +CTL_MainWindow_Title_No_Project=IdealGraphVisualizer