Skip to content

Commit c099cf5

Browse files
author
Alan Bateman
committedNov 4, 2023
8318422: Allow poller threads be virtual threads
Reviewed-by: michaelm
1 parent 29cf2c4 commit c099cf5

File tree

13 files changed

+347
-378
lines changed

13 files changed

+347
-378
lines changed
 

‎src/java.base/aix/classes/sun/nio/ch/DefaultPollerProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class DefaultPollerProvider extends PollerProvider {
3333
DefaultPollerProvider() { }
3434

3535
@Override
36-
Poller readPoller() throws IOException {
36+
Poller readPoller(boolean subPoller) throws IOException {
3737
return new PollsetPoller(true);
3838
}
3939

4040
@Override
41-
Poller writePoller() throws IOException {
41+
Poller writePoller(boolean subPoller) throws IOException {
4242
return new PollsetPoller(false);
4343
}
4444
}

‎src/java.base/aix/classes/sun/nio/ch/PollsetPoller.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ class PollsetPoller extends Poller {
4242
MAX_EVENTS_TO_POLL = 512;
4343
}
4444

45+
private final int event;
4546
private final int setid;
4647
private final long pollBuffer;
4748

4849
PollsetPoller(boolean read) throws IOException {
49-
super(read);
50+
this.event = (read) ? Net.POLLIN : Net.POLLOUT;
5051
this.setid = Pollset.pollsetCreate();
5152
this.pollBuffer = Pollset.allocatePollArray(MAX_EVENTS_TO_POLL);
5253
}
@@ -58,8 +59,7 @@ int fdVal() {
5859

5960
@Override
6061
void implRegister(int fd) throws IOException {
61-
int ret = Pollset.pollsetCtl(setid, Pollset.PS_MOD, fd,
62-
Pollset.PS_POLLPRI | (this.reading() ? Net.POLLIN : Net.POLLOUT));
62+
int ret = Pollset.pollsetCtl(setid, Pollset.PS_MOD, fd, Pollset.PS_POLLPRI | event);
6363
if (ret != 0) {
6464
throw new IOException("Unable to register fd " + fd);
6565
}

‎src/java.base/linux/classes/sun/nio/ch/DefaultPollerProvider.java

+25-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
2525
package sun.nio.ch;
2626

2727
import java.io.IOException;
28+
import jdk.internal.vm.ContinuationSupport;
2829

2930
/**
3031
* Default PollerProvider for Linux.
@@ -33,12 +34,31 @@ class DefaultPollerProvider extends PollerProvider {
3334
DefaultPollerProvider() { }
3435

3536
@Override
36-
Poller readPoller() throws IOException {
37-
return new EPollPoller(true);
37+
Poller.Mode defaultPollerMode() {
38+
if (ContinuationSupport.isSupported()) {
39+
return Poller.Mode.VTHREAD_POLLERS;
40+
} else {
41+
return Poller.Mode.SYSTEM_THREADS;
42+
}
3843
}
3944

4045
@Override
41-
Poller writePoller() throws IOException {
42-
return new EPollPoller(false);
46+
int defaultReadPollers(Poller.Mode mode) {
47+
int ncpus = Runtime.getRuntime().availableProcessors();
48+
if (mode == Poller.Mode.VTHREAD_POLLERS) {
49+
return Math.min(Integer.highestOneBit(ncpus), 32);
50+
} else {
51+
return Math.max(Integer.highestOneBit(ncpus / 4), 1);
52+
}
53+
}
54+
55+
@Override
56+
Poller readPoller(boolean subPoller) throws IOException {
57+
return new EPollPoller(subPoller, true);
58+
}
59+
60+
@Override
61+
Poller writePoller(boolean subPoller) throws IOException {
62+
return new EPollPoller(subPoller, false);
4363
}
4464
}

‎src/java.base/linux/classes/sun/nio/ch/EPollPoller.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
*/
3333

3434
class EPollPoller extends Poller {
35-
private static final int MAX_EVENTS_TO_POLL = 512;
3635
private static final int ENOENT = 2;
3736

3837
private final int epfd;
3938
private final int event;
39+
private final int maxEvents;
4040
private final long address;
4141

42-
EPollPoller(boolean read) throws IOException {
43-
super(read);
42+
EPollPoller(boolean subPoller, boolean read) throws IOException {
4443
this.epfd = EPoll.create();
4544
this.event = (read) ? EPOLLIN : EPOLLOUT;
46-
this.address = EPoll.allocatePollArray(MAX_EVENTS_TO_POLL);
45+
this.maxEvents = (subPoller) ? 64 : 512;
46+
this.address = EPoll.allocatePollArray(maxEvents);
4747
}
4848

4949
@Override
@@ -68,7 +68,7 @@ void implDeregister(int fdVal) {
6868

6969
@Override
7070
int poll(int timeout) throws IOException {
71-
int n = EPoll.wait(epfd, address, MAX_EVENTS_TO_POLL, timeout);
71+
int n = EPoll.wait(epfd, address, maxEvents, timeout);
7272
int i = 0;
7373
while (i < n) {
7474
long eventAddress = EPoll.getEvent(address, i);

‎src/java.base/macosx/classes/sun/nio/ch/DefaultPollerProvider.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@ class DefaultPollerProvider extends PollerProvider {
3333
DefaultPollerProvider() { }
3434

3535
@Override
36-
Poller readPoller() throws IOException {
37-
return new KQueuePoller(true);
36+
Poller readPoller(boolean subPoller) throws IOException {
37+
return new KQueuePoller(subPoller, true);
3838
}
3939

4040
@Override
41-
Poller writePoller() throws IOException {
42-
return new KQueuePoller(false);
41+
Poller writePoller(boolean subPoller) throws IOException {
42+
return new KQueuePoller(subPoller, false);
4343
}
4444
}

‎src/java.base/macosx/classes/sun/nio/ch/KQueuePoller.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@
3131
* Poller implementation based on the kqueue facility.
3232
*/
3333
class KQueuePoller extends Poller {
34-
private static final int MAX_EVENTS_TO_POLL = 512;
35-
3634
private final int kqfd;
3735
private final int filter;
36+
private final int maxEvents;
3837
private final long address;
3938

40-
KQueuePoller(boolean read) throws IOException {
41-
super(read);
39+
KQueuePoller(boolean subPoller, boolean read) throws IOException {
4240
this.kqfd = KQueue.create();
4341
this.filter = (read) ? EVFILT_READ : EVFILT_WRITE;
44-
this.address = KQueue.allocatePollArray(MAX_EVENTS_TO_POLL);
42+
this.maxEvents = (subPoller) ? 64 : 512;
43+
this.address = KQueue.allocatePollArray(maxEvents);
4544
}
4645

4746
@Override
@@ -63,7 +62,7 @@ void implDeregister(int fdVal) {
6362

6463
@Override
6564
int poll(int timeout) throws IOException {
66-
int n = KQueue.poll(kqfd, address, MAX_EVENTS_TO_POLL, timeout);
65+
int n = KQueue.poll(kqfd, address, maxEvents, timeout);
6766
int i = 0;
6867
while (i < n) {
6968
long keventAddress = KQueue.getEvent(address, i);

‎src/java.base/share/classes/sun/nio/ch/Poller.java

+229-309
Large diffs are not rendered by default.

‎src/java.base/share/classes/sun/nio/ch/PollerProvider.java

+43-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,46 +25,63 @@
2525
package sun.nio.ch;
2626

2727
import java.io.IOException;
28-
import java.util.ServiceConfigurationError;
29-
import sun.security.action.GetPropertyAction;
3028

29+
/**
30+
* Provider class for Poller implementations.
31+
*/
3132
abstract class PollerProvider {
33+
private static final PollerProvider INSTANCE = new DefaultPollerProvider();
34+
3235
PollerProvider() { }
3336

3437
/**
35-
* Returns true if threads should register file descriptors directly,
36-
* false to queue registrations to an updater thread.
37-
*
38-
* The default implementation returns false.
38+
* Returns the system-wide PollerProvider.
3939
*/
40-
boolean useDirectRegister() {
41-
return false;
40+
static PollerProvider provider() {
41+
return INSTANCE;
4242
}
4343

4444
/**
45-
* Creates a Poller for read ops.
45+
* Returns the default poller mode.
46+
* @implSpec The default implementation uses system threads.
4647
*/
47-
abstract Poller readPoller() throws IOException;
48+
Poller.Mode defaultPollerMode() {
49+
return Poller.Mode.SYSTEM_THREADS;
50+
}
4851

4952
/**
50-
* Creates a Poller for write ops.
53+
* Default number of read pollers for the given mode. The count must be a power of 2.
54+
* @implSpec The default implementation returns 1.
5155
*/
52-
abstract Poller writePoller() throws IOException;
56+
int defaultReadPollers(Poller.Mode mode) {
57+
return 1;
58+
}
5359

5460
/**
55-
* Creates the PollerProvider.
61+
* Default number of write pollers for the given mode. The count must be a power of 2.
62+
* @implSpec The default implementation returns 1.
5663
*/
57-
static PollerProvider provider() {
58-
String cn = GetPropertyAction.privilegedGetProperty("jdk.PollerProvider");
59-
if (cn != null) {
60-
try {
61-
Class<?> clazz = Class.forName(cn, true, ClassLoader.getSystemClassLoader());
62-
return (PollerProvider) clazz.getConstructor().newInstance();
63-
} catch (Exception e) {
64-
throw new ServiceConfigurationError(null, e);
65-
}
66-
} else {
67-
return new DefaultPollerProvider();
68-
}
64+
int defaultWritePollers(Poller.Mode mode) {
65+
return 1;
66+
}
67+
68+
/**
69+
* Maps a file descriptor to an index from 0 to {@code toIndex}.
70+
* @implSpec The default implementation is good for Unix file descriptors.
71+
*/
72+
int fdValToIndex(int fdVal, int toIndex) {
73+
return fdVal & (toIndex - 1);
6974
}
75+
76+
/**
77+
* Creates a Poller for read ops.
78+
* @param subPoller true to create a sub-poller
79+
*/
80+
abstract Poller readPoller(boolean subPoller) throws IOException;
81+
82+
/**
83+
* Creates a Poller for write ops.
84+
* @param subPoller true to create a sub-poller
85+
*/
86+
abstract Poller writePoller(boolean subPoller) throws IOException;
7087
}

‎src/java.base/windows/classes/sun/nio/ch/DefaultPollerProvider.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,26 @@ class DefaultPollerProvider extends PollerProvider {
3333
DefaultPollerProvider() { }
3434

3535
@Override
36-
Poller readPoller() throws IOException {
36+
int defaultReadPollers(Poller.Mode mode) {
37+
assert mode == Poller.Mode.SYSTEM_THREADS;
38+
int ncpus = Runtime.getRuntime().availableProcessors();
39+
return Math.max(Integer.highestOneBit(ncpus / 8), 1);
40+
}
41+
42+
@Override
43+
int fdValToIndex(int fdVal, int toIndex) {
44+
return (fdVal >> 2) & (toIndex - 1);
45+
}
46+
47+
@Override
48+
Poller readPoller(boolean subPoller) throws IOException {
49+
assert !subPoller;
3750
return new WEPollPoller(true);
3851
}
3952

4053
@Override
41-
Poller writePoller() throws IOException {
54+
Poller writePoller(boolean subPoller) throws IOException {
55+
assert !subPoller;
4256
return new WEPollPoller(false);
4357
}
4458
}

‎src/java.base/windows/classes/sun/nio/ch/WEPollPoller.java

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class WEPollPoller extends Poller {
3939
private final long address;
4040

4141
WEPollPoller(boolean read) throws IOException {
42-
super(read);
4342
this.handle = WEPoll.create();
4443
this.event = (read) ? EPOLLIN : EPOLLOUT;
4544
this.address = WEPoll.allocatePollArray(MAX_EVENTS_TO_POLL);

‎test/hotspot/jtreg/ProblemList-Virtual.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java 8300707 generic-all
8484
vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location002/TestDescription.java 8278470 generic-all
8585

8686
###
87-
# This test always times out on windows. This is due to the test forcing OOME in the
88-
# debuggee, which has the side affect of making the Read-Poller thread exit. Because
87+
# This test times out on Windows and Linux. This is due to the test forcing OOME in
88+
# the debuggee, which can lead to I/O poller threads exiting. Because
8989
# of this no vthreads can complete their reads, and the test times out as a result.
9090

91-
vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java 8285417 windows-all
91+
vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java 8285417 generic-all
9292

9393
##########
9494
## Tests incompatible with with virtual test thread factory.

‎test/jdk/java/net/vthread/BlockingSocketOps.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
/**
2525
* @test id=default
2626
* @bug 8284161
27-
* @summary Test virtual threads doing blocking I/O on java.net sockets
27+
* @summary Test virtual threads doing blocking I/O on java.net Sockets
2828
* @library /test/lib
2929
* @run junit BlockingSocketOps
3030
*/
3131

3232
/**
33-
* @test id=direct-register
34-
* @summary Test virtual threads doing blocking I/O on java.net sockets and with
35-
* the I/O poller configured to use direct registration
33+
* @test id=poller-modes
34+
* @requires (os.family == "linux") | (os.family == "mac")
3635
* @library /test/lib
37-
* @run junit/othervm -Djdk.useDirectRegister BlockingSocketOps
36+
* @run junit/othervm -Djdk.pollerMode=1 BlockingSocketOps
37+
* @run junit/othervm -Djdk.pollerMode=2 BlockingSocketOps
3838
*/
3939

4040
/**

‎test/jdk/java/nio/channels/vthread/BlockingChannelOps.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
*/
3131

3232
/**
33-
* @test id=direct-register
34-
* @summary Test virtual threads doing blocking I/O on NIO channels and with
35-
* the I/O poller configured to use direct registration
33+
* @test id=poller-modes
34+
* @requires (os.family == "linux") | (os.family == "mac")
3635
* @library /test/lib
37-
* @run junit/othervm -Djdk.useDirectRegister BlockingChannelOps
36+
* @run junit/othervm -Djdk.pollerMode=1 BlockingChannelOps
37+
* @run junit/othervm -Djdk.pollerMode=2 BlockingChannelOps
3838
*/
3939

4040
/**
@@ -507,7 +507,7 @@ void testDatagramSocketAdaptorReceive1() throws Exception {
507507
*/
508508
@Test
509509
void testDatagramSocketAdaptorReceive2() throws Exception {
510-
testDatagramSocketAdaptorReceive(60_1000);
510+
testDatagramSocketAdaptorReceive(60_000);
511511
}
512512

513513
private void testDatagramSocketAdaptorReceive(int timeout) throws Exception {

0 commit comments

Comments
 (0)
Please sign in to comment.