/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 21 01:16:04 UTC 2016
changeset 112a8531d741 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=112a8531d741
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 14 03:39:40 2016 +0100
Reinstate ChangeLog line accidentally removed in 4853e7794646
changeset 3bf68d7f7711 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3bf68d7f7711
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jul 20 14:00:17 2016 +0100
Bump to icedtea-2.7.0pre06.
Upstream changes:
- PR2799: Files are missing from resources.jar
- PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed
- S2178143, PR2958: JVM crashes if the number of bound CPUs changed during runtime
- S4900206, PR3101: Include worst-case rounding tests for Math library functions
- S6260348, PR3067: GTK+ L&F JTextComponent not respecting desktop caret blink rate
- S6934604, PR3075: enable parts of EliminateAutoBox by default
- S7043064, PR3020: sun/java2d/cmm/ tests failed against RI b141 & b138-nightly
- S7051394, PR3020: NullPointerException when running regression tests LoadProfileTest by using openjdk-7-b144
- S7086015, PR3013: fix test/tools/javac/parser/netbeans/JavacParserTest.java
- S7119487, PR3013: JavacParserTest.java test fails on Windows platforms
- S7124245, PR3020: [lcms] ColorConvertOp to color space CS_GRAY apparently converts orange to 244,244,0
- S7159445, PR3013: (javac) emits inaccurate diagnostics for enhanced for-loops
- S7175845, PR1437, RH1207129: 'jar uf' changes file permissions unexpectedly
- S8005402, PR3020: Need to provide benchmarks for color management
- S8005530, PR3020: [lcms] Improve performance of ColorConverOp for default destinations
- S8005930, PR3020: [lcms] ColorConvertOp: Alpha channel is not transferred from source to destination.
- S8013430, PR3020: REGRESSION: closed/java/awt/color/ICC_Profile/LoadProfileTest/LoadProfileTest.java fails with java.io.StreamCorruptedException: invalid type code: EE since 8b87
- S8014286, PR3075: failed java/lang/Math/DivModTests.java after 6934604 changes
- S8014959, PR3075: assert(Compile::current()->live_nodes() < (uint)MaxNodeLimit) failed: Live Node limit exceeded limit
- S8019247, PR3075: SIGSEGV in compiled method c8e.e.t_.getArray(Ljava/lang/Class;)[Ljava/lang/Object
- S8024511, PR3020: Crash during color profile destruction
- S8025429, PR3020: [parfait] warnings from b107 for sun.java2d.cmm: JNI exception pending
- S8026702, PR3020: Fix for 8025429 breaks jdk build on windows
- S8026780, PR3020: Crash on PPC and PPC v2 for Java_awt test suit
- S8047066, PR3020: Test test/sun/awt/image/bug8038000.java fails with ClassCastException
- S8069181, PR3012, RH1015612: java.lang.AssertionError when compiling JDK 1.4 code in JDK 8
- S8148328: aarch64: redundant lsr instructions in stub code.
- S8148783: aarch64: SEGV running SpecJBB2013
- S8148948: aarch64: generate_copy_longs calls align() incorrectly
- S8150045: arraycopy causes segfaults in SATB during garbage collection
- S8151841, PR3098: Build needs additional flags to compile with GCC 6
- S8154537: AArch64: some integer rotate instructions are never emitted
- S8154739: AArch64: TemplateTable::fast_xaccess loads in wrong mode
- S8157906: aarch64: some more integer rotate instructions are never emitted
- S8158260, PR2992, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
- S8159244, PR3075: Partially initialized string object created by C2's string concat optimization may escape
ChangeLog:
2016-07-20 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
(CORBA_CHANGESET): Update to icedtea-2.7.0pre06.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.7.0pre06.
* hotspot.map.in: Update to icedtea-2.7.0pre06.
* patches/boot/ecj-diamond.patch:
Add new case in sun.java2d.cmm.lcms.LCMSProfile.
* patches/boot/jar.patch:
Adapt to fix for PR2799/RH1195203.
changeset fe313abbf5af in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fe313abbf5af
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jul 20 14:04:19 2016 +0100
PR3091: SystemTap is heavily confused by multiple JDKs
2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
PR3091: SystemTap is heavily confused
by multiple JDKs
* AUTHORS: Added Felix Lu.
* NEWS: Updated.
2016-07-13 Felix Lu <flu at redhat.com>
PR3091: SystemTap is heavily confused
by multiple JDKs
* tapset/hotspot.stp.in,
* tapset/jstack.stp.in:
Use the new private keyword in SystemTap
>= 3.0 to resolve global variable name
collision and function overloading
to select the correct jstack_call at runtime.
changeset 56606b0a0abc in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=56606b0a0abc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 21 02:19:05 2016 +0100
PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
PR3103: Handle case in clean-fonts where
linux.fontconfig.Gentoo.properties.old has
not been created
* Makefile.am:
(clean-fonts): Guard movement of old
Gentoo.properties.old file with a
check to see if it exists.
* NEWS: Updated.
diffstat:
AUTHORS | 1 +
ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++
Makefile.am | 30 ++++++++++++----------
NEWS | 42 +++++++++++++++++++++++++++++++-
configure.ac | 2 +-
hotspot.map.in | 2 +-
patches/boot/ecj-diamond.patch | 12 +++++++++
patches/boot/jar.patch | 23 ++++++++++++-----
tapset/hotspot.stp.in | 3 +-
tapset/jstack.stp.in | 54 ++++++++++++++++++++++++++++++-----------
10 files changed, 182 insertions(+), 40 deletions(-)
diffs (405 lines):
diff -r 626e0b48982b -r 56606b0a0abc AUTHORS
--- a/AUTHORS Wed Apr 27 03:44:35 2016 +0100
+++ b/AUTHORS Thu Jul 21 02:19:05 2016 +0100
@@ -25,6 +25,7 @@
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
Trustin Lee <http://t.motd.kr>
+Felix Lu <flu at redhat.com>
DJ Lucas <dj at linuxfromscratch.org>
Omair Majid <omajid at redhat.com>
Casey Marshall <csm at gnu.org>
diff -r 626e0b48982b -r 56606b0a0abc ChangeLog
--- a/ChangeLog Wed Apr 27 03:44:35 2016 +0100
+++ b/ChangeLog Thu Jul 21 02:19:05 2016 +0100
@@ -1,3 +1,55 @@
+2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3103: Handle case in clean-fonts where
+ linux.fontconfig.Gentoo.properties.old has
+ not been created
+ * Makefile.am:
+ (clean-fonts): Guard movement of old
+ Gentoo.properties.old file with a
+ check to see if it exists.
+ * NEWS: Updated.
+
+2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3091: SystemTap is heavily confused
+ by multiple JDKs
+ * AUTHORS: Added Felix Lu.
+ * NEWS: Updated.
+
+2016-07-13 Felix Lu <flu at redhat.com>
+
+ PR3091: SystemTap is heavily confused
+ by multiple JDKs
+ * tapset/hotspot.stp.in,
+ * tapset/jstack.stp.in:
+ Use the new private keyword in SystemTap
+ >= 3.0 to resolve global variable name
+ collision and function overloading
+ to select the correct jstack_call at runtime.
+
+2016-07-20 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am,
+ (CORBA_CHANGESET): Update to icedtea-2.7.0pre06.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.7.0pre06.
+ * hotspot.map.in: Update to icedtea-2.7.0pre06.
+ * patches/boot/ecj-diamond.patch:
+ Add new case in sun.java2d.cmm.lcms.LCMSProfile.
+ * patches/boot/jar.patch:
+ Adapt to fix for PR2799/RH1195203.
+
2016-04-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add 2.6.6 release notes.
@@ -1839,6 +1891,7 @@
* Makefile.am:
(versioning): Drop use of PROJECT_NAME removed
in PR1365.
+ * NEWS: Updated.
2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
diff -r 626e0b48982b -r 56606b0a0abc Makefile.am
--- a/Makefile.am Wed Apr 27 03:44:35 2016 +0100
+++ b/Makefile.am Thu Jul 21 02:19:05 2016 +0100
@@ -4,19 +4,19 @@
BUILD_VERSION = b02
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = cbe0edb3d345
-JAXP_CHANGESET = 4b0a1c213416
-JAXWS_CHANGESET = 76aade5c18f8
-JDK_CHANGESET = 3fc5cbcd46dd
-LANGTOOLS_CHANGESET = caa50dd46a14
-OPENJDK_CHANGESET = 7f245987a287
-
-CORBA_SHA256SUM = b1257121829a728d1850382ac3ae1ea65ecf0461605824ad6e6b3583ebf8908f
-JAXP_SHA256SUM = 77e3b7f148a5876299d535b084f1b8bbfb58e173e9697a3560f2e59931aa73a2
-JAXWS_SHA256SUM = bc65e3078623f2d85df47f7a877121e57248068859c18ea03960b533af44a80e
-JDK_SHA256SUM = 44adca39f854ce57defd7692796c193f9bf638a1110e283cc369552ec66bbba2
-LANGTOOLS_SHA256SUM = 1a7195adfc1f05ecdf17559dd8afccbbd9b8c61e96f290a1e2ca9659856b4fa7
-OPENJDK_SHA256SUM = 72ab3fe89fab55d430af49ffaae216317e8a88b963350a7a695870f7fd744c33
+CORBA_CHANGESET = b6bef4d9a428
+JAXP_CHANGESET = a2cd36a76d22
+JAXWS_CHANGESET = 5c8bb4727c60
+JDK_CHANGESET = d35404fe9590
+LANGTOOLS_CHANGESET = bd3480b6d64a
+OPENJDK_CHANGESET = 05d8ac2f0610
+
+CORBA_SHA256SUM = b867a0abce87e74decaa8a3b3376f31cca1f53b9a2915ed6fa449b071215fe73
+JAXP_SHA256SUM = c82f8df09f60ba56c149f4e115cc286f836158ae45964c438757a6c27c9cdeb5
+JAXWS_SHA256SUM = bcd111e8fffd5fd5409af96d8cb7bd4ef1a79e21c7f52b76d7dec3de0b5b8a4e
+JDK_SHA256SUM = 8c61ecafde4c3f5f68ceaaeea40b77b00dafb5597505f004c86c3cb5df76445d
+LANGTOOLS_SHA256SUM = 20d515c4c71055c1f3632d7b9f054f866e8b77dce8214d4618d17ec5e9752999
+OPENJDK_SHA256SUM = b692c2f521c6880f9ddfff642ad44cc258abae5d8f47ddc614761f2b95be1f88
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -1642,7 +1642,9 @@
clean-fonts:
rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties
- mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,}
+ if [ -e $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old ] ; then \
+ mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} ; \
+ fi
rm -f stamps/fonts.stamp
stamps/patch-fsg.stamp: stamps/extract.stamp stamps/fonts.stamp
diff -r 626e0b48982b -r 56606b0a0abc NEWS
--- a/NEWS Wed Apr 27 03:44:35 2016 +0100
+++ b/NEWS Thu Jul 21 02:19:05 2016 +0100
@@ -15,7 +15,47 @@
New in release 2.7.0 (201X-XX-XX):
* Backports
- - S8076221, PR2809: Disable RC4 cipher suites
+ - S2178143, PR2958: JVM crashes if the number of bound CPUs changed during runtime
+ - S4900206, PR3101: Include worst-case rounding tests for Math library functions
+ - S6260348, PR3067: GTK+ L&F JTextComponent not respecting desktop caret blink rate
+ - S6934604, PR3075: enable parts of EliminateAutoBox by default
+ - S7043064, PR3020: sun/java2d/cmm/ tests failed against RI b141 & b138-nightly
+ - S7051394, PR3020: NullPointerException when running regression tests LoadProfileTest by using openjdk-7-b144
+ - S7086015, PR3013: fix test/tools/javac/parser/netbeans/JavacParserTest.java
+ - S7119487, PR3013: JavacParserTest.java test fails on Windows platforms
+ - S7124245, PR3020: [lcms] ColorConvertOp to color space CS_GRAY apparently converts orange to 244,244,0
+ - S7159445, PR3013: (javac) emits inaccurate diagnostics for enhanced for-loops
+ - S7175845, PR1437, RH1207129: 'jar uf' changes file permissions unexpectedly
+ - S8005402, PR3020: Need to provide benchmarks for color management
+ - S8005530, PR3020: [lcms] Improve performance of ColorConverOp for default destinations
+ - S8005930, PR3020: [lcms] ColorConvertOp: Alpha channel is not transferred from source to destination.
+ - S8013430, PR3020: REGRESSION: closed/java/awt/color/ICC_Profile/LoadProfileTest/LoadProfileTest.java fails with java.io.StreamCorruptedException: invalid type code: EE since 8b87
+ - S8014286, PR3075: failed java/lang/Math/DivModTests.java after 6934604 changes
+ - S8014959, PR3075: assert(Compile::current()->live_nodes() < (uint)MaxNodeLimit) failed: Live Node limit exceeded limit
+ - S8019247, PR3075: SIGSEGV in compiled method c8e.e.t_.getArray(Ljava/lang/Class;)[Ljava/lang/Object
+ - S8024511, PR3020: Crash during color profile destruction
+ - S8025429, PR3020: [parfait] warnings from b107 for sun.java2d.cmm: JNI exception pending
+ - S8026702, PR3020: Fix for 8025429 breaks jdk build on windows
+ - S8026780, PR3020, RH1142587: Crash on PPC and PPC v2 for Java_awt test suit
+ - S8047066, PR3020: Test test/sun/awt/image/bug8038000.java fails with ClassCastException
+ - S8069181, PR3012, RH1015612: java.lang.AssertionError when compiling JDK 1.4 code in JDK 8
+ - S8076221, PR2809, RH1302385: Disable RC4 cipher suites
+ - S8151841, PR3098: Build needs additional flags to compile with GCC 6
+ - S8158260, PR2992, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
+ - S8159244, PR3075: Partially initialized string object created by C2's string concat optimization may escape
+* Bug fixes
+ - PR2799, RH1195203: Files are missing from resources.jar
+ - PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed
+ - PR3091: SystemTap is heavily confused by multiple JDKs
+ - PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
+* AArch64 port
+ - S8148328: aarch64: redundant lsr instructions in stub code.
+ - S8148783: aarch64: SEGV running SpecJBB2013
+ - S8148948: aarch64: generate_copy_longs calls align() incorrectly
+ - S8150045: arraycopy causes segfaults in SATB during garbage collection
+ - S8154537: AArch64: some integer rotate instructions are never emitted
+ - S8154739: AArch64: TemplateTable::fast_xaccess loads in wrong mode
+ - S8157906: aarch64: some more integer rotate instructions are never emitted
New in release 2.6.6 (2016-04-21):
diff -r 626e0b48982b -r 56606b0a0abc configure.ac
--- a/configure.ac Wed Apr 27 03:44:35 2016 +0100
+++ b/configure.ac Thu Jul 21 02:19:05 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.7.0pre05], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.7.0pre06], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
diff -r 626e0b48982b -r 56606b0a0abc hotspot.map.in
--- a/hotspot.map.in Wed Apr 27 03:44:35 2016 +0100
+++ b/hotspot.map.in Thu Jul 21 02:19:05 2016 +0100
@@ -1,2 +1,2 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 88abb663cdf9 b98e7d51fae5dc6380a18658f5b75158b4de5ddc618a21fee616c73a2a162014
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 601fbf4bf8c1 598f983e760f1f439444c837d1baa7fd6e5f3483c14a88a0862b1b6fb8aad595
diff -r 626e0b48982b -r 56606b0a0abc patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Apr 27 03:44:35 2016 +0100
+++ b/patches/boot/ecj-diamond.patch Thu Jul 21 02:19:05 2016 +0100
@@ -7552,3 +7552,15 @@
List<Thread> threads = new ArrayList<Thread>();
for (int i = 0; i < threadCount; i++) {
RandomCollector r = new RandomCollector();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2016-07-20 03:24:05.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java 2016-07-20 04:22:41.946636327 +0100
+@@ -61,7 +61,7 @@
+
+ TagCache(LCMSProfile p) {
+ profile = p;
+- tags = new HashMap<>();
++ tags = new HashMap<Integer, TagData>();
+ }
+
+ TagData getTag(int sig) {
diff -r 626e0b48982b -r 56606b0a0abc patches/boot/jar.patch
--- a/patches/boot/jar.patch Wed Apr 27 03:44:35 2016 +0100
+++ b/patches/boot/jar.patch Thu Jul 21 02:19:05 2016 +0100
@@ -1,27 +1,36 @@
diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk 2011-06-13 16:08:46.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk 2011-06-13 17:06:49.515488800 +0100
-@@ -627,9 +627,19 @@
+--- openjdk-boot.orig/jdk/make/common/Release.gmk 2016-07-20 03:31:53.349151607 +0100
++++ openjdk-boot/jdk/make/common/Release.gmk 2016-07-20 03:41:37.223480082 +0100
+@@ -728,12 +728,28 @@
RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
- $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE)
+ $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE) $(IMPORT_JAR_FILELIST)
$(prep-target)
+ifneq (,$(JAR_KNOWS_ATFILE))
$(CD) $(CLASSBINDIR) && \
$(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
@$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
+ $(CD) $(IMPORTSRCDIR) && \
+ $(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS) $@ \
+ @$(IMPORT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
+ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(OTHER_JAR_MANIFEST_FILE) $@ \
+ $(BOOT_JAR_JFLAGS))
++ (cd $(IMPORTSRCDIR) && $(CAT) $(IMPORT_JAR_FILELIST) | \
++ $(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS)@ $@ \
++ $(BOOT_JAR_JFLAGS))
+else
+ (cd $(CLASSBINDIR) && \
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
-+ $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
++ $(BOOT_JAR_JFLAGS) `$(CAT) $(RES_JAR_FILELIST)`)
++ (cd $(IMPORTSRCDIR) && \
++ $(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS) $@ \
++ $(BOOT_JAR_JFLAGS) `$(CAT) $(IMPORT_JAR_FILELIST)`)
+endif
@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
+ @$(CD) $(IMPORTSRCDIR) && $(java-vm-cleanup)
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -683,9 +693,19 @@
+@@ -788,9 +804,19 @@
RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
$(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE)
$(prep-target)
diff -r 626e0b48982b -r 56606b0a0abc tapset/hotspot.stp.in
--- a/tapset/hotspot.stp.in Wed Apr 27 03:44:35 2016 +0100
+++ b/tapset/hotspot.stp.in Thu Jul 21 02:19:05 2016 +0100
@@ -141,7 +141,8 @@
Triggers at the end of the virtual machine initialization.
Has no arguments.
*/
-probe hotspot.vm_init_end =
+probe hotspot_vm_init_end = hotspot.vm_init_end7 {}
+probe hotspot.vm_init_end7 =
process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__end"),
process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__end")
{
diff -r 626e0b48982b -r 56606b0a0abc tapset/jstack.stp.in
--- a/tapset/jstack.stp.in Wed Apr 27 03:44:35 2016 +0100
+++ b/tapset/jstack.stp.in Thu Jul 21 02:19:05 2016 +0100
@@ -45,27 +45,33 @@
semantic error: failed to retrieve location attribute for local
*/
-global Universe_methodKlassObj;
-global Universe_collectedHeap;
-global HeapWordSize;
-global CodeCache_heap;
-global NarrowOopStruct;
+/* Resolve multiple installed java versions conflict. */
+ at define _private %( %( systemtap_v >= "3.0" %? private %) %)
+ at define _check_match %(
+ %( systemtap_v >= "3.0" %? if (pp() !~ "@prefix@") next %)
+%)
-global sp_register;
-global fp_register;
-global pc_register;
-global ptr_size;
-global ptr_mask;
+ at _private global Universe_methodKlassObj;
+ at _private global Universe_collectedHeap;
+ at _private global HeapWordSize;
+ at _private global CodeCache_heap;
+ at _private global NarrowOopStruct;
-global constantPoolOopDesc_size;
-global HeapBlock_Header_size;
-global oopDesc_size;
+ at _private global sp_register;
+ at _private global fp_register;
+ at _private global pc_register;
+ at _private global ptr_size;
+ at _private global ptr_mask;
-global vm_inited;
+ at _private global constantPoolOopDesc_size;
+ at _private global HeapBlock_Header_size;
+ at _private global oopDesc_size;
+
+ at _private global vm_inited;
/* We need to collect some global symbol addresses that cannot be resolved
in a bare function and vm_init_end seems a good place to use. */
-probe hotspot.vm_init_end
+probe hotspot.vm_init_end7
{
// The parent/type oop for a methodOop.
Universe_methodKlassObj[pid()] = %( systemtap_v >= "1.8"
@@ -159,6 +165,8 @@
function jstack:string()
{
+ @_check_match
+
// java backtraces can be a lot bigger, but we risk going over MAXACTION.
// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
max_depth = 32;
@@ -168,6 +176,8 @@
function jstack_n:string(max_depth:long)
{
+ @_check_match
+
// Whether to log the method signatures.
log_sig = 0;
@@ -182,6 +192,8 @@
function print_jstack()
{
+ @_check_match
+
// java backtraces can be a lot bigger, but we risk going over MAXACTION.
// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
max_depth = 32;
@@ -191,6 +203,8 @@
function print_jstack_n:string(max_depth:long)
{
+ @_check_match
+
// Whether to log the method signatures.
log_sig = 0;
@@ -205,6 +219,8 @@
function jstack_full:string()
{
+ @_check_match
+
// java backtraces can be a lot bigger, but we risk going over MAXACTION.
// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
max_depth = 32;
@@ -214,6 +230,8 @@
function jstack_full_n:string(max_depth:long)
{
+ @_check_match
+
// Whether to log the method signatures.
log_sig = 1;
@@ -228,6 +246,8 @@
function print_jstack_full()
{
+ @_check_match
+
// java backtraces can be a lot bigger, but we risk going over MAXACTION.
// 32 frames only gives us ~32 actions per frame (with MAXACTION == 1024).
max_depth = 32;
@@ -237,6 +257,8 @@
function print_jstack_full_n:string(max_depth:long)
{
+ @_check_match
+
// Whether to log the method signatures.
log_sig = 1;
@@ -252,6 +274,8 @@
function jstack_call:string(max_depth:long, log_sig:long, log_native:long,
print_frames:long)
{
+ @_check_match
+
if (! vm_inited[pid()])
{
frame = "<vm-not-inited>";
More information about the distro-pkg-dev
mailing list