Skip to content

Commit f5a2ff5

Browse files
egahlinegahlin
committedMar 23, 2020
JFR Thread Sleep event for virtual threads
·
JEP-429-branchpoint
1 parent 28709d4 commit f5a2ff5

File tree

10 files changed

+303
-36
lines changed

10 files changed

+303
-36
lines changed
 

‎src/hotspot/share/jfr/metadata/metadata.xml

-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<Field type="Thread" name="thread" label="Java Thread" />
3636
</Event>
3737

38-
<Event name="ThreadSleep" category="Java Application" label="Java Thread Sleep" thread="true" stackTrace="true">
39-
<Field type="long" contentType="millis" name="time" label="Sleep Time" />
40-
</Event>
41-
4238
<Event name="ThreadPark" category="Java Application" label="Java Thread Park" thread="true" stackTrace="true">
4339
<Field type="Class" name="parkedClass" label="Class Parked On" />
4440
<Field type="long" contentType="nanos" name="timeout" label="Park Timeout" />

‎src/hotspot/share/prims/jvm.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -3067,13 +3067,6 @@ JVM_ENTRY(void, JVM_Yield(JNIEnv *env, jclass threadClass))
30673067
os::naked_yield();
30683068
JVM_END
30693069

3070-
static void post_thread_sleep_event(EventThreadSleep* event, jlong millis) {
3071-
assert(event != NULL, "invariant");
3072-
assert(event->should_commit(), "invariant");
3073-
event->set_time(millis);
3074-
event->commit();
3075-
}
3076-
30773070
JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
30783071
JVMWrapper("JVM_Sleep");
30793072

@@ -3090,7 +3083,6 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
30903083
JavaThreadSleepState jtss(thread);
30913084

30923085
HOTSPOT_THREAD_SLEEP_BEGIN(millis);
3093-
EventThreadSleep event;
30943086

30953087
if (millis == 0) {
30963088
os::naked_yield();
@@ -3101,9 +3093,6 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
31013093
// An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
31023094
// us while we were sleeping. We do not overwrite those.
31033095
if (!HAS_PENDING_EXCEPTION) {
3104-
if (event.should_commit()) {
3105-
post_thread_sleep_event(&event, millis);
3106-
}
31073096
HOTSPOT_THREAD_SLEEP_END(1);
31083097

31093098
// TODO-FIXME: THROW_MSG returns which means we will not call set_state()
@@ -3113,9 +3102,6 @@ JVM_ENTRY(void, JVM_Sleep(JNIEnv* env, jclass threadClass, jlong millis))
31133102
}
31143103
thread->osthread()->set_state(old_state);
31153104
}
3116-
if (event.should_commit()) {
3117-
post_thread_sleep_event(&event, millis);
3118-
}
31193105
HOTSPOT_THREAD_SLEEP_END(0);
31203106
JVM_END
31213107

‎src/java.base/share/classes/java/lang/Thread.java

+19-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import jdk.internal.reflect.Reflection;
5353
import sun.security.util.SecurityConstants;
5454
import jdk.internal.HotSpotIntrinsicCandidate;
55+
import jdk.internal.event.ThreadSleepEvent;
5556

