jtreg thread factory plugin updated.

Author: Leonid Mesnik

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -752,7 +752,7 @@ ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
   $(eval $(call SetupTarget, build-test-test-thread-factory, \
       MAKEFILE := test/BuildJtregTestThreadFactory, \
       TARGET := build, \
-      DEPS := interim-langtools, \
+      DEPS := interim-langtools exploded-image, \
   ))
 
   # Copies the jtreg test thread factory into the test image

make/RunTests.gmk

@@ -772,7 +772,9 @@ define SetupRunJtregTestBody
   ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
-    $1_JTREG_BASIC_OPTIONS += -exclude:$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt)
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+	$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
+    ))
   endif
 
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )

make/autoconf/spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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

make/test/BuildJtregTestThreadFactory.gmk

@@ -37,12 +37,10 @@ TTF_BASEDIR := $(TOPDIR)/test/jtreg_test_thread_factory
 TTF_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/jtreg_test_thread_factory
 TTF_JAR := $(TTF_SUPPORT)/jtregTestThreadFactory.jar
 
-TTF_CLASSPATH := $(JTREG_JAR)
-
 $(eval $(call SetupJavaCompilation, BUILD_JTREG_TEST_THREAD_FACTORY, \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
     SRC := $(TTF_BASEDIR)/src/share/classes, \
     BIN := $(TTF_SUPPORT)/classes, \
-    DISABLED_WARNINGS := preview, \
     JAR := $(TTF_JAR), \
 ))
 

test/jtreg_test_thread_factory/src/share/classes/Virtual.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -23,70 +23,29 @@
  * questions.
  */
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ThreadFactory;
 
 public class Virtual implements ThreadFactory {
 
     static {
         // This property is used by ProcessTools and some tests
-        // Should be set for all tests
         try {
             System.setProperty("main.wrapper", "Virtual");
         } catch (Throwable t) {
-        // Might be securty-related exceptions
+            // might be thrown by security manager
         }
     }
 
-    private ThreadFactory factory;
-
     public Virtual() {
-        try {
-            factory = VirtualAPI.factory();
-        } catch (Throwable t) {
-            factory = task -> new Thread(task);
-        }
     }
 
 
     @Override
     public Thread newThread(Runnable task) {
         try {
-            return factory.newThread(task);
-        } catch (Throwable t) {
-            throw new RuntimeException(t);
-        }
-    }
-}
-
-class VirtualAPI {
-
-    private MethodHandles.Lookup publicLookup = MethodHandles.publicLookup();
-
-    private ThreadFactory virtualThreadFactory;
-
-
-    VirtualAPI() {
-        try {
-            Class<?> vbuilderClass = Class.forName("java.lang.Thread$Builder$OfVirtual");
-            MethodType vofMT = MethodType.methodType(vbuilderClass);
-            MethodHandle ofVirtualMH =  publicLookup.findStatic(Thread.class, "ofVirtual", vofMT);
-            Object virtualBuilder = ofVirtualMH.invoke();
-            MethodType factoryMT = MethodType.methodType(ThreadFactory.class);
-            MethodHandle vfactoryMH =  publicLookup.findVirtual(vbuilderClass, "factory", factoryMT);
-            virtualThreadFactory = (ThreadFactory) vfactoryMH.invoke(virtualBuilder);
+            return Thread.ofVirtual().factory().newThread(task);
         } catch (Throwable t) {
             throw new RuntimeException(t);
         }
     }
-
-    private static VirtualAPI instance = new VirtualAPI();
-
-    public static ThreadFactory factory() {
-        return instance.virtualThreadFactory;
-    }
 }