archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8319374: JFR: Remove instrumentation for exception events

Browse source 
Reviewed-by: mgronlun, alanb
This commit is contained in:
Erik Gahlin 2023-11-08 13:22:33 +00:00
parent cd9719bc1d
commit e841897247
18 changed files with 234 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/java.base/share/classes/java/lang/Error.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2023, 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
@ -25,6 +25,8 @@
package java.lang;
import jdk.internal.event.ThrowableTracer;
/**
* An {@code Error} is a subclass of {@code Throwable}
* that indicates serious problems that a reasonable application
@ -53,6 +55,9 @@ public class Error extends Throwable {
*/
public Error() {
super();
if (Throwable.jfrTracing) {
ThrowableTracer.traceError(getClass(), null);
}
}
/**
@ -65,6 +70,9 @@ public class Error extends Throwable {
*/
public Error(String message) {
super(message);
if (Throwable.jfrTracing) {
ThrowableTracer.traceError(getClass(), message);
}
}
/**
@ -83,6 +91,9 @@ public class Error extends Throwable {
*/
public Error(String message, Throwable cause) {
super(message, cause);
if (Throwable.jfrTracing) {
ThrowableTracer.traceError(getClass(), message);
}
}
/**
@ -100,6 +111,9 @@ public class Error extends Throwable {
*/
public Error(Throwable cause) {
super(cause);
if (Throwable.jfrTracing) {
ThrowableTracer.traceError(getClass(), null);
}
}
/**
@ -121,5 +135,8 @@ public class Error extends Throwable {
boolean enableSuppression,
boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
if (Throwable.jfrTracing) {
ThrowableTracer.traceError(getClass(), message);
}
}
}

26
src/java.base/share/classes/java/lang/Throwable.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2023, 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
@ -28,6 +28,7 @@ package java.lang;
import java.io.*;
import java.util.*;
import jdk.internal.access.SharedSecrets;
import jdk.internal.event.ThrowableTracer;
import jdk.internal.misc.InternalLock;
/**
@ -118,6 +119,11 @@ public class Throwable implements Serializable {
@java.io.Serial
private static final long serialVersionUID = -3042686055658047285L;
/**
* Flag that determines if exceptions should be traced by JFR
*/
static volatile boolean jfrTracing;
/**
* The JVM saves some indication of the stack backtrace in this slot.
*/
@ -256,6 +262,9 @@ public class Throwable implements Serializable {
*/
public Throwable() {
fillInStackTrace();
if (jfrTracing) {
ThrowableTracer.traceThrowable(getClass(), null);
}
}
/**
@ -272,6 +281,9 @@ public class Throwable implements Serializable {
public Throwable(String message) {
fillInStackTrace();
detailMessage = message;
if (jfrTracing) {
ThrowableTracer.traceThrowable(getClass(), message);
}
}
/**
@ -295,6 +307,9 @@ public class Throwable implements Serializable {
fillInStackTrace();
detailMessage = message;
this.cause = cause;
if (jfrTracing) {
ThrowableTracer.traceThrowable(getClass(), message);
}
}
/**
@ -318,6 +333,9 @@ public class Throwable implements Serializable {
fillInStackTrace();
detailMessage = (cause==null ? null : cause.toString());
this.cause = cause;
if (jfrTracing) {
ThrowableTracer.traceThrowable(getClass(), null);
}
}
/**
@ -370,8 +388,12 @@ public class Throwable implements Serializable {
}
detailMessage = message;
this.cause = cause;
if (!enableSuppression)
if (!enableSuppression) {
suppressedExceptions = null;
}
if (jfrTracing) {
ThrowableTracer.traceThrowable(getClass(), message);
}
}
/**