Skip to content

8360039: JFR: Improve parser logging of constants #25903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, 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
Expand Down Expand Up @@ -421,14 +421,29 @@ private String textify(Object o) {
return o.getClass().getName();
}
if (o.getClass().isArray()) {
Object[] array = (Object[]) o;
if (array.length > 0) {
return textify(array[0]) + "[]"; // can it be recursive?
}
return textifyArray((Object[])o);
}
return String.valueOf(o);
}

private String textifyArray(Object[] array) {
int length = array.length;
if (length > 0) {
Object element = array[0];
if (element != null) {
if (element instanceof String s) {
// Probably an enumeration type, e.g. ThreadState. Remove array indirection
return textify(s);
}
if (element.getClass().isArray()) {
Object[] subArray = (Object[]) element;
return element.getClass().getComponentType().getName() + "[" + subArray.length + "]" + "[" + length + "]";
}
}
}
return array.getClass().getComponentType().getName() + "[" + length + "]";
}

private String getName(long id) {
Type type = typeMap.get(id);
return type == null ? ("unknown(" + id + ")") : type.getName();
Expand Down