From d2640861d3968b755b75f1a1d04be8a26afd5d0a Mon Sep 17 00:00:00 2001 From: DXwangg Date: Mon, 25 Sep 2023 19:12:44 +0800 Subject: [PATCH] Delete useless code --- ...t-in-XSLTC-for-specjvm-xml-transform.patch | 93 +------------------ ...4-runtime-thread-signal-transfer-bug.patch | 92 +++--------------- openjdk-1.8.0.spec | 5 +- 3 files changed, 19 insertions(+), 171 deletions(-) diff --git a/0041-Reuse-translet-in-XSLTC-for-specjvm-xml-transform.patch b/0041-Reuse-translet-in-XSLTC-for-specjvm-xml-transform.patch index dcbde36..5b34c97 100644 --- a/0041-Reuse-translet-in-XSLTC-for-specjvm-xml-transform.patch +++ b/0041-Reuse-translet-in-XSLTC-for-specjvm-xml-transform.patch @@ -8,9 +8,7 @@ Subject: Reuse translet in XSLTC for XML hotspot/src/share/vm/runtime/arguments.cpp | 2 + hotspot/src/share/vm/runtime/arguments.hpp | 3 + .../src/share/vm/utilities/accessFlags.hpp | 1 + - .../transform/TestXmlTransletEnhance.java | 83 +++++++++++++++++++ - 8 files changed, 144 insertions(+), 3 deletions(-) - create mode 100644 jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java + 7 files changed, 64 insertions(+), 3 deletions(-) diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp index d8e99e622..b9fde38dc 100644 @@ -182,95 +180,6 @@ index bc56262d1..b20f0f740 100644 void set_has_finalizer() { atomic_set_bits(JVM_ACC_HAS_FINALIZER); } void set_has_final_method() { atomic_set_bits(JVM_ACC_HAS_FINAL_METHOD); } void set_is_cloneable() { atomic_set_bits(JVM_ACC_IS_CLONEABLE); } -diff --git a/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java b/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java -new file mode 100644 -index 000000000..73b848de8 ---- /dev/null -+++ b/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java -@@ -0,0 +1,83 @@ -+/* -+ * Copyright (c) Huawei Technologies Co., Ltd. 2012-2023. All rights reserved. -+ */ -+ -+ -+/* @test -+ * @summary a test for xml translet enhance -+ * @library /lib/testlibrary -+ * @run main TestXmlTransletEnhance -+ */ -+ -+import javax.xml.transform.TransformerFactory; -+import com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl; -+import java.lang.reflect.Field; -+import static jdk.testlibrary.Asserts.assertEquals; -+ -+public class TestXmlTransletEnhance { -+ static final boolean expectedResult = true; -+ -+ public static void main(String[] args) throws InterruptedException { -+ -+ Thread thread = new Mythread("BenchmarkThread xml "); -+ thread.start(); -+ thread.join(); -+ boolean ret = SharedData.getInstance().getResult(); -+ assertEquals(ret, expectedResult); -+ -+ } -+ -+ static class Mythread extends Thread { -+ Mythread(String name){ -+ super(name); -+ } -+ -+ @Override -+ public void run(){ -+ -+ try { -+ -+ TransformerFactory tf = TransformerFactory.newInstance(); -+ TransformerFactoryImpl transformer = new TransformerFactoryImpl(); -+ Class clazz = transformer.getClass(); -+ -+ Field generateTransletFiled = clazz.getDeclaredField("_generateTranslet"); -+ Field autoTransletFiled = clazz.getDeclaredField("_autoTranslet"); -+ -+ generateTransletFiled.setAccessible(true); -+ autoTransletFiled.setAccessible(true); -+ -+ boolean value1 = (boolean)generateTransletFiled.get(transformer); -+ boolean value2 = (boolean)autoTransletFiled.get(transformer); -+ -+ SharedData.getInstance().setResult(value1 && value2); -+ -+ } catch (NoSuchFieldException| IllegalAccessException | SecurityException | IllegalArgumentException e) { -+ e.printStackTrace(); -+ } -+ } -+ } -+ -+ static class SharedData { -+ private static SharedData instance; -+ private boolean result; -+ -+ private SharedData() { -+ } -+ -+ public static synchronized SharedData getInstance() { -+ if (instance == null) { -+ instance = new SharedData(); -+ } -+ return instance; -+ } -+ -+ public synchronized boolean getResult() { -+ return result; -+ } -+ -+ public synchronized void setResult(boolean result) { -+ this.result = result; -+ } -+ } -+} -- 2.22.0 diff --git a/add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch b/add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch index 3a1bfa6..8e17274 100644 --- a/add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch +++ b/add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch @@ -1,14 +1,13 @@ -From ca49d726e6df78341be29a6f519568cb12d5db23 Mon Sep 17 00:00:00 2001 +From c4fd69c76c41b7b6168f1071d50143566f7d269e Mon Sep 17 00:00:00 2001 Date: Fri, 22 Sep 2023 14:48:33 +0800 -Subject: add Fix-aarch64-runtime-thread-signal-transfer-bug +Subject: [PATCH] add Fix-aarch64-runtime-thread-signal-transfer-bug --- .../src/cpu/aarch64/vm/vm_version_aarch64.hpp | 7 ++ hotspot/src/os/linux/vm/os_linux.cpp | 3 + - .../linux_aarch64/vm/thread_linux_aarch64.cpp | 68 +++++++++++++++++++ + .../linux_aarch64/vm/thread_linux_aarch64.cpp | 69 +++++++++++++++++++ .../linux_aarch64/vm/thread_linux_aarch64.hpp | 2 + - .../transform/TestXmlTransletEnhance.java | 46 +++++++++++-- - 5 files changed, 121 insertions(+), 5 deletions(-) + 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp index 7f3a53262..9dfc3465e 100644 @@ -50,10 +49,18 @@ index 197b5c193..3ed8cde6b 100644 } diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp -index 87e42318a..369ab622d 100644 +index 87e42318a..bc4b03561 100644 --- a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp +++ b/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp -@@ -39,6 +39,74 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, +@@ -25,6 +25,7 @@ + #include "precompiled.hpp" + #include "runtime/frame.inline.hpp" + #include "runtime/thread.inline.hpp" ++#include "runtime/arguments.hpp" + + // For Forte Analyzer AsyncGetCallTrace profiling support - thread is + // currently interrupted by SIGPROF +@@ -39,6 +40,74 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, return pd_get_top_frame(fr_addr, ucontext, isInJava); } @@ -141,77 +148,6 @@ index a2f0135c2..251e523df 100644 bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); private: bool pd_get_top_frame(frame* fr_addr, void* ucontext, bool isInJava); -diff --git a/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java b/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java -index 73b848de8..74831371f 100644 ---- a/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java -+++ b/jdk/test/javax/xml/jaxp/transform/TestXmlTransletEnhance.java -@@ -6,25 +6,61 @@ - /* @test - * @summary a test for xml translet enhance - * @library /lib/testlibrary -+ * @requires (os.simpleArch == "aarch64") & (os.family == "linux") - * @run main TestXmlTransletEnhance - */ - - import javax.xml.transform.TransformerFactory; - import com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl; - import java.lang.reflect.Field; -+import java.io.BufferedReader; -+import java.io.FileNotFoundException; -+import java.io.FileReader; -+import java.io.IOException; - import static jdk.testlibrary.Asserts.assertEquals; - - public class TestXmlTransletEnhance { - static final boolean expectedResult = true; - - public static void main(String[] args) throws InterruptedException { -+ BufferedReader reader = null; -+ try { -+ reader = new BufferedReader(new FileReader("/proc/cpuinfo")); -+ } catch (FileNotFoundException e) { -+ e.printStackTrace(); -+ } -+ String line = null; -+ String cpuImplementer = null; -+ String cpuPart = null; -+ while (true) { -+ try { -+ if (!((line = reader.readLine()) != null)) break; -+ } catch (IOException e) { -+ e.printStackTrace(); -+ } -+ if (line.startsWith("CPU implementer")) { -+ String[] parts = line.split(":"); -+ cpuImplementer = parts[1].trim(); -+ } -+ if (line.startsWith("CPU part")) { -+ String[] parts = line.split(":"); -+ cpuPart = parts[1].trim(); -+ } -+ } - -- Thread thread = new Mythread("BenchmarkThread xml "); -- thread.start(); -- thread.join(); -- boolean ret = SharedData.getInstance().getResult(); -- assertEquals(ret, expectedResult); -+ if ((cpuImplementer == null) || (cpuPart == null)) { -+ assertEquals(true, expectedResult); -+ } - -+ if ((cpuImplementer.equals("0x48")) && (cpuPart.equals("0xd01") || cpuPart.equals("0xd02"))) { -+ Thread thread = new Mythread("BenchmarkThread xml "); -+ thread.start(); -+ thread.join(); -+ boolean ret = SharedData.getInstance().getResult(); -+ assertEquals(ret, expectedResult); -+ } else { -+ assertEquals(true, expectedResult); -+ } - } - - static class Mythread extends Thread { -- 2.22.0 diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 39cff2e..5749ef1 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 9 +Release: 10 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2529,6 +2529,9 @@ cjc.mainProgram(arg) %endif %changelog +* Mon Sep 25 2023 kuenking111 - 1:1.8.0.382-b05.10 +- del useless code + * Fri Sep 22 2023 kuenking111 - 1:1.8.0.382-b05.9 - add add-0010-8301749-Tracking-malloc-pooled-memory-size.patch - add 8213397-Stack-dump-should-show-more-clearly-when-a-t.patch -- Gitee