Skip to content

Commit fbb33c1

Browse files
keithc-cakeithc-ca
committed
Rename flag OJDKTHREAD_SUPPORT to OPENJDK_THREAD_SUPPORT
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
1 parent 4559bed commit fbb33c1

File tree

10 files changed

+52
-56
lines changed

10 files changed

+52
-56
lines changed

‎buildspecs/core.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
107107
<flag id="module_verutil" value="true"/>
108108
<flag id="module_vm" value="true"/>
109109
<flag id="opt_criuSupport" value="false"/>
110-
<flag id="opt_ojdkThreadSupport" value="false"/>
111110
<flag id="opt_fragmentRamClasses" value="true"/>
112111
<flag id="opt_inlineJsrs" value="true"/>
113112
<flag id="opt_jitserver" value="false"/>
@@ -116,8 +115,9 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
116115
<flag id="opt_module" value="true"/>
117116
<flag id="opt_newObjectHash" value="true"/>
118117
<flag id="opt_newRomClassBuilder" value="true"/>
119-
<flag id="opt_openjdkMethodhandle" value="false"/>
120118
<flag id="opt_openjdkFfi" value="true"/>
119+
<flag id="opt_openjdkMethodhandle" value="false"/>
120+
<flag id="opt_openjdkThreadSupport" value="false"/>
121121
<flag id="opt_phpSupport" value="false"/>
122122
<flag id="opt_romImageSupport" value="true"/>
123123
<flag id="opt_useOmrDdr" value="false"/>

‎buildspecs/j9.flags

+2-2
Original file line numberDiff line numberDiff line change
@@ -1832,9 +1832,9 @@ Only available on zOS</description>
18321832
<description>Enables support for Foreign Linker API (part of Project Panama) such as native invocations to ffi_call</description>
18331833
<ifRemoved>No support for Foreign Linker API</ifRemoved>
18341834
</flag>
1835-
<flag id="opt_ojdkThreadSupport">
1835+
<flag id="opt_openjdkThreadSupport">
18361836
<description>Enables OpenJDK Thread support for Project Loom</description>
1837-
<ifRemoved>No OpenDJK Thread support for Project Loom</ifRemoved>
1837+
<ifRemoved>No OpenJDK Thread support for Project Loom</ifRemoved>
18381838
</flag>
18391839
<flag id="opt_valhallaValueTypes">
18401840
<description>Enables support for Project Valhalla L-World Value Types</description>

‎jcl/jpp_configuration.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!-- START SET DEFINITIONS -->
3838
<set
3939
label="newflags"
40-
flags="INLINE-TYPES,OPENJDK_METHODHANDLES,CRIU_SUPPORT,OJDKTHREAD_SUPPORT"/>
40+
flags="CRIU_SUPPORT,INLINE-TYPES,OPENJDK_METHODHANDLES,OPENJDK_THREAD_SUPPORT"/>
4141

4242
<set
4343
label="oldflags"

