infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-25 15:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8209960: -Xlog:jfr* doesn't work with the JFR

Browse Source 
Reviewed-by: mgronlun
This commit is contained in:
Erik Gahlin 2018-11-05 14:40:16 +01:00
parent b9aa498282
commit 34d2e1ea70
14 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
View File

@ -446,6 +446,12 @@ void JfrStartFlightRecordingDCmd::execute(DCmdSource source, TRAPS) {
assert(element != NULL, "invariant");
JfrJavaSupport::set_array_element(settings, element, i, CHECK);
}
} else {
settings = JfrJavaSupport::new_string_array(1, CHECK);
assert(settings != NULL, "invariant");
jobject element = JfrJavaSupport::new_string("default", CHECK);
assert(element != NULL, "invariant");
JfrJavaSupport::set_array_element(settings, element, 0, CHECK);
}
static const char klass[] = "jdk/jfr/internal/dcmd/DCmdStart";

3
src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
View File

@ -81,4 +81,7 @@ public final class JVMSupport {
public static boolean isNotAvailable() {
return notAvailable;
}
public static void tryToInitializeJVM() {
}
}

10
src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
View File

@ -80,19 +80,11 @@ public enum LogTag {
JFR_DCMD(10);
/* set from native side */
private volatile int tagSetLevel = 100; // prevent logging if JVM log system has not been initialized
volatile int tagSetLevel = 100; // prevent logging if JVM log system has not been initialized
final int id;
LogTag(int tagId) {
id = tagId;
}
public boolean shouldLog(int level) {
return level >= tagSetLevel;
}
public boolean shouldLog(LogLevel logLevel) {
return shouldLog(logLevel.level);
}
}

13
src/jdk.jfr/share/classes/jdk/jfr/internal/Logger.java
View File

