Skip to content

Commit 84d45e8

Browse files
committed
GH-117 max count fixed for Field histogram, Merged References, Merged GC Roots
1 parent 5e09bb2 commit 84d45e8

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
7575
import org.graalvm.visualvm.lib.profiler.api.icons.LanguageIcons;
7676
import org.graalvm.visualvm.lib.profiler.api.icons.ProfilerIcons;
77+
import org.graalvm.visualvm.lib.ui.swing.renderer.HideableBarRenderer;
7778
import org.graalvm.visualvm.lib.ui.swing.renderer.NormalBoldGrayRenderer;
7879
import org.openide.util.NbBundle;
7980
import org.openide.util.NbPreferences;
@@ -133,10 +134,11 @@ class JavaFieldsPlugin extends HeapViewPlugin {
133134

134135
heap = context.getFragment().getHeap();
135136

137+
TreeTableViewColumn count;
136138
TreeTableViewColumn[] columns = new TreeTableViewColumn[] {
137139
new TreeTableViewColumn.Name(),
138140
new TreeTableViewColumn.LogicalValue(),
139-
new TreeTableViewColumn.Count(heap, true, true),
141+
count = new TreeTableViewColumn.Count(heap, true, true),
140142
new TreeTableViewColumn.OwnSize(heap, false, false),
141143
new TreeTableViewColumn.RetainedSize(heap, false, false),
142144
new TreeTableViewColumn.ObjectID()
@@ -156,6 +158,7 @@ protected HeapViewerNode[] computeData(RootNode root, Heap heap, String viewID,
156158
List<HeapViewerNode> fieldNodes = new ArrayList<>();
157159

158160
if (cFieldsHisto) {
161+
((HideableBarRenderer)count.getRenderer()).setMaxValue(wrapper.getInstancesCount());
159162
HeapViewerNode[] histo = getClassFieldsHistogram(wrapper, root, heap, viewID, viewFilter, dataTypes, sortOrders, progress);
160163
fieldNodes.addAll(Arrays.asList(histo));
161164
} else {

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaReferencesPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
8080
import org.graalvm.visualvm.lib.profiler.api.icons.ProfilerIcons;
8181
import org.graalvm.visualvm.lib.ui.UIUtils;
82+
import org.graalvm.visualvm.lib.ui.swing.renderer.HideableBarRenderer;
8283
import org.graalvm.visualvm.lib.ui.swing.renderer.LabelRenderer;
8384
import org.openide.util.Lookup;
8485
import org.openide.util.NbBundle;
@@ -125,10 +126,11 @@ class JavaReferencesPlugin extends HeapViewPlugin {
125126

126127
heap = context.getFragment().getHeap();
127128

129+
TreeTableViewColumn count;
128130
TreeTableViewColumn[] columns = new TreeTableViewColumn[] {
129131
new TreeTableViewColumn.Name(),
130132
new TreeTableViewColumn.LogicalValue(),
131-
new TreeTableViewColumn.Count(heap, true, true),
133+
count = new TreeTableViewColumn.Count(heap, true, true),
132134
new TreeTableViewColumn.OwnSize(heap, false, false),
133135
new TreeTableViewColumn.RetainedSize(heap, false, false),
134136
new TreeTableViewColumn.ObjectID()
@@ -166,6 +168,7 @@ public void run() {
166168

167169
// if (!mergedReferences) return new HeapViewerNode[] { new TextNode(Bundle.JavaReferencesPlugin_NoReferencesFiltered()) };
168170

171+
((HideableBarRenderer)count.getRenderer()).setMaxValue(wrapper.getInstancesCount());
169172
return computeInstancesReferences(wrapper, root, heap, viewID, null, dataTypes, sortOrders, progress);
170173
} else {
171174
SwingUtilities.invokeLater(new Runnable() {

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/PathToGCRootPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
8383
import org.graalvm.visualvm.lib.profiler.api.icons.ProfilerIcons;
8484
import org.graalvm.visualvm.lib.ui.UIUtils;
85+
import org.graalvm.visualvm.lib.ui.swing.renderer.HideableBarRenderer;
8586
import org.graalvm.visualvm.lib.ui.swing.renderer.LabelRenderer;
8687
import org.graalvm.visualvm.lib.ui.swing.renderer.MultiRenderer;
8788
import org.graalvm.visualvm.lib.ui.swing.renderer.NormalBoldGrayRenderer;
@@ -128,10 +129,11 @@ public PathToGCRootPlugin(HeapContext context, HeapViewerActions actions) {
128129

129130
heap = context.getFragment().getHeap();
130131

132+
TreeTableViewColumn count;
131133
TreeTableViewColumn[] columns = new TreeTableViewColumn[] {
132134
new TreeTableViewColumn.Name(),
133135
new TreeTableViewColumn.LogicalValue(),
134-
new TreeTableViewColumn.Count(heap, true, true),
136+
count = new TreeTableViewColumn.Count(heap, true, true),
135137
new TreeTableViewColumn.OwnSize(heap, false, false),
136138
new TreeTableViewColumn.RetainedSize(heap, false, false),
137139
new TreeTableViewColumn.ObjectID()
@@ -191,6 +193,7 @@ public void run() {
191193
data = computeInstanceRoots(instance, progress);
192194
if (data != null) showingClass = false;
193195
} else {
196+
((HideableBarRenderer)count.getRenderer()).setMaxValue(wrapper.getInstancesCount());
194197
data = computeInstancesRoots(wrapper.getInstancesIterator(), wrapper.getInstancesCount(), progress);
195198
if (data != null) showingClass = true;
196199
}

0 commit comments

Comments
 (0)