‎jcl/src/java.base/share/classes/java/lang/J9VMInternals.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ private static void completeInitialization() {
9999
Runnable runnable = () -> {
100100
CleanerShutdown.shutdownCleaner();
101101
ThreadGroup threadGroup = Thread.currentThread().group; // the system ThreadGroup
102-
/*[IF OJDKTHREAD_SUPPORT]*/
102+
/*[IF OPENJDK_THREAD_SUPPORT]*/
103103
ThreadGroup threadGroups[] = new ThreadGroup[threadGroup.ngroups];
104-
/*[ELSE] OJDKTHREAD_SUPPORT
104+
/*[ELSE] OPENJDK_THREAD_SUPPORT
105105
ThreadGroup threadGroups[] = new ThreadGroup[threadGroup.numGroups];
106-
/*[ENDIF] OJDKTHREAD_SUPPORT */
106+
/*[ENDIF] OPENJDK_THREAD_SUPPORT */
107107
threadGroup.enumerate(threadGroups, false); /* non-recursive enumeration */
108108
for (ThreadGroup tg : threadGroups) {
109109
if ("InnocuousThreadGroup".equals(tg.getName())) { //$NON-NLS-1$
110-
/*[IF OJDKTHREAD_SUPPORT]*/
110+
/*[IF OPENJDK_THREAD_SUPPORT]*/
111111
Thread threads[] = new Thread[tg.nthreads];
112-
/*[ELSE] OJDKTHREAD_SUPPORT
112+
/*[ELSE] OPENJDK_THREAD_SUPPORT
113113
Thread threads[] = new Thread[tg.numThreads];
114-
/*[ENDIF] OJDKTHREAD_SUPPORT */
114+
/*[ENDIF] OPENJDK_THREAD_SUPPORT */
115115
tg.enumerate(threads, false);
116116
for (Thread t : threads) {
117117
if (t.getName().equals("Common-Cleaner")) { //$NON-NLS-1$
@@ -326,16 +326,15 @@ private static void threadCleanup(Thread thread) {
326326
/*[PR 106323] -- remove might throw an exception, so make sure we finish the cleanup*/
327327
try {
328328
// Leave the ThreadGroup. This is why remove can't be private
329-
/*[IF OJDKTHREAD_SUPPORT]*/
329+
/*[IF OPENJDK_THREAD_SUPPORT]*/
330330
thread.group.threadTerminated(thread);
331-
/*[ELSE] OJDKTHREAD_SUPPORT*/
331+
/*[ELSE] OPENJDK_THREAD_SUPPORT */
332332
thread.group.remove(thread);
333-
/*[ENDIF] OJDKTHREAD_SUPPORT */
334-
}
335-
finally {
333+
/*[ENDIF] OPENJDK_THREAD_SUPPORT */
334+
} finally {
336335
thread.cleanup();
337336

338-
synchronized(thread) {
337+
synchronized (thread) {
339338
thread.notifyAll();
340339
}
341340
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*[INCLUDE-IF Sidecar18-SE & !OJDKTHREAD_SUPPORT]*/
1+
/*[INCLUDE-IF Sidecar18-SE & !OPENJDK_THREAD_SUPPORT]*/
22
/*******************************************************************************
33
* Copyright (c) 1998, 2022 IBM Corp. and others
44
*

‎jcl/src/java.base/share/classes/java/lang/ThreadGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*[INCLUDE-IF Sidecar18-SE & !OJDKTHREAD_SUPPORT]*/
1+
/*[INCLUDE-IF Sidecar18-SE & !OPENJDK_THREAD_SUPPORT]*/
22
/*******************************************************************************
33
* Copyright (c) 1998, 2022 IBM Corp. and others
44
*

‎runtime/cmake/options.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ option(J9VM_OPT_METHOD_HANDLE "Enables support for OpenJ9 MethodHandles. J9VM_OP
138138
option(J9VM_OPT_METHOD_HANDLE_COMMON "Enables common dependencies between OpenJ9 and OpenJDK MethodHandles.")
139139
option(J9VM_OPT_MODULE "Turns on module support")
140140
option(J9VM_OPT_MULTI_VM "Decides if multiple VMs can be created in the same address space")
141-
option(J9VM_OPT_OJDK_THREAD_SUPPORT "Enables OpenJDK Thread support for Project Loom.")
142141
option(J9VM_OPT_OPENJDK_METHODHANDLE "Enables support for OpenJDK MethodHandles. J9VM_OPT_METHOD_HANDLE should be disabled.")
142+
option(J9VM_OPT_OPENJDK_THREAD_SUPPORT "Enables OpenJDK Thread support for Project Loom.")
143143

144144
option(J9VM_OPT_PANAMA "Enables support for Project Panama features such as native method handles")
145145
option(J9VM_OPT_VALHALLA_VALUE_TYPES "Enables support for Project Valhalla Value Types")

‎runtime/include/j9cfg.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ extern "C" {
233233
#cmakedefine J9VM_OPT_NEW_ROM_CLASS_BUILDER
234234
#cmakedefine J9VM_OPT_NO_CLASSLOADERS
235235
#cmakedefine J9VM_OPT_NRR
236-
#cmakedefine J9VM_OPT_OJDK_THREAD_SUPPORT
237236
#cmakedefine J9VM_OPT_OPENJDK_METHODHANDLE
237+
#cmakedefine J9VM_OPT_OPENJDK_THREAD_SUPPORT
238238
#cmakedefine J9VM_OPT_PACKED
239239
#cmakedefine J9VM_OPT_PANAMA
240240
#cmakedefine J9VM_OPT_PHP_SUPPORT

‎runtime/jvmti/jvmtiThreadGroup.c

+14-17
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ jvmtiGetThreadGroupChildren(jvmtiEnv* env,
159159
rc = getCurrentVMThread(vm, &currentThread);
160160
if (JVMTI_ERROR_NONE == rc) {
161161
j9object_t threadGroupObject = NULL;
162-
#if !defined(J9VM_OPT_OJDK_THREAD_SUPPORT)
162+
#if !defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT)
163163
j9object_t childrenThreadsLock = NULL;
164164
j9object_t childrenGroupsLock = NULL;
165-
#endif /* !defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
165+
#endif /* !defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
166166
jthreadGroup *groups = NULL;
167167
jint numGroups = 0;
168168
jthread *threads = NULL;
@@ -178,16 +178,16 @@ jvmtiGetThreadGroupChildren(jvmtiEnv* env,
178178

179179
/* Construct the Children Groups array under a lock */
180180
threadGroupObject = *((j9object_t*)group);
181-
#if defined(J9VM_OPT_OJDK_THREAD_SUPPORT)
181+
#if defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT)
182182
threadGroupObject = (j9object_t)vmFuncs->objectMonitorEnter(currentThread, threadGroupObject);
183183
if (J9_OBJECT_MONITOR_ENTER_FAILED((UDATA)threadGroupObject)) {
184-
#else /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
184+
#else /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
185185
childrenGroupsLock = J9VMJAVALANGTHREADGROUP_CHILDRENGROUPSLOCK(currentThread, threadGroupObject);
186186
childrenGroupsLock = (j9object_t)vmFuncs->objectMonitorEnter(currentThread, childrenGroupsLock);
187187
/* The threadGroupObject has to be reobtained as it might have been GC'ed while waiting for the lock */
188188
threadGroupObject = *((j9object_t*)group);
189189
if (J9_OBJECT_MONITOR_ENTER_FAILED((UDATA)childrenGroupsLock)) {
190-
#endif /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
190+
#endif /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
191191
rc = JVMTI_ERROR_OUT_OF_MEMORY;
192192
goto done;
193193
}
@@ -207,24 +207,24 @@ jvmtiGetThreadGroupChildren(jvmtiEnv* env,
207207
}
208208
}
209209

210-
#if defined(J9VM_OPT_OJDK_THREAD_SUPPORT)
210+
#if defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT)
211211
vmFuncs->objectMonitorExit(currentThread, threadGroupObject);
212-
#else /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
212+
#else /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
213213
vmFuncs->objectMonitorExit(currentThread, childrenGroupsLock);
214-
#endif /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
214+
#endif /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
215215

216216
/* Construct the Children Threads array under a lock */
217217
threadGroupObject = *((j9object_t*)group);
218-
#if defined(J9VM_OPT_OJDK_THREAD_SUPPORT)
218+
#if defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT)
219219
threadGroupObject = (j9object_t)vmFuncs->objectMonitorEnter(currentThread, threadGroupObject);
220220
if (J9_OBJECT_MONITOR_ENTER_FAILED((UDATA)threadGroupObject)) {
221-
#else /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
221+
#else /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
222222
childrenThreadsLock = J9VMJAVALANGTHREADGROUP_CHILDRENTHREADSLOCK(currentThread, threadGroupObject);
223223
childrenThreadsLock = (j9object_t)vmFuncs->objectMonitorEnter(currentThread, childrenThreadsLock);
224224
/* The threadGroupObject has to be reobtained as it might have been GC'ed while waiting for the lock */
225225
threadGroupObject = *((j9object_t*)group);
226226
if (J9_OBJECT_MONITOR_ENTER_FAILED((UDATA)childrenGroupsLock)) {
227-
#endif /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
227+
#endif /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
228228
rc = JVMTI_ERROR_OUT_OF_MEMORY;
229229
j9mem_free_memory(groups);
230230
goto done;
@@ -258,11 +258,11 @@ jvmtiGetThreadGroupChildren(jvmtiEnv* env,
258258
rv_groups = groups;
259259
}
260260

261-
#if defined(J9VM_OPT_OJDK_THREAD_SUPPORT)
261+
#if defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT)
262262
vmFuncs->objectMonitorExit(currentThread, threadGroupObject);
263-
#else /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
263+
#else /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
264264
vmFuncs->objectMonitorExit(currentThread, childrenThreadsLock);
265-
#endif /* defined(J9VM_OPT_OJDK_THREAD_SUPPORT) */
265+
#endif /* defined(J9VM_OPT_OPENJDK_THREAD_SUPPORT) */
266266

267267
done:
268268
vmFuncs->internalExitVMToJNI(currentThread);
@@ -283,6 +283,3 @@ jvmtiGetThreadGroupChildren(jvmtiEnv* env,
283283
}
284284
TRACE_JVMTI_RETURN(jvmtiGetThreadGroupChildren);
285285
}
286-
287-
288-

‎runtime/oti/vmconstantpool.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
190190
<fieldref class="java/lang/StackTraceElement" name="fileName" signature="Ljava/lang/String;"/>
191191
<fieldref class="java/lang/StackTraceElement" name="lineNumber" signature="I"/>
192192
<fieldref class="java/lang/StackTraceElement" name="source" signature="Ljava/lang/Object;"/>
193-
<fieldref class="java/lang/Thread" name="threadRef" signature="J" cast="struct J9VMThread *" flags="!opt_ojdkThreadSupport">
194-
<fieldalias name="eetop" signature="J" cast="struct J9VMThread *" flags="opt_ojdkThreadSupport"/>
193+
<fieldref class="java/lang/Thread" name="threadRef" signature="J" cast="struct J9VMThread *" flags="!opt_openjdkThreadSupport">
194+
<fieldalias name="eetop" signature="J" cast="struct J9VMThread *" flags="opt_openjdkThreadSupport"/>
195195
</fieldref>
196196
<fieldref class="java/lang/Thread" name="stackSize" signature="J"/>
197197
<fieldref class="java/lang/Thread" name="tid" signature="J"/>
@@ -211,15 +211,15 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
211211
<fieldref class="java/lang/StackWalker$StackFrameImpl" name="frameModule" signature="Ljava/lang/Module;" versions="9-"/>
212212

213213
<fieldref class="java/lang/Thread" name="priority" signature="I"/>
214-
<fieldref class="java/lang/Thread" name="isDaemon" signature="Z" flags="!opt_ojdkThreadSupport">
215-
<fieldalias name="daemon" signature="Z" flags="opt_ojdkThreadSupport"/>
214+
<fieldref class="java/lang/Thread" name="isDaemon" signature="Z" flags="!opt_openjdkThreadSupport">
215+
<fieldalias name="daemon" signature="Z" flags="opt_openjdkThreadSupport"/>
216216
</fieldref>
217217
<fieldref class="java/lang/Thread" name="group" signature="Ljava/lang/ThreadGroup;"/>
218218
<fieldref class="java/lang/Thread" name="stopCalled" signature="Z"/>
219219
<fieldref class="java/lang/Thread" name="contextClassLoader" signature="Ljava/lang/ClassLoader;"/>
220220
<fieldref class="java/lang/Thread" name="inheritedAccessControlContext" signature="Ljava/security/AccessControlContext;"/>
221-
<fieldref class="java/lang/Thread" name="lock" signature="Ljava/lang/Object;" flags="!opt_ojdkThreadSupport">
222-
<fieldalias name="blockerLock" signature="Ljava/lang/Object;" flags="opt_ojdkThreadSupport"/>
221+
<fieldref class="java/lang/Thread" name="lock" signature="Ljava/lang/Object;" flags="!opt_openjdkThreadSupport">
222+
<fieldalias name="blockerLock" signature="Ljava/lang/Object;" flags="opt_openjdkThreadSupport"/>
223223
</fieldref>
224224
<fieldref class="java/lang/Thread" name="parkBlocker" signature="Ljava/lang/Object;"/>
225225
<fieldref class="java/lang/Throwable" name="cause" signature="Ljava/lang/Throwable;"/>
@@ -273,23 +273,23 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
273273
<fieldref class="java/lang/ThreadGroup" name="name" signature="Ljava/lang/String;"/>
274274
<fieldref class="java/lang/ThreadGroup" name="maxPriority" signature="I"/>
275275
<fieldref class="java/lang/ThreadGroup" name="parent" signature="Ljava/lang/ThreadGroup;"/>
276-
<fieldref class="java/lang/ThreadGroup" name="numThreads" signature="I" flags="!opt_ojdkThreadSupport">
277-
<fieldalias name="nthreads" signature="I" flags="opt_ojdkThreadSupport"/>
276+
<fieldref class="java/lang/ThreadGroup" name="numThreads" signature="I" flags="!opt_openjdkThreadSupport">
277+
<fieldalias name="nthreads" signature="I" flags="opt_openjdkThreadSupport"/>
278278
</fieldref>
279-
<fieldref class="java/lang/ThreadGroup" name="numGroups" signature="I" flags="!opt_ojdkThreadSupport">
280-
<fieldalias name="ngroups" signature="I" flags="opt_ojdkThreadSupport"/>
279+
<fieldref class="java/lang/ThreadGroup" name="numGroups" signature="I" flags="!opt_openjdkThreadSupport">
280+
<fieldalias name="ngroups" signature="I" flags="opt_openjdkThreadSupport"/>
281281
</fieldref>
282-
<fieldref class="java/lang/ThreadGroup" name="childrenThreads" signature="[Ljava/lang/Thread;" flags="!opt_ojdkThreadSupport">
283-
<fieldalias name="threads" signature="[Ljava/lang/Thread;" flags="opt_ojdkThreadSupport"/>
282+
<fieldref class="java/lang/ThreadGroup" name="childrenThreads" signature="[Ljava/lang/Thread;" flags="!opt_openjdkThreadSupport">
283+
<fieldalias name="threads" signature="[Ljava/lang/Thread;" flags="opt_openjdkThreadSupport"/>
284284
</fieldref>
285-
<fieldref class="java/lang/ThreadGroup" name="childrenGroups" signature="[Ljava/lang/ThreadGroup;" flags="!opt_ojdkThreadSupport">
286-
<fieldalias name="groups" signature="[Ljava/lang/ThreadGroup;" flags="opt_ojdkThreadSupport"/>
285+
<fieldref class="java/lang/ThreadGroup" name="childrenGroups" signature="[Ljava/lang/ThreadGroup;" flags="!opt_openjdkThreadSupport">
286+
<fieldalias name="groups" signature="[Ljava/lang/ThreadGroup;" flags="opt_openjdkThreadSupport"/>
287287
</fieldref>
288-
<fieldref class="java/lang/ThreadGroup" name="isDaemon" signature="Z" flags="!opt_ojdkThreadSupport">
289-
<fieldalias name="daemon" signature="Z" flags="opt_ojdkThreadSupport"/>
288+
<fieldref class="java/lang/ThreadGroup" name="isDaemon" signature="Z" flags="!opt_openjdkThreadSupport">
289+
<fieldalias name="daemon" signature="Z" flags="opt_openjdkThreadSupport"/>
290290
</fieldref>
291-
<fieldref class="java/lang/ThreadGroup" name="childrenGroupsLock" signature="Ljava/lang/Object;" flags="!opt_ojdkThreadSupport"/>
292-
<fieldref class="java/lang/ThreadGroup" name="childrenThreadsLock" signature="Ljava/lang/Object;" flags="!opt_ojdkThreadSupport"/>
291+
<fieldref class="java/lang/ThreadGroup" name="childrenGroupsLock" signature="Ljava/lang/Object;" flags="!opt_openjdkThreadSupport"/>
292+
<fieldref class="java/lang/ThreadGroup" name="childrenThreadsLock" signature="Ljava/lang/Object;" flags="!opt_openjdkThreadSupport"/>
293293
<fieldref class="java/lang/ref/Reference" name="referent" signature="Ljava/lang/Object;"/>
294294
<fieldref class="java/lang/ref/Reference" name="queue" signature="Ljava/lang/ref/ReferenceQueue;"/>
295295
<fieldref class="java/lang/ref/Reference" name="state" signature="I"/>

0 commit comments

Comments
 (0)