5657
/**
5758
* A <i>thread</i> is a thread of execution in a program. The Java
@@ -348,13 +349,29 @@ public static void sleep(long millis) throws InterruptedException {
348349
if (millis < 0) {
349350
throw new IllegalArgumentException("timeout value is negative");
350351
}
351-
VirtualThread vthread = currentCarrierThread().getVirtualThread();
352+
if (ThreadSleepEvent.isTurnedOn()) {
353+
ThreadSleepEvent event = new ThreadSleepEvent();
354+
try {
355+
event.time = millis;
356+
event.begin();
357+
sleepMillis(millis);
358+
} finally {
359+
event.commit();
360+
}
361+
} else {
362+
sleepMillis(millis);
363+
}
364+
}
365+
366+
private static void sleepMillis(long millis) throws InterruptedException {
367+
VirtualThread vthread = currentCarrierThread().getVirtualThread();
352368
if (vthread != null) {
353369
vthread.sleepNanos(TimeUnit.MILLISECONDS.toNanos(millis));
354370
} else {
355371
sleep0(millis);
356372
}
357-
}
373+
}
374+
358375
private static native void sleep0(long millis) throws InterruptedException;
359376

360377
/**

‎src/java.base/share/classes/jdk/internal/event/ThreadSleepEvent.java

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
package jdk.internal.event;
27+
28+
/**
29+
* Event recording thread sleeping.
30+
*/
31+
32+
public final class ThreadSleepEvent extends Event {
33+
private final static ThreadSleepEvent EVENT = new ThreadSleepEvent();
34+
35+
/**
36+
* Returns {@code true} if event is enabled, {@code false} otherwise.
37+
*/
38+
public static boolean isTurnedOn() {
39+
return EVENT.isEnabled();
40+
}
41+
42+
public long time;
43+
}

‎src/jdk.jfr/share/classes/jdk/jfr/events/ThreadSleepEvent.java

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
package jdk.jfr.events;
27+
28+
import jdk.jfr.Category;
29+
import jdk.jfr.Description;
30+
import jdk.jfr.Label;
31+
import jdk.jfr.Name;
32+
import jdk.jfr.Timespan;
33+
import jdk.jfr.internal.MirrorEvent;
34+
import jdk.jfr.internal.Type;
35+
36+
@Category("Java Application")
37+
@Label("Hava Thread Sleep")
38+
@Name("jdk.ThreadSleep")
39+
@MirrorEvent(className = "jdk.internal.event.ThreadSleepEvent")
40+
public final class ThreadSleepEvent extends AbstractJDKEvent {
41+
@Label("SLeep Time")
42+
@Timespan(Timespan.MILLISECONDS)
43+
public long time;
44+
}

‎src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JDKEvents.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import jdk.jfr.events.SocketReadEvent;
4343
import jdk.jfr.events.SocketWriteEvent;
4444
import jdk.jfr.events.TLSHandshakeEvent;
45+
import jdk.jfr.events.ThreadSleepEvent;
4546
import jdk.jfr.events.X509CertificateEvent;
4647
import jdk.jfr.events.X509ValidationEvent;
4748
import jdk.jfr.internal.JVM;
@@ -58,7 +59,8 @@ public final class JDKEvents {
5859
TLSHandshakeEvent.class,
5960
X509CertificateEvent.class,
6061
X509ValidationEvent.class,
61-
ProcessStartEvent.class
62+
ProcessStartEvent.class,
63+
ThreadSleepEvent.class
6264
};
6365