@ -35,15 +35,20 @@ import java.util.function.Supplier;
public final class Logger {
private final static int MAX_SIZE = 10000;
static {
// This will try to initialize the JVM logging system
JVMSupport.tryToInitializeJVM();
}
public static void log(LogTag logTag, LogLevel logLevel, String message) {
if (logTag.shouldLog(logLevel.level)) {
if (shouldLog(logTag, logLevel)) {
logInternal(logTag, logLevel, message);
}
}
public static void log(LogTag logTag, LogLevel logLevel, Supplier<String> messageSupplier) {
if (logTag.shouldLog(logLevel.level)) {
if (shouldLog(logTag, logLevel)) {
logInternal(logTag, logLevel, messageSupplier.get());
}
}
@ -55,4 +60,8 @@ public final class Logger {
JVM.log(logTag.id, logLevel.level, message.substring(0, MAX_SIZE));
}
}
public static boolean shouldLog(LogTag tag, LogLevel level) {
return level.level >= tag.tagSetLevel;
}
}

2
src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataReader.java
View File

@ -79,7 +79,7 @@ final class MetadataReader {
descriptor.gmtOffset = time.attribute(MetadataDescriptor.ATTRIBUTE_GMT_OFFSET, 1);
descriptor.locale = time.attribute(MetadataDescriptor.ATTRIBUTE_LOCALE, "");
descriptor.root = root;
if (LogTag.JFR_SYSTEM_PARSER.shouldLog(LogLevel.TRACE.level)) {
if (Logger.shouldLog(LogTag.JFR_SYSTEM_PARSER, LogLevel.TRACE)) {
List<Type> ts = new ArrayList<>(types.values());
Collections.sort(ts, (x,y) -> x.getName().compareTo(y.getName()));
for (Type t : ts) {

2
src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
View File

@ -453,7 +453,7 @@ public final class PlatformRecording implements AutoCloseable {
}
private void setSettings(Map<String, String> settings, boolean update) {
if (LogTag.JFR_SETTING.shouldLog(LogLevel.INFO.level) && update) {
if (Logger.shouldLog(LogTag.JFR_SETTING, LogLevel.INFO) && update) {
TreeMap<String, String> ordered = new TreeMap<>(settings);
Logger.log(LogTag.JFR_SETTING, LogLevel.INFO, "New settings for recording \"" + getName() + "\" (" + getId() + ")");
for (Map.Entry<String, String> entry : ordered.entrySet()) {

6
src/jdk.jfr/share/classes/jdk/jfr/internal/SettingsManager.java
View File

@ -139,7 +139,7 @@ final class SettingsManager {
ec.disable();
}
} else {
if (LogTag.JFR_SETTING.shouldLog(LogLevel.INFO.level)) {
if (Logger.shouldLog(LogTag.JFR_SETTING, LogLevel.INFO)) {
Collections.sort(eventControls, (x,y) -> x.getEventType().getName().compareTo(y.getEventType().getName()));
}
for (EventControl ec : eventControls) {
@ -224,7 +224,7 @@ final class SettingsManager {
if (values != null) {
control.apply(values);
String after = control.getLastValue();
if (LogTag.JFR_SETTING.shouldLog(LogLevel.INFO.level)) {
if (Logger.shouldLog(LogTag.JFR_SETTING, LogLevel.INFO)) {
if (Utils.isSettingVisible(control, ec.getEventType().hasEventHook())) {
if (values.size() > 1) {
StringJoiner sj = new StringJoiner(", ", "{", "}");
@ -241,7 +241,7 @@ final class SettingsManager {
}
} else {
control.setDefault();
if (LogTag.JFR_SETTING.shouldLog(LogLevel.INFO.level)) {
if (Logger.shouldLog(LogTag.JFR_SETTING, LogLevel.INFO)) {
String message = " " + settingName + "=\"" + control.getLastValue() + "\"";
Logger.log(LogTag.JFR_SETTING, LogLevel.INFO, message);
}

4
src/jdk.jfr/share/classes/jdk/jfr/internal/Type.java
View File

@ -271,7 +271,7 @@ public class Type implements Comparable<Type> {
}
void log(String action, LogTag logTag, LogLevel level) {
if (logTag.shouldLog(level.level) && !isSimpleType()) {
if (Logger.shouldLog(logTag, level) && !isSimpleType()) {
Logger.log(logTag, LogLevel.TRACE, action + " " + typeText() + " " + getLogName() + " {");
for (ValueDescriptor v : getFields()) {
String array = v.isArray() ? "[]" : "";
@ -279,7 +279,7 @@ public class Type implements Comparable<Type> {
}
Logger.log(logTag, LogLevel.TRACE, "}");
} else {
if (logTag.shouldLog(LogLevel.INFO.level) && !isSimpleType()) {
if (Logger.shouldLog(logTag, LogLevel.INFO) && !isSimpleType()) {
Logger.log(logTag, LogLevel.INFO, action + " " + typeText() + " " + getLogName());
}
}

4
src/jdk.jfr/share/classes/jdk/jfr/internal/TypeLibrary.java
View File

@ -68,7 +68,7 @@ public final class TypeLibrary {
private TypeLibrary(List<Type> jvmTypes) {
visitReachable(jvmTypes, t -> !types.containsKey(t.getId()), t -> types.put(t.getId(), t));
if (LogTag.JFR_SYSTEM_METADATA.shouldLog(LogLevel.INFO.level)) {
if (Logger.shouldLog(LogTag.JFR_SYSTEM_METADATA, LogLevel.INFO)) {
Stream<Type> s = types.values().stream().sorted((x, y) -> Long.compare(x.getId(), y.getId()));
s.forEach(t -> t.log("Added", LogTag.JFR_SYSTEM_METADATA, LogLevel.INFO));
}
@ -422,7 +422,7 @@ public final class TypeLibrary {
for (Type type : types.values()) {
if (type.getRemove() && !Type.isDefinedByJVM(type.getId())) {
removeIds.add(type.getId());
if (LogTag.JFR_METADATA.shouldLog(LogLevel.TRACE.level)) {
if (Logger.shouldLog(LogTag.JFR_METADATA, LogLevel.TRACE)) {
Logger.log(LogTag.JFR_METADATA, LogLevel.TRACE, "Removed obsolete metadata " + type.getName());
}
}

2
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java
View File

@ -63,7 +63,7 @@ final class DCmdCheck extends AbstractDCmd {
}
private void executeInternal(String name, Boolean verbose) throws DCmdException {
if (LogTag.JFR_DCMD.shouldLog(LogLevel.DEBUG)) {
if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing DCmdCheck: name=" + name + ", verbose=" + verbose);
}

2
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
View File

@ -70,7 +70,7 @@ final class DCmdConfigure extends AbstractDCmd {
Boolean sampleThreads
) throws DCmdException {
if (LogTag.JFR_DCMD.shouldLog(LogLevel.DEBUG)) {
if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing DCmdConfigure: repositorypath=" + repositoryPath +
", dumppath=" + dumpPath +
", stackdepth=" + stackDepth +

2
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdDump.java
View File

@ -70,7 +70,7 @@ final class DCmdDump extends AbstractDCmd {
* @throws DCmdException if the dump could not be completed
*/
public String execute(String name, String filename, Long maxAge, Long maxSize, String begin, String end, Boolean pathToGcRoots) throws DCmdException {
if (LogTag.JFR_DCMD.shouldLog(LogLevel.DEBUG)) {
if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG,
"Executing DCmdDump: name=" + name +
", filename=" + filename +

8
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
View File

@ -81,7 +81,7 @@ final class DCmdStart extends AbstractDCmd {
*/
@SuppressWarnings("resource")
public String execute(String name, String[] settings, Long delay, Long duration, Boolean disk, String path, Long maxAge, Long maxSize, Boolean dumpOnExit, Boolean pathToGcRoots) throws DCmdException {
if (LogTag.JFR_DCMD.shouldLog(LogLevel.DEBUG)) {
if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing DCmdStart: name=" + name +
", settings=" + Arrays.asList(settings) +
", delay=" + delay +
@ -106,13 +106,7 @@ final class DCmdStart extends AbstractDCmd {
throw new DCmdException("Filename can only be set for a time bound recording or if dumponexit=true. Set duration/dumponexit or omit filename.");
}
Map<String, String> s = new HashMap<>();
if (settings == null || settings.length == 0) {
settings = new String[] { "default" };
}
for (String configName : settings) {
try {
s.putAll(JFC.createKnown(configName).getSettings());

2
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStop.java
View File

@ -56,7 +56,7 @@ final class DCmdStop extends AbstractDCmd {
* @throws DCmdException if recording could not be stopped
*/
public String execute(String name, String filename) throws DCmdException {
if (LogTag.JFR_DCMD.shouldLog(LogLevel.DEBUG)) {
if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing DCmdStart: name=" + name + ", filename=" + filename);
}