Skip to content

Commit e9b4308

Browse files
jisedlacjisedlac
committed
Common constant for merged items preview
1 parent 440a87a commit e9b4308

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapV
370370

371371
valuesCount = values.size();
372372

373-
NodesComputer<InstanceCounter.Record> computer = new NodesComputer<InstanceCounter.Record>(valuesCount, 20) {
373+
NodesComputer<InstanceCounter.Record> computer = new NodesComputer<InstanceCounter.Record>(valuesCount, UIThresholds.MAX_MERGED_OBJECTS) {
374374
protected boolean sorts(DataType dataType) {
375375
return true;
376376
}
@@ -422,7 +422,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
422422

423423
valuesCount = counter.size();
424424

425-
NodesComputer<PrimitiveCounter.Record> computer = new NodesComputer<PrimitiveCounter.Record>(valuesCount, 20) {
425+
NodesComputer<PrimitiveCounter.Record> computer = new NodesComputer<PrimitiveCounter.Record>(valuesCount, UIThresholds.MAX_MERGED_OBJECTS) {
426426
protected boolean sorts(DataType dataType) {
427427
return true;
428428
}
@@ -505,7 +505,7 @@ protected Object getValue(DataType type, Heap heap) {
505505
protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
506506
final String fieldName = fieldName();
507507

508-
NodesComputer<Instance> computer = new NodesComputer<Instance>(valuesCount, 20) {
508+
NodesComputer<Instance> computer = new NodesComputer<Instance>(valuesCount, UIThresholds.MAX_MERGED_OBJECTS) {
509509
protected boolean sorts(DataType dataType) {
510510
return true;
511511
}
@@ -611,7 +611,7 @@ protected Object getValue(DataType type, Heap heap) {
611611
protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
612612
final String fieldName = fieldName();
613613

614-
NodesComputer<Instance> computer = new NodesComputer<Instance>(valuesCount, 20) {
614+
NodesComputer<Instance> computer = new NodesComputer<Instance>(valuesCount, UIThresholds.MAX_MERGED_OBJECTS) {
615615
protected boolean sorts(DataType dataType) {
616616
return true;
617617
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ private abstract class ReferenceNode extends InstanceNode.IncludingNull {
311311
protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
312312
HeapOperations.initializeReferences(heap);
313313

314-
NodesComputer<Instance> computer = new NodesComputer<Instance>(getCount(), 20) {
314+
NodesComputer<Instance> computer = new NodesComputer<Instance>(getCount(), UIThresholds.MAX_MERGED_OBJECTS) {
315315
protected boolean sorts(DataType dataType) {
316316
return !DataType.COUNT.equals(dataType);
317317
}
@@ -414,7 +414,7 @@ protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapV
414414
if (!referer.equals(logicalReferer(referencesI.next().getDefiningInstance())))
415415
referencesI.remove();
416416

417-
NodesComputer<Value> computer = new NodesComputer<Value>(references.size(), 20) {
417+
NodesComputer<Value> computer = new NodesComputer<Value>(references.size(), UIThresholds.MAX_MERGED_OBJECTS) {
418418
protected boolean sorts(DataType dataType) {
419419
return !DataType.COUNT.equals(dataType);
420420
}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void run() {
165165
if (data.size() == 1) return new HeapViewerNode[] { data.iterator().next() };
166166

167167
final Collection<HeapViewerNode> _data = data;
168-
NodesComputer<HeapViewerNode> computer = new NodesComputer<HeapViewerNode>(_data.size(), UIThresholds.MAX_CLASS_INSTANCES) {
168+
NodesComputer<HeapViewerNode> computer = new NodesComputer<HeapViewerNode>(_data.size(), UIThresholds.MAX_MERGED_OBJECTS) {
169169
protected boolean sorts(DataType dataType) {
170170
return true;
171171
}
@@ -338,7 +338,7 @@ private static void storeItem(String itemName, boolean value) {
338338
})
339339
static class GCRootNode extends InstanceNode {
340340

341-
private final int maxNodes = UIThresholds.MAX_CONTAINER_INSTANCES;
341+
// private final int maxNodes = UIThresholds.MAX_MERGED_OBJECTS;
342342

343343
private final List<Instance> instances = new ArrayList();
344344

@@ -358,20 +358,20 @@ public int getCount() {
358358
}
359359

360360

361-
protected HeapViewerNode[] computeChildren(RootNode root) {
362-
int itemsCount = instances.size();
363-
if (itemsCount <= maxNodes) {
364-
HeapViewerNode[] nodes = new HeapViewerNode[itemsCount];
365-
for (int i = 0; i < itemsCount; i++) nodes[i] = createNode(instances.get(i));
366-
return nodes;
367-
} else {
368-
return super.computeChildren(root);
369-
}
370-
}
361+
// protected HeapViewerNode[] computeChildren(RootNode root) {
362+
// int itemsCount = instances.size();
363+
// if (itemsCount <= maxNodes) {
364+
// HeapViewerNode[] nodes = new HeapViewerNode[itemsCount];
365+
// for (int i = 0; i < itemsCount; i++) nodes[i] = createNode(instances.get(i));
366+
// return nodes;
367+
// } else {
368+
// return super.computeChildren(root);
369+
// }
370+
// }
371371

372372
protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
373373
final boolean isArray = getInstance().getJavaClass().isArray();
374-
NodesComputer<Instance> computer = new NodesComputer<Instance>(instances.size(), maxNodes) {
374+
NodesComputer<Instance> computer = new NodesComputer<Instance>(instances.size(), UIThresholds.MAX_MERGED_OBJECTS) {
375375
protected boolean sorts(DataType dataType) {
376376
if (DataType.COUNT.equals(dataType) || (DataType.OWN_SIZE.equals(dataType) && !isArray)) return false;
377377
return true;

‎visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/UIThresholds.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public final class UIThresholds {
7575
// Maximum number of instances displayed as roots in the OQL Objects view
7676
public static final int MAX_OQL_TOPLEVEL_INSTANCES = Integer.getInteger("heapviewer.toplevelOQLInstancesThreshold", 300); // NOI18N
7777

78+
// Maximum number of items displayed as children of a merged view (fields, references, GC roots etc.)
79+
public static final int MAX_MERGED_OBJECTS = Integer.getInteger("heapviewer.mergedObjectsThreshold", 20); // NOI18N
80+
7881

7982
// Number of sample objects
8083
public static final int SAMPLE_OBJECTS_COUNT = 100;

0 commit comments

Comments
 (0)