6466
private static final Class<?>[] eventClasses = {
@@ -76,7 +78,8 @@ public final class JDKEvents {
7678
jdk.internal.event.TLSHandshakeEvent.class,
7779
jdk.internal.event.X509CertificateEvent.class,
7880
jdk.internal.event.X509ValidationEvent.class,
79-
jdk.internal.event.ProcessStartEvent.class
81+
jdk.internal.event.ProcessStartEvent.class,
82+
jdk.internal.event.ThreadSleepEvent.class
8083
};
8184

8285
// This is a list of the classes with instrumentation code that should be applied.

‎test/jdk/jdk/jfr/api/consumer/TestManyClasses.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
package jdk.jfr.api.consumer;
27+
28+
import java.util.ArrayList;
29+
import java.util.List;
30+
31+
import jdk.jfr.Event;
32+
import jdk.jfr.Recording;
33+
import jdk.jfr.consumer.RecordedClass;
34+
import jdk.jfr.consumer.RecordedEvent;
35+
import jdk.jfr.consumer.RecordedThread;
36+
import jdk.test.lib.Asserts;
37+
import jdk.test.lib.jfr.Events;
38+
import jdk.test.lib.jfr.TestClassLoader;
39+
40+
/**
41+
* This is not a unit test, but a testapp that can be
42+
* used to provoke bugs or performance issues when many classes or
43+
* class loaders are being used.
44+
*
45+
* Example usage:
46+
*
47+
* java -XX:StartFlightRecording:settings=profile
48+
* TestManyClasses <class-loader-count> <classes-per-class-loader>>
49+
*/
50+
public class TestManyClasses {
51+
52+
private List<ClassLoader> loaders = new ArrayList<>();
53+
54+
static class TestEvent {
55+
Class<> theClass;
56+
}
57+
public static void main(String[] args) throws Throwable {
58+
int classLoaderCount = Integer.parseInt(args[0]);
59+
int classCount = Integer.parseInt(args[1]);
60+
for (int i = 0; i <classCount; i++) {
61+
TestClassLoader tcl = new TestClassLoader();
62+
loaders.add(tcl);
63+
for (int j = 0; j < classCount; j++) {
64+
Class<?> theClass = tcl.loadClass();
65+
theClass.newInstance();
66+
TestEvent event = new TestEvent();
67+
event.theClass = event;
68+
event.commit();
69+
}
70+
}
71+
}
72+
}

‎test/jdk/jdk/jfr/api/consumer/TestManyRecordings.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation. Oracle designates this
8+
* particular file as subject to the "Classpath" exception as provided
9+
* by Oracle in the LICENSE file that accompanied this code.
10+
*
11+
* This code is distributed in the hope that it will be useful, but WITHOUT
12+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
* version 2 for more details (a copy is included in the LICENSE file that
15+
* accompanied this code).
16+
*
17+
* You should have received a copy of the GNU General Public License version
18+
* 2 along with this work; if not, write to the Free Software Foundation,
19+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20+
*
21+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22+
* or visit www.oracle.com if you need additional information or have any
23+
* questions.
24+
*/
25+
26+
package jdk.jfr.api.consumer;
27+
28+
import java.util.ArrayList;
29+
import java.util.List;
30+
31+
import jdk.jfr.Event;
32+
import jdk.jfr.Recording;
33+
import jdk.jfr.consumer.RecordedClass;
34+
import jdk.jfr.consumer.RecordedEvent;
35+
import jdk.jfr.consumer.RecordedThread;
36+
import jdk.test.lib.Asserts;
37+
import jdk.test.lib.jfr.Events;
38+
import jdk.test.lib.jfr.TestClassLoader;
39+
40+
/**
41+
* This is not a unit test, but a testapp that can be
42+
* used to provoke bugs or performance issues when many classes or
43+
* class loaders are being used.
44+
*
45+
* Example usage:
46+
*
47+
* java -XX:StartFlightRecording:settings=profile
48+
* TestManyClasses <class-loader-count> <classes-per-class-loader>>
49+
*/
50+
public class TestManyRecordings {
51+
52+
private List<ClassLoader> loaders = new ArrayList<>();
53+
54+
static class TestEvent {
55+
Class<> theClass;
56+
}
57+
public static void main(String[] args) throws Throwable {
58+
int classLoaderCount = Integer.parseInt(args[0]);
59+
int classCount = Integer.parseInt(args[1]);
60+
for (int i = 0; i <classCount; i++) {
61+
TestClassLoader tcl = new TestClassLoader();
62+
loaders.add(tcl);
63+
for (int j = 0; j < classCount; j++) {
64+
Class<?> theClass = tcl.loadClass();
65+
theClass.newInstance();
66+
TestEvent event = new TestEvent();
67+
event.theClass = event;
68+
event.commit();
69+
}
70+
}
71+
}
72+
}

‎test/jdk/jdk/jfr/api/consumer/TestParse.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package jdk.jfr.api.consumer;
2+
3+
import java.nio.file.Paths;
4+
5+
import jdk.jfr.consumer.RecordingFile;
6+
7+
public class TestParse {
8+
public static RecordedEvent event;
9+
10+
public static void main(String... args) {
11+
RecordingFile rf = new RecordingFile(Paths.get(args[0]));
12+
while (rf.hasMoreEvents()) {
13+
event = rf.readEvent();
14+
}
15+
}
16+
}

0 commit comments

Comments
 (0)
Please sign in to comment.