--- a/.hgignore Thu Aug 08 17:23:13 2019 -0400
+++ b/.hgignore Thu Aug 08 17:27:17 2019 -0400
@@ -5,12 +5,13 @@
^webrev
^.src-rev$
^.jib/
-\.DS_Store
-\.metadata/
-\.recommenders/
+(^|/)\.DS_Store
+(^|/)\.metadata/
+(^|/)\.recommenders/
test/nashorn/script/external
test/nashorn/lib
NashornProfile.txt
-.*/JTreport/.*
-.*/JTwork/.*
-.*/.git/.*
+(^|/)JTreport/
+(^|/)JTwork/
+(^|/)\.git/
+^src/utils/hsdis/build/
\ No newline at end of file
--- a/.hgtags Thu Aug 08 17:23:13 2019 -0400
+++ b/.hgtags Thu Aug 08 17:27:17 2019 -0400
@@ -577,3 +577,6 @@
443f7359b34d60e7821216ffc60f88b6ffe0ccdd jdk-14+6
6a159c6c23ccd0029140ab91653442e412305ce5 jdk-13+31
28ab01c067551ef158abaef08e154e1051ca0893 jdk-14+7
+929f37a9c35d530d4e866f6e832001aeb4cfb371 jdk-13+32
+c0023e364b6f130cb1e93747b796d8718d544db1 jdk-14+8
+18f189e69b29f8215a3500b875127ed4fb2d977a jdk-14+9
--- a/make/RunTests.gmk Thu Aug 08 17:23:13 2019 -0400
+++ b/make/RunTests.gmk Thu Aug 08 17:27:17 2019 -0400
@@ -185,12 +185,13 @@
)
$$(call ExecuteWithLog, $$@.check, \
$$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \
- $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \
+ $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \
-XX:+PrintAOT -XX:+UseAOTStrictLoading \
-XX:AOTLibrary=$$@ -version \
> $$@.verify-aot \
)
+ $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions
$1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
$1_AOT_TARGETS += $$($1_AOT_LIB)
endef
--- a/make/common/ZipArchive.gmk Thu Aug 08 17:23:13 2019 -0400
+++ b/make/common/ZipArchive.gmk Thu Aug 08 17:27:17 2019 -0400
@@ -54,14 +54,17 @@
SetupZipArchive = $(NamedParamsMacroTemplate)
define SetupZipArchiveBody
+ # Create a version $1_SRC with a guaranteed trailing slash
+ $1_SRC_SLASH := $$(addsuffix /, $$(patsubst %/, %, $$($1_SRC)))
+
# To avoid running find over too large sets of files, which causes make to crash
# on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
# of directories to run find in, if available.
ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
- $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
- $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
+ $1_FIND_LIST := $$(wildcard $$(foreach s,$$($1_SRC_SLASH), \
+ $$(addprefix $$s,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
else
- $1_FIND_LIST := $$($1_SRC)
+ $1_FIND_LIST := $$($1_SRC_SLASH)
endif
# Find all files in the source tree.
@@ -96,15 +99,15 @@
endif
ifneq ($$($1_EXCLUDES),)
$1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
- $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+ $1_SRC_EXCLUDES := $$(foreach s,$$($1_SRC_SLASH),$$(addprefix $$s,$$(addsuffix /%,$$($1_EXCLUDES))))
$1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
endif
ifneq ($$($1_EXCLUDE_FILES),)
$1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES)
$1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS))
- $$(foreach s, $$($1_SRC), \
+ $$(foreach s, $$($1_SRC_SLASH), \
$$(eval $1_ZIP_EXCLUDES_$$s += \
- $$(addprefix -x$$(SPACE), $$(patsubst $$s/%,%, $$($1_EXCLUDE_FILES))) \
+ $$(addprefix -x$$(SPACE), $$(patsubst $$s%,%, $$($1_EXCLUDE_FILES))) \
) \
)
endif
@@ -113,7 +116,7 @@
$1_ZIP_EXCLUDES += $$(addprefix -x$(SPACE), $$(subst %,\*,$$($1_EXCLUDE_PATTERNS)))
endif
# Rewrite src dir specific exclude patterns to zip excludes
- $$(foreach s, $$($1_SRC), \
+ $$(foreach s, $$($1_SRC_SLASH), \
$$(if $$($1_EXCLUDE_PATTERNS_$$s), \
$$(eval $1_ZIP_EXCLUDES_$$s += \
$$(addprefix -x$$(SPACE), $$(subst %,\*,$$($1_EXCLUDE_PATTERNS_$$s))) \
@@ -134,7 +137,26 @@
$$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
$$(call LogWarn, Updating $$($1_NAME))
$$(call MakeTargetDir)
- $$(foreach s,$$($1_SRC), $$(call ExecuteWithLog, \
+ # Find duplicate file names in the SRC and generate excludes for all
+ # instances that should not be included. Run this rather expensive
+ # calculation as part of the recipe to avoid running it when nothing
+ # needs to be rebuilt. The drawback is that we cannot exclude these
+ # files from the make prerequisites list, but the number of files is
+ # usually small so a very rare unnecessary rebuild is worth it.
+ # (The inner most foreach here is used instead of eval to declare a
+ # local variable.)
+ $$(foreach root, $$($1_SRC_SLASH), \
+ $$(foreach file, $$(filter $$(root)%, $$($1_ALL_SRCS)), \
+ $$(foreach relfile, $$(patsubst $$(root)%, %, $$(file)), \
+ $$(if $$($1_relfiles_$$(call DoubleDollar, $$(relfile))), \
+ $$(eval $1_ZIP_EXCLUDES_$$(root) += -x $$(relfile)) \
+ , \
+ $$(eval $1_relfiles_$$(call DoubleDollar, $$(relfile)) := 1) \
+ ) \
+ ) \
+ ) \
+ )
+ $$(foreach s,$$($1_SRC_SLASH), $$(call ExecuteWithLog, \
$$(SUPPORT_OUTPUTDIR)/zip/$$(patsubst $$(OUTPUTDIR)/%,%, $$@), \
(cd $$s && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . \
$$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* \
--- a/make/data/tzdata/VERSION Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/VERSION Thu Aug 08 17:27:17 2019 -0400
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2019a
+tzdata2019b
--- a/make/data/tzdata/africa Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/africa Thu Aug 08 17:27:17 2019 -0400
@@ -112,7 +112,7 @@
Rule Algeria 1980 only - Oct 31 2:00 0 -
# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
# more precise 0:09:21.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
0:00 Algeria WE%sT 1940 Feb 25 2:00
@@ -147,7 +147,7 @@
# For now, ignore that and follow the 1911-05-26 Portuguese decree
# (see Europe/Lisbon).
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
-2:00 - -02 1942 Sep
-2:00 1:00 -01 1945 Oct 15
@@ -158,7 +158,7 @@
# See Africa/Lagos.
# Chad
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
1:00 - WAT 1979 Oct 14
1:00 1:00 WAST 1980 Mar 8
@@ -174,7 +174,7 @@
# See Africa/Lagos.
# Côte d'Ivoire / Ivory Coast
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Abidjan -0:16:08 - LMT 1912
0:00 - GMT
Link Africa/Abidjan Africa/Bamako # Mali
@@ -379,7 +379,7 @@
Rule Egypt 2014 only - Jul 31 24:00 1:00 S
Rule Egypt 2014 only - Sep lastThu 24:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
2:00 Egypt EE%sT
@@ -437,7 +437,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Ghana 1920 1942 - Sep 1 0:00 0:20 -
Rule Ghana 1920 1942 - Dec 31 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Accra -0:00:52 - LMT 1918
0:00 Ghana GMT/+0020
@@ -451,13 +451,13 @@
# evidently confusing the date of the Portuguese decree
# (see Europe/Lisbon) with the date that it took effect.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
-1:00 - -01 1975
0:00 - GMT
# Kenya
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul
3:00 - EAT 1930
2:30 - +0230 1940
@@ -492,7 +492,7 @@
# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
# abbreviation "-004430" would be one byte over the POSIX limit.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Monrovia -0:43:08 - LMT 1882
-0:43:08 - MMT 1919 Mar # Monrovia Mean Time
-0:44:30 - MMT 1972 Jan 7 # approximately MMT
@@ -542,7 +542,7 @@
Rule Libya 1997 only - Oct 4 0:00 0 -
Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
Rule Libya 2013 only - Oct lastFri 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
2:00 - EET 1982
@@ -652,7 +652,7 @@
Rule Mauritius 1983 only - Mar 21 0:00 0 -
Rule Mauritius 2008 only - Oct lastSun 2:00 1:00 -
Rule Mauritius 2009 only - Mar lastSun 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
4:00 Mauritius +04/+05
# Agalega Is, Rodriguez
@@ -883,18 +883,24 @@
# the week end after.... The government does not announce yet the decision
# about this temporary change. But it s 99% sure that it will be the case,
# as in previous years. An unofficial survey was done these days, showing
-# that 64% of asked peopke are ok for moving from +1 to +0 during Ramadan.
+# that 64% of asked people are ok for moving from +1 to +0 during Ramadan.
# https://leconomiste.com/article/1035870-enquete-l-economiste-sunergia-64-des-marocains-plebiscitent-le-gmt-pendant-ramadan
+
+# From Naoufal Semlali (2019-04-16):
+# Morocco will be on GMT starting from Sunday, May 5th 2019 at 3am.
+# The switch to GMT+1 will occur on Sunday, June 9th 2019 at 2am....
+# http://fr.le360.ma/societe/voici-la-date-du-retour-a-lheure-legale-au-maroc-188222
#
-# From Paul Eggert (2018-11-01):
-# For now, guess that Morocco will fall back at 03:00 the last Sunday
-# before Ramadan, and spring forward at 02:00 the first Sunday after
+# From Paul Eggert (2019-05-20):
+# This agrees with our 2018-11-01 guess that the Moroccan government
+# would continue the practice of falling back at 03:00 the last Sunday
+# before Ramadan, and of springing forward at 02:00 the first Sunday after
# Ramadan, as this has been the practice since 2012. To implement this,
-# transition dates for 2019 through 2037 were determined by running the
-# following program under GNU Emacs 26.1.
+# transition dates for 2019 through 2087 were determined by running the
+# following program under GNU Emacs 26.2.
# (let ((islamic-year 1440))
# (require 'cal-islam)
-# (while (< islamic-year 1460)
+# (while (< islamic-year 1511)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
# (sunday 0))
@@ -993,8 +999,114 @@
Rule Morocco 2036 only - Nov 23 2:00 0 -
Rule Morocco 2037 only - Oct 4 3:00 -1:00 -
Rule Morocco 2037 only - Nov 15 2:00 0 -
+Rule Morocco 2038 only - Sep 26 3:00 -1:00 -
+Rule Morocco 2038 only - Oct 31 2:00 0 -
+Rule Morocco 2039 only - Sep 18 3:00 -1:00 -
+Rule Morocco 2039 only - Oct 23 2:00 0 -
+Rule Morocco 2040 only - Sep 2 3:00 -1:00 -
+Rule Morocco 2040 only - Oct 14 2:00 0 -
+Rule Morocco 2041 only - Aug 25 3:00 -1:00 -
+Rule Morocco 2041 only - Sep 29 2:00 0 -
+Rule Morocco 2042 only - Aug 10 3:00 -1:00 -
+Rule Morocco 2042 only - Sep 21 2:00 0 -
+Rule Morocco 2043 only - Aug 2 3:00 -1:00 -
+Rule Morocco 2043 only - Sep 6 2:00 0 -
+Rule Morocco 2044 only - Jul 24 3:00 -1:00 -
+Rule Morocco 2044 only - Aug 28 2:00 0 -
+Rule Morocco 2045 only - Jul 9 3:00 -1:00 -
+Rule Morocco 2045 only - Aug 20 2:00 0 -
+Rule Morocco 2046 only - Jul 1 3:00 -1:00 -
+Rule Morocco 2046 only - Aug 5 2:00 0 -
+Rule Morocco 2047 only - Jun 23 3:00 -1:00 -
+Rule Morocco 2047 only - Jul 28 2:00 0 -
+Rule Morocco 2048 only - Jun 7 3:00 -1:00 -
+Rule Morocco 2048 only - Jul 19 2:00 0 -
+Rule Morocco 2049 only - May 30 3:00 -1:00 -
+Rule Morocco 2049 only - Jul 4 2:00 0 -
+Rule Morocco 2050 only - May 15 3:00 -1:00 -
+Rule Morocco 2050 only - Jun 26 2:00 0 -
+Rule Morocco 2051 only - May 7 3:00 -1:00 -
+Rule Morocco 2051 only - Jun 11 2:00 0 -
+Rule Morocco 2052 only - Apr 28 3:00 -1:00 -
+Rule Morocco 2052 only - Jun 2 2:00 0 -
+Rule Morocco 2053 only - Apr 13 3:00 -1:00 -
+Rule Morocco 2053 only - May 25 2:00 0 -
+Rule Morocco 2054 only - Apr 5 3:00 -1:00 -
+Rule Morocco 2054 only - May 10 2:00 0 -
+Rule Morocco 2055 only - Mar 28 3:00 -1:00 -
+Rule Morocco 2055 only - May 2 2:00 0 -
+Rule Morocco 2056 only - Mar 12 3:00 -1:00 -
+Rule Morocco 2056 only - Apr 23 2:00 0 -
+Rule Morocco 2057 only - Mar 4 3:00 -1:00 -
+Rule Morocco 2057 only - Apr 8 2:00 0 -
+Rule Morocco 2058 only - Feb 17 3:00 -1:00 -
+Rule Morocco 2058 only - Mar 31 2:00 0 -
+Rule Morocco 2059 only - Feb 9 3:00 -1:00 -
+Rule Morocco 2059 only - Mar 16 2:00 0 -
+Rule Morocco 2060 only - Feb 1 3:00 -1:00 -
+Rule Morocco 2060 only - Mar 7 2:00 0 -
+Rule Morocco 2061 only - Jan 16 3:00 -1:00 -
+Rule Morocco 2061 only - Feb 27 2:00 0 -
+Rule Morocco 2062 only - Jan 8 3:00 -1:00 -
+Rule Morocco 2062 only - Feb 12 2:00 0 -
+Rule Morocco 2062 only - Dec 31 3:00 -1:00 -
+Rule Morocco 2063 only - Feb 4 2:00 0 -
+Rule Morocco 2063 only - Dec 16 3:00 -1:00 -
+Rule Morocco 2064 only - Jan 20 2:00 0 -
+Rule Morocco 2064 only - Dec 7 3:00 -1:00 -
+Rule Morocco 2065 only - Jan 11 2:00 0 -
+Rule Morocco 2065 only - Nov 22 3:00 -1:00 -
+Rule Morocco 2066 only - Jan 3 2:00 0 -
+Rule Morocco 2066 only - Nov 14 3:00 -1:00 -
+Rule Morocco 2066 only - Dec 19 2:00 0 -
+Rule Morocco 2067 only - Nov 6 3:00 -1:00 -
+Rule Morocco 2067 only - Dec 11 2:00 0 -
+Rule Morocco 2068 only - Oct 21 3:00 -1:00 -
+Rule Morocco 2068 only - Dec 2 2:00 0 -
+Rule Morocco 2069 only - Oct 13 3:00 -1:00 -
+Rule Morocco 2069 only - Nov 17 2:00 0 -
+Rule Morocco 2070 only - Oct 5 3:00 -1:00 -
+Rule Morocco 2070 only - Nov 9 2:00 0 -
+Rule Morocco 2071 only - Sep 20 3:00 -1:00 -
+Rule Morocco 2071 only - Oct 25 2:00 0 -
+Rule Morocco 2072 only - Sep 11 3:00 -1:00 -
+Rule Morocco 2072 only - Oct 16 2:00 0 -
+Rule Morocco 2073 only - Aug 27 3:00 -1:00 -
+Rule Morocco 2073 only - Oct 8 2:00 0 -
+Rule Morocco 2074 only - Aug 19 3:00 -1:00 -
+Rule Morocco 2074 only - Sep 23 2:00 0 -
+Rule Morocco 2075 only - Aug 11 3:00 -1:00 -
+Rule Morocco 2075 only - Sep 15 2:00 0 -
+Rule Morocco 2076 only - Jul 26 3:00 -1:00 -
+Rule Morocco 2076 only - Sep 6 2:00 0 -
+Rule Morocco 2077 only - Jul 18 3:00 -1:00 -
+Rule Morocco 2077 only - Aug 22 2:00 0 -
+Rule Morocco 2078 only - Jul 10 3:00 -1:00 -
+Rule Morocco 2078 only - Aug 14 2:00 0 -
+Rule Morocco 2079 only - Jun 25 3:00 -1:00 -
+Rule Morocco 2079 only - Jul 30 2:00 0 -
+Rule Morocco 2080 only - Jun 16 3:00 -1:00 -
+Rule Morocco 2080 only - Jul 21 2:00 0 -
+Rule Morocco 2081 only - Jun 1 3:00 -1:00 -
+Rule Morocco 2081 only - Jul 13 2:00 0 -
+Rule Morocco 2082 only - May 24 3:00 -1:00 -
+Rule Morocco 2082 only - Jun 28 2:00 0 -
+Rule Morocco 2083 only - May 16 3:00 -1:00 -
+Rule Morocco 2083 only - Jun 20 2:00 0 -
+Rule Morocco 2084 only - Apr 30 3:00 -1:00 -
+Rule Morocco 2084 only - Jun 11 2:00 0 -
+Rule Morocco 2085 only - Apr 22 3:00 -1:00 -
+Rule Morocco 2085 only - May 27 2:00 0 -
+Rule Morocco 2086 only - Apr 14 3:00 -1:00 -
+Rule Morocco 2086 only - May 19 2:00 0 -
+Rule Morocco 2087 only - Mar 30 3:00 -1:00 -
+Rule Morocco 2087 only - May 4 2:00 0 -
+# For dates after the somewhat-arbitrary cutoff of 2087, assume that
+# Morocco will no longer observe DST. At some point this table will
+# need to be extended, though quite possibly Morocco will change the
+# rules first.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 1984 Mar 16
1:00 - +01 1986
@@ -1024,7 +1136,7 @@
# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
# merely made it official?
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
2:00 - CAT
Link Africa/Maputo Africa/Blantyre # Malawi
@@ -1096,7 +1208,7 @@
#Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 WAT
# End of rearguard section.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
1:30 - +0130 1903 Mar
2:00 - SAST 1942 Sep 20 2:00
@@ -1117,7 +1229,7 @@
# See Africa/Lagos.
# Nigeria
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Lagos 0:13:36 - LMT 1919 Sep
1:00 - WAT
Link Africa/Lagos Africa/Bangui # Central African Republic
@@ -1131,7 +1243,7 @@
Link Africa/Lagos Africa/Porto-Novo # Benin
# Réunion
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
4:00 - +04
#
@@ -1191,7 +1303,7 @@
# See Africa/Abidjan.
# Seychelles
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria
4:00 - +04
# From Paul Eggert (2001-05-30):
@@ -1211,7 +1323,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar
2:00 SA SAST
@@ -1246,14 +1358,14 @@
Rule Sudan 1970 1985 - Oct 15 0:00 0 -
Rule Sudan 1971 only - Apr 30 0:00 1:00 S
Rule Sudan 1972 1985 - Apr lastSun 0:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Khartoum 2:10:08 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT 2017 Nov 1
2:00 - CAT
# South Sudan
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Juba 2:06:28 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT
@@ -1359,7 +1471,7 @@
# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
# more precise 0:09:21.
# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
1:00 Tunisia CE%sT
--- a/make/data/tzdata/antarctica Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/antarctica Thu Aug 08 17:27:17 2019 -0400
@@ -36,7 +36,7 @@
# for information.
# Unless otherwise specified, we have no time zone information.
-# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is '-00' and STDOFF is 0 for locations while uninhabited.
# Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -93,7 +93,7 @@
# Australian Antarctica Division informed us that Casey changed time
# zone to UTC+11 in "the morning of 22nd October 2016".
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/Casey 0 - -00 1969
8:00 - +08 2009 Oct 18 2:00
11:00 - +11 2010 Mar 5 2:00
@@ -165,7 +165,7 @@
# St Paul Island - near Amsterdam, uninhabited
# fishing stations operated variously 1819/1931
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Kerguelen 0 - -00 1950 # Port-aux-Français
5:00 - +05
#
@@ -176,7 +176,7 @@
# Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/DumontDUrville 0 - -00 1947
10:00 - +10 1952 Jan 14
0 - -00 1956 Nov
@@ -204,7 +204,7 @@
# Syowa station, which is the first antarctic station of Japan,
# was established on 1957-01-29. Since Syowa station is still the main
# station of Japan, it's appropriate for the principal location.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/Syowa 0 - -00 1957 Jan 29
3:00 - +03
# See:
@@ -254,7 +254,7 @@
#Rule Troll 2004 max - Nov 7 1:00u 0:00 +00
# Remove the following line when uncommenting the above '#Rule' lines.
Rule Troll 2004 max - Oct lastSun 1:00u 0:00 +00
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/Troll 0 - -00 2005 Feb 12
0:00 Troll %s
@@ -328,7 +328,7 @@
# From Paul Eggert (2002-10-22)
# <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/Rothera 0 - -00 1976 Dec 1
-3:00 - -03
--- a/make/data/tzdata/asia Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/asia Thu Aug 08 17:27:17 2019 -0400
@@ -107,7 +107,7 @@
Rule RussiaAsia 1996 2010 - Oct lastSun 2:00s 0 -
# Afghanistan
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kabul 4:36:48 - LMT 1890
4:00 - +04 1945
4:30 - +0430
@@ -140,7 +140,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 -
Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
3:00 - +03 1957 Mar
4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s
@@ -166,7 +166,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 -
Rule Azer 1997 2015 - Oct lastSun 5:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Baku 3:19:24 - LMT 1924 May 2
3:00 - +03 1957 Mar
4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s
@@ -254,7 +254,7 @@
Rule Dhaka 2009 only - Jun 19 23:00 1:00 -
Rule Dhaka 2009 only - Dec 31 24:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dhaka 6:01:40 - LMT 1890
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
6:30 - +0630 1942 May 15
@@ -264,7 +264,7 @@
6:00 Dhaka +06/+07
# Bhutan
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Thimphu 5:58:36 - LMT 1947 Aug 15 # or Thimbu
5:30 - +0530 1987 Oct
6:00 - +06
@@ -275,13 +275,13 @@
# We have no information as to when standard time was introduced;
# assume it occurred in 1907, the same year as Mauritius (which
# then contained the Chagos Archipelago).
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Chagos 4:49:40 - LMT 1907
5:00 - +05 1996
6:00 - +06
# Brunei
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Bandar Seri Begawan
7:30 - +0730 1933
8:00 - +08
@@ -296,7 +296,7 @@
# of Greenwich." This refers to the period before Burma's transition to +0630,
# a transition for which Shanks is the only source.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
6:24:47 - RMT 1920 # Rangoon local time
6:30 - +0630 1942 May
@@ -584,7 +584,7 @@
# that the sort of users who prefer Asia/Urumqi now typically ignored the
# +08 mandate back then.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Beijing time, used throughout China; represented by Shanghai.
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949 May 28
@@ -675,11 +675,41 @@
# https://i.imgur.com/05KkvtC.png
# * 1941-09-30, Hong Kong Daily Press, Winter Time Warning.
# https://i.imgur.com/dge4kFJ.png
-# Also, the Liberation day of Hong Kong after WWII which British rule
-# over the territory resumed was August 30, 1945, which I think should
-# be the termination date for the use of JST in the territory....
-
-# From Paul Eggert (2018-11-17):
+
+# From P Chan (2018-12-31):
+# * According to the Hong Kong Daylight-Saving Regulations, 1941, the
+# 1941 spring-forward transition was at 03:00.
+# http://sunzi.lib.hku.hk/hkgro/view/g1941/304271.pdf
+# http://sunzi.lib.hku.hk/hkgro/view/g1941/305516.pdf
+# * According to some articles from South China Morning Post, +08 was
+# resumed on 1945-11-18 at 02:00.
+# https://i.imgur.com/M2IsZ3c.png
+# https://i.imgur.com/iOPqrVo.png
+# https://i.imgur.com/fffcGDs.png
+# * Some newspapers ... said the 1946 spring-forward transition was on
+# 04-21 at 00:00. The Kung Sheung Evening News 1946-04-20 (Chinese)
+# https://i.imgur.com/ZSzent0.png
+# https://mmis.hkpl.gov.hk///c/portal/cover?c=QF757YsWv5%2FH7zGe%2FKF%2BFLYsuqGhRBfe p.4
+# The Kung Sheung Daily News 1946-04-21 (Chinese)
+# https://i.imgur.com/7ecmRlcm.png
+# https://mmis.hkpl.gov.hk///c/portal/cover?c=QF757YsWv5%2BQBGt1%2BwUj5qG2GqtwR3Wh p.4
+# * According to the Summer Time Ordinance (1946), the fallback
+# transitions between 1946 and 1952 were at 03:30 Standard Time (+08)
+# http://oelawhk.lib.hku.hk/archive/files/bb74b06a74d5294620a15de560ab33c6.pdf
+# * Some other laws and regulations related to DST from 1953 to 1979
+# Summer Time Ordinance 1953
+# https://i.imgur.com/IOlJMav.jpg
+# Summer Time (Amendment) Ordinance 1965
+# https://i.imgur.com/8rofeLa.jpg
+# Interpretation and General Clauses Ordinance (1966)
+# https://i.imgur.com/joy3msj.jpg
+# Emergency (Summer Time) Regulation 1973 <https://i.imgur.com/OpRWrKz.jpg>
+# Interpretation and General Clauses (Amendment) Ordinance 1977
+# https://i.imgur.com/RaNqnc4.jpg
+# Resolution of the Legislative Council passed on 9 May 1979
+# https://www.legco.gov.hk/yr78-79/english/lc_sitg/hansard/h790509.pdf#page=39
+
+# From Paul Eggert (2019-05-31):
# Here are the dates given at
# https://www.hko.gov.hk/gts/time/Summertime.htm
# as of 2014-06-19:
@@ -690,7 +720,7 @@
# 1944 Whole year
# 1945 Whole year
# 1946 20 Apr to 1 Dec
-# 1947 13 Apr to 30 Dec
+# 1947 13 Apr to 30 Nov
# 1948 2 May to 31 Oct
# 1949 3 Apr to 30 Oct
# 1950 2 Apr to 29 Oct
@@ -727,36 +757,28 @@
# The page does not give times of day for transitions,
# or dates for the 1942 and 1945 transitions.
# The Japanese occupation of Hong Kong began 1941-12-25.
-# The Japanese surrender of Hong Kong was signed 1945-09-16; see:
-# Heaver S. The days after the Pacific war ended: unsettling times
-# in Hong Kong. Post Magazine. 2016-06-13.
-# https://www.scmp.com/magazines/post-magazine/article/1852990/days-after-pacific-war-ended-unsettling-times-hong-kong
-# For lack of anything better, use start of those days as the
-# transition times.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule HK 1946 only - Apr 20 3:30 1:00 S
-Rule HK 1946 only - Dec 1 3:30 0 -
-Rule HK 1947 only - Apr 13 3:30 1:00 S
-Rule HK 1947 only - Dec 30 3:30 0 -
-Rule HK 1948 only - May 2 3:30 1:00 S
-Rule HK 1948 1951 - Oct lastSun 3:30 0 -
-Rule HK 1952 1953 - Nov Sun>=1 3:30 0 -
+Rule HK 1946 only - Apr 21 0:00 1:00 S
+Rule HK 1946 only - Dec 1 3:30s 0 -
+Rule HK 1947 only - Apr 13 3:30s 1:00 S
+Rule HK 1947 only - Nov 30 3:30s 0 -
+Rule HK 1948 only - May 2 3:30s 1:00 S
+Rule HK 1948 1952 - Oct Sun>=28 3:30s 0 -
Rule HK 1949 1953 - Apr Sun>=1 3:30 1:00 S
+Rule HK 1953 1964 - Oct Sun>=31 3:30 0 -
Rule HK 1954 1964 - Mar Sun>=18 3:30 1:00 S
-Rule HK 1954 only - Oct 31 3:30 0 -
-Rule HK 1955 1964 - Nov Sun>=1 3:30 0 -
Rule HK 1965 1976 - Apr Sun>=16 3:30 1:00 S
Rule HK 1965 1976 - Oct Sun>=16 3:30 0 -
Rule HK 1973 only - Dec 30 3:30 1:00 S
-Rule HK 1979 only - May Sun>=8 3:30 1:00 S
-Rule HK 1979 only - Oct Sun>=16 3:30 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Rule HK 1979 only - May 13 3:30 1:00 S
+Rule HK 1979 only - Oct 21 3:30 0 -
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Hong_Kong 7:36:42 - LMT 1904 Oct 30 0:36:42
- 8:00 - HKT 1941 Jun 15 3:30
+ 8:00 - HKT 1941 Jun 15 3:00
8:00 1:00 HKST 1941 Oct 1 4:00
8:30 - HKT 1941 Dec 25
- 9:00 - JST 1945 Sep 16
+ 9:00 - JST 1945 Nov 18 2:00
8:00 HK HK%sT
###############################################################################
@@ -880,7 +902,7 @@
Rule Taiwan 1979 only - Jul 1 0:00 1:00 D
Rule Taiwan 1979 only - Oct 1 0:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Taipei or Taibei or T'ai-pei
Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
8:00 - CST 1937 Oct 1
@@ -1018,7 +1040,7 @@
Rule Macau 1979 only - May 13 03:30 1:00 D
Rule Macau 1979 only - Oct Sun>=16 03:30 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Macau 7:34:10 - LMT 1904 Oct 30
8:00 - CST 1941 Dec 21 23:00
9:00 Macau +09/+10 1945 Sep 30 24:00
@@ -1057,7 +1079,7 @@
Rule Cyprus 1978 only - Oct 2 0:00 0 -
Rule Cyprus 1979 1997 - Sep lastSun 0:00 0 -
Rule Cyprus 1981 1998 - Mar lastSun 0:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Nicosia 2:13:28 - LMT 1921 Nov 14
2:00 Cyprus EE%sT 1998 Sep
2:00 EUAsia EE%sT
@@ -1106,7 +1128,7 @@
# Byalokoz 1919 says Georgia was 2:59:11.
# Go with Byalokoz.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Tbilisi 2:59:11 - LMT 1880
2:59:11 - TBMT 1924 May 2 # Tbilisi Mean Time
3:00 - +03 1957 Mar
@@ -1143,7 +1165,7 @@
# which will be permanent, with no seasonal adjustment, will happen at
# midnight on Saturday, September 16.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1
8:00 - +08 1942 Feb 21 23:00
9:00 - +09 1976 May 3
@@ -1209,7 +1231,7 @@
# time for 1870-1941. Shanks is our only (and dubious) source for the
# 1941-1945 data.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kolkata 5:53:28 - LMT 1854 Jun 28 # Kolkata
5:53:20 - HMT 1870 # Howrah Mean Time?
5:21:10 - MMT 1906 Jan 1 # Madras local time
@@ -1261,7 +1283,7 @@
# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
# WIT - +09 - Waktu Indonesia Timur (Indonesia eastern time)
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Java, Sumatra
Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10
# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
@@ -1337,9 +1359,9 @@
# I used the following code in GNU Emacs 26.1 to generate the "Rule Iran"
# lines from 2008 through 2087. Emacs 26.1 uses Ed Reingold's
# cal-persia implementation of Birashk's approximation, which in the
-# 2008-2087 range disagrees with the the astronomical Persian calendar
-# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058),
-# so the following code special-case those years. See Table 15.1, page 264, of:
+# 2008-2087 range disagrees with the astronomical Persian calendar
+# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058), so
+# the following code special-cases those years. See Table 15.1, page 264, of:
# Edward M. Reingold and Nachum Dershowitz, Calendrical Calculations:
# The Ultimate Edition, Cambridge University Press (2018).
# https://www.cambridge.org/fr/academic/subjects/computer-science/computing-general-interest/calendrical-calculations-ultimate-edition-4th-edition
@@ -1533,7 +1555,7 @@
Rule Iran 2088 max - Mar 20 24:00 1:00 -
Rule Iran 2088 max - Sep 20 24:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
3:25:44 - TMT 1946 # Tehran Mean Time
3:30 - +0330 1977 Nov
@@ -1578,7 +1600,7 @@
#
Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 -
Rule Iraq 1991 2007 - Oct 1 3:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Baghdad 2:57:40 - LMT 1890
2:57:36 - BMT 1918 # Baghdad Mean Time?
3:00 - +03 1982 May
@@ -1645,7 +1667,7 @@
Rule Zion 1975 only - Aug 31 0:00 0 S
# From Alois Treindl (2019-03-06):
-# http://www.moin.gov.il/Documents/שעון קיץ/clock-50-years-7-2014.pdf
+# http://www.moin.gov.il/Documents/שעון%20קיץ/clock-50-years-7-2014.pdf
# From Isaac Starkman (2019-03-06):
# Summer time was in that period in 1980 and 1984, see
# https://www.ynet.co.il/articles/0,7340,L-3951073,00.html
@@ -1783,32 +1805,15 @@
#
# ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-# From Paul Eggert (2012-10-26):
-# I used Ephraim Silverberg's dst-israel.el program
-# <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20)
-# along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions from 2005 through 2012.
-# (I replaced "lastFri" with "Fri>=26" by hand.)
-# The spring transitions all correspond to the following Rule:
-#
-# Rule Zion 2005 2012 - Mar Fri>=26 2:00 1:00 D
-#
-# but older zic implementations (e.g., Solaris 8) do not support
-# "Fri>=26" to mean April 1 in years like 2005, so for now we list the
-# springtime transitions explicitly.
-
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Zion 2005 only - Apr 1 2:00 1:00 D
+Rule Zion 2005 2012 - Apr Fri<=1 2:00 1:00 D
Rule Zion 2005 only - Oct 9 2:00 0 S
-Rule Zion 2006 2010 - Mar Fri>=26 2:00 1:00 D
Rule Zion 2006 only - Oct 1 2:00 0 S
Rule Zion 2007 only - Sep 16 2:00 0 S
Rule Zion 2008 only - Oct 5 2:00 0 S
Rule Zion 2009 only - Sep 27 2:00 0 S
Rule Zion 2010 only - Sep 12 2:00 0 S
-Rule Zion 2011 only - Apr 1 2:00 1:00 D
Rule Zion 2011 only - Oct 2 2:00 0 S
-Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D
Rule Zion 2012 only - Sep 23 2:00 0 S
# From Ephraim Silverberg (2013-06-27):
@@ -1824,7 +1829,7 @@
Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D
Rule Zion 2013 max - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Jerusalem 2:20:54 - LMT 1880
2:20:40 - JMT 1918 # Jerusalem Mean Time?
2:00 Zion I%sT
@@ -1916,7 +1921,7 @@
# Central Time (UT+9). The adoption began on Oct 1, 1937.
# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
9:00 Japan J%sT
# Since 1938, all Japanese possessions have been like Asia/Tokyo,
@@ -2019,7 +2024,7 @@
Rule Jordan 2013 only - Dec 20 0:00 0 -
Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S
Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
2:00 Jordan EE%sT
@@ -2060,8 +2065,8 @@
# text.
#
# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
-# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
-# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
+# -- page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
+# http://libinfo.org/index.php?id=58564 -- on 1991-03-31 at 2:00 during
# transition to "summer" time:
# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
@@ -2077,7 +2082,7 @@
# Apparently there were last minute changes. Apparently Kazakh act No. 170
# was one of such changes.
#
-# https://ru.wikipedia.org/wiki/Декретное время
+# https://ru.wikipedia.org/wiki/Декретное_время
# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
# were to not move clocks and Uralsk oblast was to move clocks
@@ -2216,7 +2221,7 @@
# UTC+6 to UTC+5 effective December 21st, 2018. The legal document is
# located here: http://adilet.zan.kz/rus/docs/P1800000817 (russian language).
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
#
# Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
@@ -2318,7 +2323,7 @@
Rule Kyrgyz 1992 1996 - Sep lastSun 0:00 0 -
Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 1:00 -
Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2
5:00 - +05 1930 Jun 21
6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s
@@ -2433,7 +2438,7 @@
# The BBC reported that the transition was from 23:30 to 24:00 today.
# https://www.bbc.com/news/world-asia-44010705
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
8:30 - KST 1912 Jan 1
9:00 - JST 1945 Sep 8
@@ -2482,7 +2487,7 @@
Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S
Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 -
Rule Lebanon 1999 max - Oct lastSun 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Beirut 2:22:00 - LMT 1880
2:00 Lebanon EE%sT
@@ -2494,7 +2499,7 @@
# peninsular Malaysia
# taken from Mok Ly Yng (2003-10-30)
# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kuala_Lumpur 6:46:46 - LMT 1901 Jan 1
6:55:25 - SMT 1905 Jun 1 # Singapore M.T.
7:00 - +07 1933 Jan 1
@@ -2508,7 +2513,7 @@
# From Paul Eggert (2014-08-12):
# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
# and 1982 transition dates are from Mok Ly Yng.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kuching 7:21:20 - LMT 1926 Mar
7:30 - +0730 1933
8:00 NBorneo +08/+0820 1942 Feb 16
@@ -2516,7 +2521,7 @@
8:00 - +08
# Maldives
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Maldives 4:54:00 - LMT 1880 # Malé
4:54:00 - MMT 1960 # Malé Mean Time
5:00 - +05
@@ -2659,7 +2664,7 @@
Rule Mongol 2015 2016 - Mar lastSat 2:00 1:00 -
Rule Mongol 2015 2016 - Sep lastSat 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
Zone Asia/Hovd 6:06:36 - LMT 1905 Aug
6:00 - +06 1978
@@ -2677,7 +2682,7 @@
8:00 Mongol +08/+09
# Nepal
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Kathmandu 5:41:16 - LMT 1920
5:30 - +0530 1986
5:45 - +0545
@@ -2827,7 +2832,7 @@
Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Karachi 4:28:12 - LMT 1907
5:30 - +0530 1942 Sep
5:30 1:00 +0630 1945 Oct 15
@@ -3114,13 +3119,21 @@
# http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817
# From Even Scharning (2019-03-23):
-# DST in Palestine will start on 30 March this year, not 23 March as the time
-# zone database predicted.
-# https://ramallah.news/post/123610
+# http://pnn.ps/news/401130
+# http://palweather.ps/ar/node/50136.html
#
-# From Tim Parenti (2019-03-23):
-# Combining this with the rules observed since 2016, adjust our spring
-# transition guess to Mar Sat>=24.
+# From Sharif Mustafa (2019-03-26):
+# The Palestinian cabinet announced today that the switch to DST will
+# be on Fri Mar 29th 2019 by advancing the clock by 60 minutes.
+# The decree signing date is Mar 12th but it was not published till today.
+# The decree does not specify the exact time of switch.
+# http://palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e54e9ea1-50ee-4137-84df-0d6c78da259b
+#
+# From Even Scharning (2019-04-10):
+# Our source in Palestine said it happened Friday 29 at 00:00 local time....
+#
+# From Paul Eggert (2019-04-10):
+# For now, guess spring-ahead transitions are March's last Friday at 00:00.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -3151,10 +3164,11 @@
Rule Palestine 2013 only - Sep Fri>=21 0:00 0 -
Rule Palestine 2014 2015 - Oct Fri>=21 0:00 0 -
Rule Palestine 2015 only - Mar lastFri 24:00 1:00 S
-Rule Palestine 2016 max - Mar Sat>=24 1:00 1:00 S
+Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
Rule Palestine 2016 max - Oct lastSat 1:00 0 -
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Rule Palestine 2019 max - Mar lastFri 0:00 1:00 S
+
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Zion EET/EEST 1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
@@ -3228,7 +3242,7 @@
Rule Phil 1954 only - Jul 1 0:00 0 S
Rule Phil 1978 only - Mar 22 0:00 1:00 D
Rule Phil 1978 only - Sep 21 0:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31
8:04:00 - LMT 1899 May 11
8:00 Phil P%sT 1942 May
@@ -3236,7 +3250,7 @@
8:00 Phil P%sT
# Qatar
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
4:00 - +04 1972 Jun
3:00 - +03
@@ -3284,7 +3298,7 @@
# the country. Presumably this is documenting airline time. Ignore this,
# as it's before our 1970 cutoff.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
3:00 - +03
Link Asia/Riyadh Asia/Aden # Yemen
@@ -3293,7 +3307,7 @@
# Singapore
# taken from Mok Ly Yng (2003-10-30)
# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1
6:55:25 - SMT 1905 Jun 1 # Singapore M.T.
7:00 - +07 1933 Jan 1
@@ -3357,7 +3371,7 @@
# even worse. For now, let's use a numeric abbreviation; we can
# switch to "SLST" if it catches on.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Colombo 5:19:24 - LMT 1880
5:19:32 - MMT 1906 # Moratuwa Mean Time
5:30 - +0530 1942 Jan 5
@@ -3527,13 +3541,13 @@
Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
Rule Syria 2009 max - Oct lastFri 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
2:00 Syria EE%sT
# Tajikistan
# From Shanks & Pottenger.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2
5:00 - +05 1930 Jun 21
6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s
@@ -3541,7 +3555,7 @@
5:00 - +05
# Thailand
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Bangkok 6:42:04 - LMT 1880
6:42:04 - BMT 1920 Apr # Bangkok Mean Time
7:00 - +07
@@ -3550,7 +3564,7 @@
# Turkmenistan
# From Shanks & Pottenger.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
4:00 - +04 1930 Jun 21
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00
@@ -3558,14 +3572,14 @@
5:00 - +05
# United Arab Emirates
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dubai 3:41:12 - LMT 1920
4:00 - +04
Link Asia/Dubai Asia/Muscat # Oman
# Uzbekistan
# Byalokoz 1919 says Uzbekistan was 4:27:53.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Samarkand 4:27:53 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Apr 1
@@ -3631,7 +3645,7 @@
# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
# NXB Thuận Hoá, Huế, 1995.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jul 1
7:06:30 - PLMT 1911 May 1 # Phù Liễn MT
7:00 - +07 1942 Dec 31 23:00
--- a/make/data/tzdata/australasia Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/australasia Thu Aug 08 17:27:17 2019 -0400
@@ -48,7 +48,7 @@
# says W Australia didn't use DST in 1943/1944. Ignore Whitman's claim that
# 1944/1945 was just like 1943/1944.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Northern Territory
Zone Australia/Darwin 8:43:20 - LMT 1895 Feb
9:00 - ACST 1899 May
@@ -125,7 +125,7 @@
Rule AS 2007 only - Mar lastSun 2:00s 0 S
Rule AS 2008 max - Apr Sun>=1 2:00s 0 S
Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Australia/Adelaide 9:14:20 - LMT 1895 Feb
9:00 - ACST 1899 May
9:30 Aus AC%sT 1971
@@ -157,7 +157,7 @@
Rule AT 2006 only - Apr Sun>=1 2:00s 0 S
Rule AT 2007 only - Mar lastSun 2:00s 0 S
Rule AT 2008 max - Apr Sun>=1 2:00s 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Australia/Hobart 9:49:16 - LMT 1895 Sep
10:00 - AEST 1916 Oct 1 2:00
10:00 1:00 AEDT 1917 Feb
@@ -185,7 +185,7 @@
Rule AV 2007 only - Mar lastSun 2:00s 0 S
Rule AV 2008 max - Apr Sun>=1 2:00s 0 S
Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Australia/Melbourne 9:39:52 - LMT 1895 Feb
10:00 Aus AE%sT 1971
10:00 AV AE%sT
@@ -208,7 +208,7 @@
Rule AN 2007 only - Mar lastSun 2:00s 0 S
Rule AN 2008 max - Apr Sun>=1 2:00s 0 S
Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Australia/Sydney 10:04:52 - LMT 1895 Feb
10:00 Aus AE%sT 1971
10:00 AN AE%sT
@@ -279,14 +279,14 @@
11:00 - +11
# Christmas
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Christmas 7:02:52 - LMT 1895 Feb
7:00 - +07
# Cocos (Keeling) Is
# These islands were ruled by the Ross family from about 1830 to 1978.
# We don't know when standard time was introduced; for now, we guess 1900.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Cocos 6:27:40 - LMT 1900
6:30 - +0630
@@ -409,12 +409,12 @@
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 max - Jan Sun>=13 3:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
# French Polynesia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Gambier -8:59:48 - LMT 1912 Oct # Rikitea
-9:00 - -09
Zone Pacific/Marquesas -9:18:00 - LMT 1912 Oct
@@ -457,7 +457,7 @@
# http://documents.guam.gov/wp-content/uploads/E.O.-77-18-Guam-Standard-Time.pdf
Rule Guam 1977 only - Aug 28 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
9:39:00 - LMT 1901 # Agana
10:00 - GST 1941 Dec 10 # Guam
@@ -467,7 +467,7 @@
Link Pacific/Guam Pacific/Saipan # N Mariana Is
# Kiribati
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
12:00 - +12
Zone Pacific/Enderbury -11:24:20 - LMT 1901
@@ -483,7 +483,7 @@
# See Pacific/Guam.
# Marshall Is
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Majuro 11:24:48 - LMT 1901
11:00 - +11 1914 Oct
9:00 - +09 1919 Feb 1
@@ -501,7 +501,7 @@
12:00 - +12
# Micronesia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Chuuk -13:52:52 - LMT 1844 Dec 31
10:07:08 - LMT 1901
10:00 - +10 1914 Oct
@@ -529,7 +529,7 @@
11:00 - +11
# Nauru
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
11:30 - +1130 1942 Aug 29
9:00 - +09 1945 Sep 8
@@ -543,7 +543,7 @@
Rule NC 1996 only - Dec 1 2:00s 1:00 -
# Shanks & Pottenger say the following was at 2:00; go with IATA.
Rule NC 1997 only - Mar 2 2:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa
11:00 NC +11/+12
@@ -582,7 +582,7 @@
Rule Chatham 2007 max - Sep lastSun 2:45s 1:00 -
Rule NZ 2008 max - Apr Sun>=1 2:00s 0 S
Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
11:30 NZ NZ%sT 1946 Jan 1
12:00 NZ NZ%sT
@@ -608,7 +608,7 @@
Rule Cook 1978 only - Nov 12 0:00 0:30 -
Rule Cook 1979 1991 - Mar Sun>=1 0:00 0 -
Rule Cook 1979 1990 - Oct lastSun 0:00 0:30 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Rarotonga -10:39:04 - LMT 1901 # Avarua
-10:30 - -1030 1978 Nov 12
-10:00 Cook -10/-0930
@@ -617,14 +617,14 @@
# Niue
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Niue -11:19:40 - LMT 1901 # Alofi
-11:20 - -1120 1951
-11:30 - -1130 1978 Oct 1
-11:00 - -11
# Norfolk
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
11:12 - +1112 1951
11:30 - +1130 1974 Oct 27 02:00
@@ -633,13 +633,13 @@
11:00 - +11
# Palau (Belau)
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror
8:57:56 - LMT 1901
9:00 - +09
# Papua New Guinea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
9:48:32 - PMMT 1895 # Port Moresby Mean Time
10:00 - +10
@@ -669,7 +669,7 @@
11:00 - +11
# Pitcairn
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown
-8:30 - -0830 1998 Apr 27 0:00
-8:00 - -08
@@ -754,7 +754,7 @@
Rule WS 2011 only - Sep lastSat 3:00 1 -
Rule WS 2012 max - Apr Sun>=1 4:00 0 -
Rule WS 2012 max - Sep lastSun 3:00 1 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
-11:26:56 - LMT 1911
-11:30 - -1130 1950
@@ -763,7 +763,7 @@
# Solomon Is
# excludes Bougainville, for which see Papua New Guinea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
11:00 - +11
@@ -786,7 +786,7 @@
# was "11 hours slow on G.M.T." Go with Thorsen and assume Shanks & Pottenger
# are off by an hour starting in 1901.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fakaofo -11:24:56 - LMT 1901
-11:00 - -11 2011 Dec 30
13:00 - +13
@@ -799,14 +799,14 @@
Rule Tonga 2001 2002 - Jan lastSun 2:00 0 -
Rule Tonga 2016 only - Nov Sun>=1 2:00 1:00 -
Rule Tonga 2017 only - Jan Sun>=15 3:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Tongatapu 12:19:20 - LMT 1901
12:20 - +1220 1941
13:00 - +13 1999
13:00 Tonga +13/+14
# Tuvalu
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Funafuti 11:56:52 - LMT 1901
12:00 - +12
@@ -867,7 +867,7 @@
# uninhabited since World War II; was probably like Pacific/Kiritimati
# Wake
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Wake 11:06:28 - LMT 1901
12:00 - +12
@@ -880,12 +880,12 @@
Rule Vanuatu 1985 1991 - Sep Sun>=23 0:00 1:00 -
Rule Vanuatu 1992 1993 - Jan Sun>=23 0:00 0 -
Rule Vanuatu 1992 only - Oct Sun>=23 0:00 1:00 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
11:00 Vanuatu +11/+12
# Wallis and Futuna
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Wallis 12:15:20 - LMT 1901
12:00 - +12
@@ -1271,6 +1271,22 @@
# in WA or its introduction in SA had anything to do with the genesis
# of this time zone. My hunch is that it's been around since well
# before 1975. I remember seeing it noted on road maps decades ago.
+#
+# From Gilmore Davidson (2019-04-08):
+# https://www.abc.net.au/news/2019-04-08/this-remote-stretch-of-desert-has-its-own-custom-time-zone/10981000
+# ... include[s] a rough description of the geographical boundaries...
+# "The time zone exists for about 340 kilometres and takes in the tiny
+# roadhouse communities of Cocklebiddy, Madura, Eucla and Border Village."
+# ... and an indication that the zone has definitely been in existence
+# since before the 1970 cut-off of the database ...
+# From Paul Eggert (2019-05-17):
+# That ABC Esperance story by Christien de Garis also says:
+# Although the Central Western Time Zone is not officially recognised (your
+# phones won't automatically change), there is a sign instructing you which
+# way to wind your clocks 45 minutes and scrawled underneath one of them in
+# Texta is the word: 'Why'?
+# "Good question," Mr Pike said.
+# "I don't even know that, and it's been going for over 50 years."
# From Paul Eggert (2006-12-15):
# For lack of better info, assume the tradition dates back to the
@@ -1589,6 +1605,42 @@
###############################################################################
+# Bonin (Ogasawara) Islands and Marcus Island (Minami-Tori-shima)
+
+# From Wakaba (2019-01-28) via Phake Nick:
+# National Diet Library of Japan has several reports by Japanese Government
+# officers that describe the time used in islands when they visited there.
+# According to them (and other sources such as newspapers), standard time UTC
+# + 10 (JST + 1) and DST UTC + 11 (JST + 2) was used until its return to Japan
+# at 1968-06-26 00:00 JST. The exact periods of DST are still unknown.
+# I guessed Guam, Mariana, and Bonin and Marcus districts might have
+# synchronized their DST periods, but reports imply they had their own
+# decisions, i.e. there were three or more different time zones....
+#
+# https://wiki.suikawiki.org/n/小笠原諸島の標準時
+
+# From Phake Nick (2019-02-12):
+# Because their last time change to return to Japanese time when they returned
+# to Japanese rule was right before 1970, ... per the current tz database
+# rule, the information doesn't warrant creation of a new timezone for Bonin
+# Islands itself and is thus as an anecdotal note for interest purpose only.
+# ... [The abovementioned link] described some special timekeeping phenomenon
+# regarding Marcus island, another remote island currently owned by Japanese
+# in the same administrative unit as Bonin Islands. Many reports claim that
+# the American coastal guard on the American quarter of the island use its own
+# coastal guard time, and most sources describe the time as UTC+11, being two
+# hours faster than JST used by some Japanese personnel on the island. Some
+# sites describe it as same as Wake Island/Guam time although it would be
+# incorrect to be same as Guam. And then in a few Japanese governmental
+# report from 1980s (from National Institute of Information and Communications
+# Technology) regarding the construction of VLBI facility on the Marcus
+# Island, it claimed that there are three time standards being used on the
+# island at the time which include not just JST (UTC+9) or [US]CG time
+# (UTC+11) but also a JMSDF time (UTC+10) (Japan Maritime Self-Defense
+# Force). Unfortunately there are no other sources that mentioned such time
+# and there are also no information on things like how the time was used.
+
+
# Fiji
# Howse writes (p 153) that in 1879 the British governor of Fiji
--- a/make/data/tzdata/europe Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/europe Thu Aug 08 17:27:17 2019 -0400
@@ -145,7 +145,7 @@
# position is 51° 28' 30" N, 0° 18' 45" W. The longitude should
# be within about ±2". The Ordnance Survey grid reference is TQ172761.
#
-# [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
+# [This yields STDOFF = -0:01:15 for London LMT in the 18th century.]
# From Paul Eggert (1993-11-18):
#
@@ -523,7 +523,7 @@
#
# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
0:00 GB-Eire %s 1968 Oct 27
1:00 - BST 1971 Oct 31 2:00u
@@ -561,7 +561,7 @@
Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 -
Rule Eire 1996 max - Oct lastSun 1:00u -1:00 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
-0:25:21 - DMT 1916 May 21 2:00s
-0:25:21 1:00 IST 1916 Oct 1 2:00s
@@ -760,7 +760,7 @@
# These are for backward compatibility with older versions.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone WET 0:00 EU WE%sT
Zone CET 1:00 C-Eur CE%sT
Zone MET 1:00 C-Eur ME%sT
@@ -820,14 +820,14 @@
Rule Albania 1983 only - Apr 18 0:00 1:00 S
Rule Albania 1983 only - Oct 1 0:00 0 -
Rule Albania 1984 only - Apr 1 0:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Tirane 1:19:20 - LMT 1914
1:00 - CET 1940 Jun 16
1:00 Albania CE%sT 1984 Jul
1:00 EU CE%sT
# Andorra
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Andorra 0:06:04 - LMT 1901
0:00 - WET 1946 Sep 30
1:00 - CET 1985 Mar 31 2:00
@@ -853,7 +853,7 @@
Rule Austria 1948 only - Apr 18 2:00s 1:00 S
Rule Austria 1980 only - Apr 6 0:00 1:00 S
Rule Austria 1980 only - Sep 28 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Vienna 1:05:21 - LMT 1893 Apr
1:00 C-Eur CE%sT 1920
1:00 Austria CE%sT 1940 Apr 1 2:00s
@@ -885,7 +885,7 @@
# Belarussian government decided against changing to winter time....
# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Minsk 1:50:16 - LMT 1880
1:50 - MMT 1924 May 2 # Minsk Mean Time
2:00 - EET 1930 Jun 21
@@ -949,7 +949,7 @@
Rule Belgium 1945 only - Sep 16 2:00s 0 -
Rule Belgium 1946 only - May 19 2:00s 1:00 S
Rule Belgium 1946 only - Oct 7 2:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Brussels 0:17:30 - LMT 1880
0:17:30 - BMT 1892 May 1 12:00 # Brussels MT
0:00 - WET 1914 Nov 8
@@ -976,7 +976,7 @@
Rule Bulg 1980 1982 - Apr Sat>=1 23:00 1:00 S
Rule Bulg 1980 only - Sep 29 1:00 0 -
Rule Bulg 1981 only - Sep 27 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Sofia 1:33:16 - LMT 1880
1:56:56 - IMT 1894 Nov 30 # Istanbul MT?
2:00 - EET 1942 Nov 2 3:00
@@ -1009,7 +1009,7 @@
Rule Czech 1946 1949 - Oct Sun>=1 2:00s 0 -
Rule Czech 1947 1948 - Apr Sun>=15 2:00s 1:00 S
Rule Czech 1949 only - Apr 9 2:00s 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Prague 0:57:44 - LMT 1850
0:57:44 - PMT 1891 Oct # Prague Mean Time
1:00 C-Eur CE%sT 1945 May 9
@@ -1071,7 +1071,7 @@
Rule Denmark 1948 only - May 9 2:00s 1:00 S
Rule Denmark 1948 only - Aug 8 2:00s 0 -
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Copenhagen 0:50:20 - LMT 1890
0:50:20 - CMT 1894 Jan 1 # Copenhagen MT
1:00 Denmark CE%sT 1942 Nov 2 2:00s
@@ -1168,7 +1168,7 @@
Rule Thule 2007 max - Mar Sun>=8 2:00 1:00 D
Rule Thule 2007 max - Nov Sun>=1 2:00 0 S
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
-3:00 - -03 1980 Apr 6 2:00
-3:00 EU -03/-02 1996
@@ -1234,7 +1234,7 @@
# From Urmet Jänes (2002-03-28):
# The legislative reference is Government decree No. 84 on 2002-02-21.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Tallinn 1:39:00 - LMT 1880
1:39:00 - TMT 1918 Feb # Tallinn Mean Time
1:00 C-Eur CE%sT 1919 Jul
@@ -1297,7 +1297,7 @@
# Milne says Helsinki (Helsingfors) time was 1:39:49.2 (official document);
# round to nearest.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31
1:39:49 - HMT 1921 May # Helsinki Mean Time
2:00 Finland EE%sT 1983
@@ -1387,7 +1387,7 @@
# but Howse quotes the actual French legislation as saying 0:09:21.
# Go with Howse. Howse writes that the time in France was officially based
# on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
0:09:21 - PMT 1911 Mar 11 0:01 # Paris MT
# Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
@@ -1435,7 +1435,7 @@
Rule SovietZone 1945 only - Sep 24 3:00 1:00 S
Rule SovietZone 1945 only - Nov 18 2:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Berlin 0:53:28 - LMT 1893 Apr
1:00 C-Eur CE%sT 1945 May 24 2:00
1:00 SovietZone CE%sT 1946
@@ -1463,7 +1463,7 @@
# is in Europe. Our reference location Tbilisi is in the Asian part.
# Gibraltar
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Gibraltar -0:21:24 - LMT 1880 Aug 2 0:00s
0:00 GB-Eire %s 1957 Apr 14 2:00
1:00 - CET 1982
@@ -1494,7 +1494,7 @@
Rule Greece 1979 only - Sep 29 2:00 0 -
Rule Greece 1980 only - Apr 1 0:00 1:00 S
Rule Greece 1980 only - Sep 28 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Athens 1:34:52 - LMT 1895 Sep 14
1:34:52 - AMT 1916 Jul 28 0:01 # Athens MT
2:00 Greece EE%sT 1941 Apr 30
@@ -1531,7 +1531,7 @@
Rule Hungary 1957 only - Jun Sun>=1 1:00 1:00 S
Rule Hungary 1957 only - Sep lastSun 3:00 0 -
Rule Hungary 1980 only - Apr 6 1:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
1:00 C-Eur CE%sT 1918
1:00 Hungary CE%sT 1941 Apr 8
@@ -1592,7 +1592,7 @@
Rule Iceland 1949 only - Oct 30 1:00s 0 -
Rule Iceland 1950 1966 - Oct Sun>=22 1:00s 0 -
Rule Iceland 1967 only - Oct 29 1:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/Reykjavik -1:28 - LMT 1908
-1:00 Iceland -01/+00 1968 Apr 7 1:00s
0:00 - GMT
@@ -1606,6 +1606,25 @@
# But these events all occurred before the 1970 cutoff,
# so record only the time in Rome.
#
+# From Stephen Trainor (2019-05-06):
+# http://www.ac-ilsestante.it/MERIDIANE/ora_legale/ORA_LEGALE_ESTIVA_IN_ITALIA.htm
+# ... the [1866] law went into effect on 12 December 1866, rather than
+# the date of the decree (22 Sep 1866)
+# https://web.archive.org/web/20070824155341/http://www.iav.it/planetario/didastro/didastro/english.htm
+# ... "In Italy in 1866 there were 6 railway times (Torino, Verona, Firenze,
+# Roma, Napoli, Palermo). On that year it was decided to unify them, adopting
+# the average time of Rome (even if this city was not yet part of the
+# kingdom). On the 12th December 1866, on the starting of the winter time
+# table, it took effect in the railways, the post office and the telegraph,
+# not only for the internal service but also for the public.... Milano set
+# the public watches on the Rome time on the same day (12th December 1866),
+# Torino and Bologna on the 1st January 1867, Venezia the 1st May 1880 and the
+# last city was Cagliari in 1886."
+#
+# From Luigi Rosa (2019-05-07):
+# this is the scan of the decree:
+# http://www.radiomarconi.com/marconi/filopanti/1866c.jpg
+#
# From Michael Deckers (2016-10-24):
# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
# ... [translated as] "The preceding dispositions will enter into
@@ -1616,6 +1635,7 @@
# The authoritative source for time in Italy is the national metrological
# institute, which has a summary page of historical DST data at
# http://www.inrim.it/res/tf/ora_legale_i.shtml
+# [now at http://oldsite.inrim.it/res/tf/ora_legale_i.shtml as of 2017]
# (2016-10-24):
# http://www.renzobaldini.it/le-ore-legali-in-italia/
# has still different data for 1944. It divides Italy in two, as
@@ -1679,8 +1699,8 @@
Rule Italy 1977 1979 - May Sun>=22 0:00s 1:00 S
Rule Italy 1978 only - Oct 1 0:00s 0 -
Rule Italy 1979 only - Sep 30 0:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Europe/Rome 0:49:56 - LMT 1866 Sep 22
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
+Zone Europe/Rome 0:49:56 - LMT 1866 Dec 12
0:49:56 - RMT 1893 Oct 31 23:49:56 # Rome Mean
1:00 Italy CE%sT 1943 Sep 10
1:00 C-Eur CE%sT 1944 Jun 4
@@ -1755,7 +1775,7 @@
# Byalokoz 1919 says Latvia was 1:36:34.
# Go with Byalokoz.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Riga 1:36:34 - LMT 1880
1:36:34 - RMT 1918 Apr 15 2:00 # Riga MT
1:36:34 1:00 LST 1918 Sep 16 3:00 # Latvian ST
@@ -1825,7 +1845,7 @@
# http://www.lrvk.lt/nut/11/n1749.htm
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Vilnius 1:41:16 - LMT 1880
1:24:00 - WMT 1917 # Warsaw Mean Time
1:35:36 - KMT 1919 Oct 10 # Kaunas Mean Time
@@ -1869,7 +1889,7 @@
Rule Lux 1927 only - Apr 9 23:00 1:00 S
Rule Lux 1928 only - Apr 14 23:00 1:00 S
Rule Lux 1929 only - Apr 20 23:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun
1:00 Lux CE%sT 1918 Nov 25
0:00 Lux WE%sT 1929 Oct 6 2:00s
@@ -1894,7 +1914,7 @@
Rule Malta 1975 1979 - Apr Sun>=15 2:00 1:00 S
Rule Malta 1975 1980 - Sep Sun>=15 2:00 0 -
Rule Malta 1980 only - Mar 31 2:00 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Malta 0:58:04 - LMT 1893 Nov 2 0:00s # Valletta
1:00 Italy CE%sT 1973 Mar 31
1:00 Malta CE%sT 1981
@@ -1963,7 +1983,7 @@
Rule Moldova 1997 max - Mar lastSun 2:00 1:00 S
Rule Moldova 1997 max - Oct lastSun 3:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Chisinau 1:55:20 - LMT 1880
1:55 - CMT 1918 Feb 15 # Chisinau MT
1:44:24 - BMT 1931 Jul 24 # Bucharest MT
@@ -1979,7 +1999,7 @@
# Monaco
# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
# more precise 0:09:21.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
0:00 France WE%sT 1945 Sep 16 3:00
@@ -2054,8 +2074,8 @@
Rule Neth 1945 only - Sep 16 2:00s 0 -
#
# Amsterdam Mean Time was +00:19:32.13, but the .13 is omitted
-# below because the current format requires GMTOFF to be an integer.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# below because the current format requires STDOFF to be an integer.
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Amsterdam 0:19:32 - LMT 1835
0:19:32 Neth %s 1937 Jul 1
0:20 Neth +0020/+0120 1940 May 16 0:00
@@ -2074,7 +2094,7 @@
Rule Norway 1959 1964 - Mar Sun>=15 2:00s 1:00 S
Rule Norway 1959 1965 - Sep Sun>=15 2:00s 0 -
Rule Norway 1965 only - Apr 25 2:00s 1:00 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
1:00 Norway CE%sT 1940 Aug 10 23:00
1:00 C-Eur CE%sT 1945 Apr 2 2:00
@@ -2165,7 +2185,7 @@
Rule Poland 1960 only - Apr 3 1:00s 1:00 S
Rule Poland 1961 1964 - May lastSun 1:00s 1:00 S
Rule Poland 1962 1964 - Sep lastSun 1:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Warsaw 1:24:00 - LMT 1880
1:24:00 - WMT 1915 Aug 5 # Warsaw Mean Time
1:00 C-Eur CE%sT 1918 Sep 16 3:00
@@ -2270,7 +2290,7 @@
Rule Port 1981 1982 - Mar lastSun 1:00s 1:00 S
Rule Port 1983 only - Mar lastSun 2:00s 1:00 S
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Lisbon -0:36:45 - LMT 1884
-0:36:45 - LMT 1912 Jan 1 0:00u # Lisbon MT
0:00 Port WE%sT 1966 Apr 3 2:00
@@ -2329,7 +2349,7 @@
Rule Romania 1980 only - Sep lastSun 1:00 0 -
Rule Romania 1991 1993 - Mar lastSun 0:00s 1:00 S
Rule Romania 1991 1993 - Sep lastSun 0:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
1:44:24 - BMT 1931 Jul 24 # Bucharest MT
2:00 Romania EE%sT 1981 Mar 29 2:00s
@@ -3368,7 +3388,7 @@
# See Europe/Rome.
# Serbia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Belgrade 1:22:00 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
1:00 C-Eur CE%sT 1945
@@ -3474,7 +3494,7 @@
Rule SpainAfrica 1977 only - Sep 28 0:00 0 -
Rule SpainAfrica 1978 only - Jun 1 0:00 1:00 S
Rule SpainAfrica 1978 only - Aug 4 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Madrid -0:14:44 - LMT 1900 Dec 31 23:45:16
0:00 Spain WE%sT 1940 Mar 16 23:00
1:00 Spain CE%sT 1979
@@ -3542,7 +3562,7 @@
#
# Source: The newspaper "Dagens Nyheter", 1916-10-01, page 7 upper left.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Stockholm 1:12:12 - LMT 1879 Jan 1
1:00:14 - SET 1900 Jan 1 # Swedish Time
1:00 - CET 1916 May 14 23:00
@@ -3645,7 +3665,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S
Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
0:29:46 - BMT 1894 Jun # Bern Mean Time
1:00 Swiss CE%sT 1981
@@ -3795,7 +3815,7 @@
Rule Turkey 1994 only - Mar 20 1:00s 1:00 S
Rule Turkey 1995 2006 - Mar lastSun 1:00s 1:00 S
Rule Turkey 1996 2006 - Oct lastSun 1:00s 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Europe/Istanbul 1:55:52 - LMT 1880
1:56:56 - IMT 1910 Oct # Istanbul Mean Time?
2:00 Turkey EE%sT 1978 Oct 15
@@ -3892,16 +3912,8 @@
# controversial, and some day "Kyiv" may become substantially more popular in
# English; in the meantime, stick with the traditional English "Kiev" as that
# means less disruption for our users.
-#
-# Anyway, none of the common English-language spellings (Kiev, Kyiv, Kieff,
-# Kijeff, Kijev, Kiyef, Kiyeff) do justice to the common pronunciation in
-# Ukrainian, namely [ˈkɪjiu̯] (IPA). This pronunciation has nothing like an
-# English "v" or "f", and instead trails off with what an English-speaker
-# would call a demure "oo" sound, and it would would be better anglicized as
-# "Kuiyu". Here's a sound file, if you would like to do as the Kuiyuvians do:
-# https://commons.wikimedia.org/wiki/File:Uk-Київ.ogg
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# This represents most of Ukraine. See above for the spelling of "Kiev".
Zone Europe/Kiev 2:02:04 - LMT 1880
2:02:04 - KMT 1924 May 2 # Kiev Mean Time
--- a/make/data/tzdata/factory Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/factory Thu Aug 08 17:27:17 2019 -0400
@@ -31,5 +31,5 @@
# time zone abbreviation "-00", indicating that the actual time zone
# is unknown.
-# Zone NAME GMTOFF RULES FORMAT
+# Zone NAME STDOFF RULES FORMAT
Zone Factory 0 - -00
--- a/make/data/tzdata/northamerica Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/northamerica Thu Aug 08 17:27:17 2019 -0400
@@ -116,10 +116,33 @@
# was the first nationwide legal time standard, and apparently
# time was just called "Standard Time" or "Daylight Saving Time".
-# From Arthur David Olson:
-# US Daylight Saving Time ended on the last Sunday of *October* in 1974.
-# See, for example, the front page of the Saturday, 1974-10-26
-# and Sunday, 1974-10-27 editions of the Washington Post.
+# From Paul Eggert (2019-06-04):
+# Here is the legal basis for the US federal rules.
+# * Public Law 65-106 (1918-03-19) implemented standard and daylight saving
+# time for the first time across the US, springing forward on March's last
+# Sunday and falling back on October's last Sunday.
+# https://www.loc.gov/law/help/statutes-at-large/65th-congress/session-2/c65s2ch24.pdf
+# * Public Law 66-40 (1919-08-20) repealed DST on October 1919's last Sunday.
+# https://www.loc.gov/law/help/statutes-at-large/66th-congress/session-1/c66s1ch51.pdf
+# * Public Law 77-403 (1942-01-20) started wartime DST on 1942-02-09.
+# https://www.loc.gov/law/help/statutes-at-large/77th-congress/session-2/c77s2ch7.pdf
+# * Public Law 79-187 (1945-09-25) ended wartime DST on 1945-09-30.
+# https://www.loc.gov/law/help/statutes-at-large/79th-congress/session-1/c79s1ch388.pdf
+# * Public Law 89-387 (1966-04-13) reinstituted a national standard for DST,
+# from April's last Sunday to October's last Sunday, effective 1967.
+# https://www.govinfo.gov/content/pkg/STATUTE-80/pdf/STATUTE-80-Pg107.pdf
+# * Public Law 93-182 (1973-12-15) moved the 1974 spring-forward to 01-06.
+# https://www.govinfo.gov/content/pkg/STATUTE-87/pdf/STATUTE-87-Pg707.pdf
+# * Public Law 93-434 (1974-10-05) moved the 1975 spring-forward to
+# February's last Sunday.
+# https://www.govinfo.gov/content/pkg/STATUTE-88/pdf/STATUTE-88-Pg1209.pdf
+# * Public Law 99-359 (1986-07-08) moved the spring-forward to April's first
+# Sunday.
+# https://www.govinfo.gov/content/pkg/STATUTE-100/pdf/STATUTE-100-Pg764.pdf
+# * Public Law 109-58 (2005-08-08), effective 2007, moved the spring-forward
+# to March's second Sunday and the fall-back to November's first Sunday.
+# https://www.govinfo.gov/content/pkg/PLAW-109publ58/pdf/PLAW-109publ58.pdf
+# All transitions are at 02:00 local time.
# From Arthur David Olson:
# Before the Uniform Time Act of 1966 took effect in 1967, observance of
@@ -175,11 +198,11 @@
Rule US 1918 1919 - Oct lastSun 2:00 0 S
Rule US 1942 only - Feb 9 2:00 1:00 W # War
Rule US 1945 only - Aug 14 23:00u 1:00 P # Peace
-Rule US 1945 only - Sep lastSun 2:00 0 S
+Rule US 1945 only - Sep 30 2:00 0 S
Rule US 1967 2006 - Oct lastSun 2:00 0 S
Rule US 1967 1973 - Apr lastSun 2:00 1:00 D
Rule US 1974 only - Jan 6 2:00 1:00 D
-Rule US 1975 only - Feb 23 2:00 1:00 D
+Rule US 1975 only - Feb lastSun 2:00 1:00 D
Rule US 1976 1986 - Apr lastSun 2:00 1:00 D
Rule US 1987 2006 - Apr Sun>=1 2:00 1:00 D
Rule US 2007 max - Mar Sun>=8 2:00 1:00 D
@@ -196,7 +219,7 @@
# increase the chances that they'll actually get compiled and to
# avoid the need to duplicate the US rules in another file.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone EST -5:00 - EST
Zone MST -7:00 - MST
Zone HST -10:00 - HST
@@ -353,7 +376,7 @@
Rule NYC 1921 1966 - Apr lastSun 2:00 1:00 D
Rule NYC 1921 1954 - Sep lastSun 2:00 0 S
Rule NYC 1955 1966 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/New_York -4:56:02 - LMT 1883 Nov 18 12:03:58
-5:00 US E%sT 1920
-5:00 NYC E%sT 1942
@@ -413,7 +436,7 @@
Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D
Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S
Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
-6:00 US C%sT 1920
-6:00 Chicago C%sT 1936 Mar 1 2:00
@@ -481,7 +504,7 @@
Rule Denver 1921 only - May 22 2:00 0 S
Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D
Rule Denver 1965 1966 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04
-7:00 US M%sT 1920
-7:00 Denver M%sT 1942
@@ -534,7 +557,7 @@
Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
Rule CA 1950 1961 - Sep lastSun 2:00 0 S
Rule CA 1962 1966 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
-8:00 US P%sT 1946
-8:00 CA P%sT 1967
@@ -642,7 +665,7 @@
# So they won't be waiting for Alaska to join them on 2019-03-10, but will
# rather change their clocks twice in seven weeks.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
-8:57:41 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
@@ -762,7 +785,7 @@
# Note that 1933-05-21 was a Sunday.
# We're left to guess the time of day when Act 163 was approved; guess noon.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
-10:30 - HST 1933 Apr 30 2:00
-10:30 1:00 HDT 1933 May 21 12:00
@@ -792,7 +815,7 @@
# Shanks says the 1944 experiment came to an end on 1944-03-17.
# Go with the Arizona State Library instead.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
-7:00 US M%sT 1944 Jan 1 0:01
-7:00 - MST 1944 Apr 1 0:01
@@ -818,7 +841,7 @@
# quarter of Idaho county) and eastern Oregon (most of Malheur County)
# switched four weeks late in 1974.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
-8:00 US P%sT 1923 May 13 2:00
-7:00 US M%sT 1974
@@ -890,7 +913,7 @@
Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
-6:00 US C%sT 1920
-6:00 Indianapolis C%sT 1942
@@ -910,7 +933,7 @@
Rule Marengo 1951 only - Sep lastSun 2:00 0 S
Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
-6:00 US C%sT 1951
-6:00 Marengo C%sT 1961 Apr 30 2:00
@@ -934,7 +957,7 @@
Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
-6:00 US C%sT 1946
-6:00 Vincennes C%sT 1964 Apr 26 2:00
@@ -955,7 +978,7 @@
Rule Perry 1960 only - Oct lastSun 2:00 0 S
Rule Perry 1961 only - Sep lastSun 2:00 0 S
Rule Perry 1962 1963 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
-6:00 US C%sT 1946
-6:00 Perry C%sT 1964 Apr 26 2:00
@@ -971,7 +994,7 @@
Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
-6:00 US C%sT 1955
-6:00 Pike C%sT 1965 Apr 25 2:00
@@ -993,7 +1016,7 @@
Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
Rule Starke 1957 1958 - Sep lastSun 2:00 0 S
Rule Starke 1959 1961 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
-6:00 US C%sT 1947
-6:00 Starke C%sT 1962 Apr 29 2:00
@@ -1009,7 +1032,7 @@
Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
-6:00 US C%sT 1946
-6:00 Pulaski C%sT 1961 Apr 30 2:00
@@ -1020,7 +1043,7 @@
-5:00 US E%sT
#
# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
-6:00 US C%sT 1954 Apr 25 2:00
-5:00 - EST 1969
@@ -1045,7 +1068,7 @@
Rule Louisville 1946 only - Jun 2 2:00 0 S
Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S
Rule Louisville 1956 1960 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
-6:00 US C%sT 1921
-6:00 Louisville C%sT 1942
@@ -1151,7 +1174,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
Rule Detroit 1948 only - Sep lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Detroit -5:32:11 - LMT 1905
-6:00 - CST 1915 May 15 2:00
-5:00 - EST 1942
@@ -1168,7 +1191,7 @@
Rule Menominee 1946 only - Sep lastSun 2:00 0 S
Rule Menominee 1966 only - Apr lastSun 2:00 1:00 D
Rule Menominee 1966 only - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
-6:00 US C%sT 1946
-6:00 Menominee C%sT 1969 Apr 27 2:00
@@ -1402,7 +1425,7 @@
Rule StJohns 2007 2010 - Nov Sun>=1 0:01 0 S
#
# St John's has an apostrophe, but Posix file names can't have apostrophes.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/St_Johns -3:30:52 - LMT 1884
-3:30:52 StJohns N%sT 1918
-3:30:52 Canada N%sT 1919
@@ -1415,7 +1438,7 @@
# most of east Labrador
# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
-3:30:52 - NST 1918
-3:30:52 Canada N%sT 1919
@@ -1489,7 +1512,7 @@
Rule Halifax 1956 1959 - Sep lastSun 2:00 0 S
Rule Halifax 1962 1973 - Apr lastSun 2:00 1:00 D
Rule Halifax 1962 1973 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Halifax -4:14:24 - LMT 1902 Jun 15
-4:00 Halifax A%sT 1918
-4:00 Canada A%sT 1919
@@ -1527,7 +1550,7 @@
Rule Moncton 1957 1972 - Oct lastSun 2:00 0 S
Rule Moncton 1993 2006 - Apr Sun>=1 0:01 1:00 D
Rule Moncton 1993 2006 - Oct lastSun 0:01 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Moncton -4:19:08 - LMT 1883 Dec 9
-5:00 - EST 1902 Jun 15
-4:00 Canada A%sT 1933
@@ -1556,7 +1579,7 @@
# For lack of better info, guess this practice began around 1970, contra to
# Shanks & Pottenger who have this region observing AST/ADT.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Blanc-Sablon -3:48:28 - LMT 1884
-4:00 Canada A%sT 1970
-4:00 - AST
@@ -1724,19 +1747,10 @@
# was meant.
Rule Toronto 1922 1926 - Sep Sun>=15 2:00 0 S
Rule Toronto 1924 1927 - May Sun>=1 2:00 1:00 D
-# The 1927-to-1939 rules can be expressed more simply as
-# Rule Toronto 1927 1937 - Sep Sun>=25 2:00 0 S
-# Rule Toronto 1928 1937 - Apr Sun>=25 2:00 1:00 D
-# Rule Toronto 1938 1940 - Apr lastSun 2:00 1:00 D
-# Rule Toronto 1938 1939 - Sep lastSun 2:00 0 S
-# The rules below avoid use of Sun>=25
-# (which pre-2004 versions of zic cannot handle).
-Rule Toronto 1927 1932 - Sep lastSun 2:00 0 S
-Rule Toronto 1928 1931 - Apr lastSun 2:00 1:00 D
-Rule Toronto 1932 only - May 1 2:00 1:00 D
-Rule Toronto 1933 1940 - Apr lastSun 2:00 1:00 D
-Rule Toronto 1933 only - Oct 1 2:00 0 S
-Rule Toronto 1934 1939 - Sep lastSun 2:00 0 S
+Rule Toronto 1927 1937 - Sep Sun>=25 2:00 0 S
+Rule Toronto 1928 1937 - Apr Sun>=25 2:00 1:00 D
+Rule Toronto 1938 1940 - Apr lastSun 2:00 1:00 D
+Rule Toronto 1938 1939 - Sep lastSun 2:00 0 S
Rule Toronto 1945 1946 - Sep lastSun 2:00 0 S
Rule Toronto 1946 only - Apr lastSun 2:00 1:00 D
Rule Toronto 1947 1949 - Apr lastSun 0:00 1:00 D
@@ -1769,7 +1783,7 @@
# War,... [t]he cities agreed to implement DST during the summer
# months for the remainder of the war years.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Toronto -5:17:32 - LMT 1895
-5:00 Canada E%sT 1919
-5:00 Toronto E%sT 1942 Feb 9 2:00s
@@ -1844,7 +1858,7 @@
Rule Winn 1966 1986 - Apr lastSun 2:00s 1:00 D
Rule Winn 1966 2005 - Oct lastSun 2:00s 0 S
Rule Winn 1987 2005 - Apr Sun>=1 2:00s 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Winnipeg -6:28:36 - LMT 1887 Jul 16
-6:00 Winn C%sT 2006
-6:00 Canada C%sT
@@ -1866,6 +1880,13 @@
# Willett (1914-03) notes that DST "has been in operation ... in the
# City of Moose Jaw, Saskatchewan, for one year."
+# From Paul Eggert (2019-04-26):
+# Chris Pearce's book "The Great Daylight Saving Time Controversy" (2017)
+# says that Regina observed DST in 1914-1917. No dates and times,
+# unfortunately. It also says that in 1914 Saskatoon observed DST
+# from 1 June to 6 July, and that DST was also tried out in Davidson,
+# Melfort, and Prince Albert.
+
# From Paul Eggert (2006-03-22):
# Shanks & Pottenger say that since 1970 this region has mostly been as Regina.
# Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
@@ -1928,7 +1949,7 @@
Rule Swift 1959 1961 - Apr lastSun 2:00 1:00 D
Rule Swift 1959 only - Oct lastSun 2:00 0 S
Rule Swift 1960 1961 - Sep lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Regina -6:58:36 - LMT 1905 Sep
-7:00 Regina M%sT 1960 Apr lastSun 2:00
-6:00 - CST
@@ -1959,7 +1980,7 @@
Rule Edm 1969 only - Oct lastSun 2:00 0 S
Rule Edm 1972 1986 - Apr lastSun 2:00 1:00 D
Rule Edm 1972 2006 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Edmonton -7:33:52 - LMT 1906 Sep
-7:00 Edm M%sT 1987
-7:00 Canada M%sT
@@ -2052,7 +2073,7 @@
Rule Vanc 1946 only - Oct 13 2:00 0 S
Rule Vanc 1947 1961 - Sep lastSun 2:00 0 S
Rule Vanc 1962 2006 - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Vancouver -8:12:28 - LMT 1884
-8:00 Vanc P%sT 1987
-8:00 Canada P%sT
@@ -2123,7 +2144,7 @@
# varying the manner of reckoning standard time.
#
# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
-# http://? - no online source found
+# [no online source found]
#
# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
# Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
@@ -2156,7 +2177,7 @@
# to say eight hours behind Greenwich Time.
#
# * O.I.C. 1980/02 INTERPRETATION ACT
-# http://? - no online source found
+# [no online source found]
#
# * Yukon Daylight Saving Time, YOIC 1987/56
# https://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
@@ -2372,7 +2393,7 @@
Rule NT_YK 1980 1986 - Apr lastSun 2:00 1:00 D
Rule NT_YK 1980 2006 - Oct lastSun 2:00 0 S
Rule NT_YK 1987 2006 - Apr Sun>=1 2:00 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# aka Panniqtuuq
Zone America/Pangnirtung 0 - -00 1921 # trading post est.
-4:00 NT_YK A%sT 1995 Apr Sun>=1 2:00
@@ -2519,7 +2540,7 @@
# From Paul Eggert (2001-03-03):
#
-# http://www.latimes.com/news/nation/20010303/t000018766.html
+# https://www.latimes.com/archives/la-xpm-2001-mar-03-mn-32561-story.html
# James F. Smith writes in today's LA Times
# * Sonora will continue to observe standard time.
# * Last week Mexico City's mayor Andrés Manuel López Obrador decreed that
@@ -2646,7 +2667,7 @@
Rule Mexico 2001 only - Sep lastSun 2:00 0 S
Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
# Quintana Roo; represented by Cancún
Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
-6:00 - CST 1981 Dec 23
@@ -2839,7 +2860,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Nassau -5:09:30 - LMT 1912 Mar 2
-5:00 Bahamas E%sT 1976
-5:00 US E%sT
@@ -2854,7 +2875,7 @@
Rule Barb 1978 1980 - Apr Sun>=15 2:00 1:00 D
Rule Barb 1979 only - Sep 30 2:00 0 S
Rule Barb 1980 only - Sep 25 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Barbados -3:58:29 - LMT 1924 # Bridgetown
-3:58:29 - BMT 1932 # Bridgetown Mean Time
-4:00 Barb A%sT
@@ -2868,7 +2889,7 @@
Rule Belize 1974 only - Feb 9 0:00 0 CST
Rule Belize 1982 only - Dec 18 0:00 1:00 CDT
Rule Belize 1983 only - Feb 12 0:00 0 CST
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Belize -5:52:48 - LMT 1912 Apr
-6:00 Belize %s
@@ -2885,7 +2906,7 @@
# Friday, the same thing will happen in Bermuda.
# http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 - AST 1974 Apr 28 2:00
-4:00 Canada A%sT 1976
@@ -2907,7 +2928,7 @@
Rule CR 1991 only - Jul 1 0:00 0 S
Rule CR 1992 only - Mar 15 0:00 0 S
# There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José
-5:36:13 - SJMT 1921 Jan 15 # San José Mean Time
-6:00 CR C%sT
@@ -3113,7 +3134,7 @@
Rule Cuba 2012 max - Nov Sun>=1 0:00s 0 S
Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
-5:29:36 - HMT 1925 Jul 19 12:00 # Havana MT
-5:00 Cuba C%sT
@@ -3148,7 +3169,7 @@
Rule DR 1970 only - Feb 21 0:00 0 EST
Rule DR 1971 only - Jan 20 0:00 0 EST
Rule DR 1972 1974 - Jan 21 0:00 0 EST
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Santo_Domingo -4:39:36 - LMT 1890
-4:40 - SDMT 1933 Apr 1 12:00 # S. Dom. MT
-5:00 DR %s 1974 Oct 27
@@ -3163,7 +3184,7 @@
Rule Salv 1987 1988 - Sep lastSun 0:00 0 S
# There are too many San Salvadors elsewhere, so use America/El_Salvador
# instead of America/San_Salvador.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador
-6:00 Salv C%sT
@@ -3196,7 +3217,7 @@
Rule Guat 1991 only - Sep 7 0:00 0 S
Rule Guat 2006 only - Apr 30 0:00 1:00 D
Rule Guat 2006 only - Oct 1 0:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Guatemala -6:02:04 - LMT 1918 Oct 5
-6:00 Guat C%sT
@@ -3282,7 +3303,7 @@
Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S
Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D
Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
-5:00 Haiti E%sT
@@ -3321,7 +3342,7 @@
Rule Hond 1987 1988 - Sep lastSun 0:00 0 S
Rule Hond 2006 only - May Sun>=1 0:00 1:00 D
Rule Hond 2006 only - Aug Mon>=1 0:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Tegucigalpa -5:48:52 - LMT 1921 Apr
-6:00 Hond C%sT
#
@@ -3342,7 +3363,7 @@
# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Jamaica -5:07:10 - LMT 1890 # Kingston
-5:07:10 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1974
@@ -3350,7 +3371,7 @@
-5:00 - EST
# Martinique
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France
-4:04:20 - FFMT 1911 May # Fort-de-France MT
-4:00 - AST 1980 Apr 6
@@ -3414,7 +3435,7 @@
Rule Nic 2005 only - Oct Sun>=1 0:00 0 S
Rule Nic 2006 only - Apr 30 2:00 1:00 D
Rule Nic 2006 only - Oct Sun>=1 1:00 0 S
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Managua -5:45:08 - LMT 1890
-5:45:12 - MMT 1934 Jun 23 # Managua Mean Time?
-6:00 - CST 1973 May
@@ -3426,7 +3447,7 @@
-6:00 Nic C%sT
# Panama
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
@@ -3434,7 +3455,7 @@
# Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
-4:00 US A%sT 1946
@@ -3446,7 +3467,7 @@
# St Pierre and Miquelon
# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
-4:00 - AST 1980 May
-3:00 - -03 1987
@@ -3492,7 +3513,7 @@
# by March 2018 for TCI. Magnetic Media. 2017-08-25.
# http://magneticmediatv.com/2017/08/time-change-back-by-march-2018-for-tci/
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
-5:07:10 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1979
--- a/make/data/tzdata/pacificnew Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/pacificnew Thu Aug 08 17:27:17 2019 -0400
@@ -44,7 +44,7 @@
## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
+# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
## -8:00 Twilite P%sT
--- a/make/data/tzdata/southamerica Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/southamerica Thu Aug 08 17:27:17 2019 -0400
@@ -419,7 +419,7 @@
# plus is that this silences a zic complaint that there's no POSIX TZ
# setting for timestamps past 2038.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
#
# Buenos Aires (BA), Capital Federal (CF),
Zone America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 Oct 31
@@ -600,7 +600,7 @@
Link America/Curacao America/Aruba
# Bolivia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/La_Paz -4:32:36 - LMT 1890
-4:32:36 - CMT 1931 Oct 15 # Calamarca MT
-4:32:36 1:00 BST 1932 Mar 21 # Bolivia ST
@@ -943,14 +943,13 @@
# removed Tocantins.
Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 -
Rule Brazil 2015 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 -
+Rule Brazil 2016 2019 - Feb Sun>=15 0:00 0 -
# From Steffen Thorsen (2017-12-18):
# According to many media sources, next year's DST start in Brazil will move to
-# the first Sunday of November, and it will stay like that for the years after.
+# the first Sunday of November
# ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
# From Steffen Thorsen (2017-12-20):
# http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
-#
# From Fábio Gomes (2018-10-04):
# The Brazilian president just announced a new change on this year DST.
# It was scheduled to start on November 4th and it was changed to November 18th.
@@ -958,22 +957,21 @@
# The Brazilian government just announced that the change in DST was
# canceled.... Maybe the president Michel Temer also woke up one hour
# earlier today. :)
-Rule Brazil 2018 max - Nov Sun>=1 0:00 1:00 -
-Rule Brazil 2023 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2026 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2027 2033 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2034 only - Feb Sun>=22 0:00 0 -
-Rule Brazil 2035 2036 - Feb Sun>=15 0:00 0 -
-Rule Brazil 2037 only - Feb Sun>=22 0:00 0 -
-# From Arthur David Olson (2008-09-29):
-# The next is wrong in some years but is better than nothing.
-Rule Brazil 2038 max - Feb Sun>=15 0:00 0 -
+Rule Brazil 2018 only - Nov Sun>=1 0:00 1:00 -
+# The last ruleset listed above says that the following states observed DST:
+# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
+#
+# From Steffen Thorsen (2019-04-05):
+# According to multiple sources the Brazilian president wants to get rid of DST.
+# https://gmconline.com.br/noticias/politica/bolsonaro-horario-de-verao-deve-acabar-este-ano
+# https://g1.globo.com/economia/noticia/2019/04/05/governo-anuncia-fim-do-horario-de-verao.ghtml
+# From Marcus Diniz (2019-04-25):
+# Brazil no longer has DST changes - decree signed today
+# https://g1.globo.com/politica/noticia/2019/04/25/bolsonaro-assina-decreto-que-acaba-com-o-horario-de-verao.ghtml
+# From Daniel Soares de Oliveira (2019-04-26):
+# http://www.planalto.gov.br/ccivil_03/_Ato2019-2022/2019/Decreto/D9772.htm
-# The latest ruleset listed above says that the following states observe DST:
-# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
#
# Fernando de Noronha (administratively part of PE)
Zone America/Noronha -2:09:40 - LMT 1914
@@ -1281,6 +1279,8 @@
# https://twitter.com/MinEnergia/status/1029009354001973248
# "We will keep the new time policy unchanged for at least the next 4 years."
# So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
+# From Juan Correa (2019-02-04):
+# http://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
@@ -1321,7 +1321,7 @@
Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
# (1996-09) says 1998-03-08. Ignore these.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Santiago -4:42:46 - LMT 1890
-4:42:46 - SMT 1910 Jan 10 # Santiago Mean Time
-5:00 - -05 1916 Jul 1
@@ -1370,7 +1370,7 @@
# Palmer has followed Chile. Prior to that, before the Falklands War,
# Palmer used to be supplied from Argentina.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Antarctica/Palmer 0 - -00 1965
-4:00 Arg -04/-03 1969 Oct 5
-3:00 Arg -03/-02 1982 May
@@ -1385,7 +1385,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule CO 1992 only - May 3 0:00 1:00 -
Rule CO 1993 only - Apr 4 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Bogota -4:56:16 - LMT 1884 Mar 13
-4:56:16 - BMT 1914 Nov 23 # Bogotá Mean Time
-5:00 CO -05/-04
@@ -1410,7 +1410,7 @@
# Netherlands as Kingdom Islands. This won't affect their time zones
# though, as far as we know.
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
-4:30 - -0430 1965
-4:00 - AST
@@ -1446,7 +1446,7 @@
Rule Ecuador 1992 only - Nov 28 0:00 1:00 -
Rule Ecuador 1993 only - Feb 5 0:00 0 -
#
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Guayaquil -5:19:20 - LMT 1890
-5:14:00 - QMT 1931 # Quito Mean Time
-5:00 Ecuador -05/-04
@@ -1549,7 +1549,7 @@
Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 -
Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 -
Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/Stanley -3:51:24 - LMT 1890
-3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time
-4:00 Falk -04/-03 1983 May
@@ -1558,13 +1558,13 @@
-3:00 - -03
# French Guiana
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Cayenne -3:29:20 - LMT 1911 Jul
-4:00 - -04 1967 Oct
-3:00 - -03
# Guyana
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Guyana -3:52:40 - LMT 1915 Mar # Georgetown
-3:45 - -0345 1975 Jul 31
-3:00 - -03 1991
@@ -1658,7 +1658,7 @@
# http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf
Rule Para 2013 max - Mar Sun>=22 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Asuncion -3:50:40 - LMT 1890
-3:50:40 - AMT 1931 Oct 10 # Asunción Mean Time
-4:00 - -04 1972 Oct
@@ -1687,13 +1687,13 @@
# IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
Rule Peru 1994 only - Jan 1 0:00 1:00 -
Rule Peru 1994 only - Apr 1 0:00 0 -
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Lima -5:08:12 - LMT 1890
-5:08:36 - LMT 1908 Jul 28 # Lima Mean Time?
-5:00 Peru -05/-04
# South Georgia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Atlantic/South_Georgia -2:26:08 - LMT 1890 # Grytviken
-2:00 - -02
@@ -1701,7 +1701,7 @@
# uninhabited; scientific personnel have wintered
# Suriname
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Paramaribo -3:40:40 - LMT 1911
-3:40:52 - PMT 1935 # Paramaribo Mean Time
-3:40:36 - PMT 1945 Oct # The capital moved?
@@ -1709,7 +1709,7 @@
-3:00 - -03
# Trinidad and Tobago
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
-4:00 - AST
@@ -1980,7 +1980,7 @@
# ... published in the official Gazette [2016-04-18], here:
# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone America/Caracas -4:27:44 - LMT 1890
-4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
-4:30 - -0430 1965 Jan 1 0:00
--- a/make/data/tzdata/systemv Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/systemv Thu Aug 08 17:27:17 2019 -0400
@@ -46,7 +46,7 @@
Rule SystemV 1976 max - Apr lastSun 2:00 1:00 D
Rule SystemV 1976 max - Oct lastSun 2:00 0 S
-# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
+# Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
## Zone SystemV/AST4ADT -4:00 SystemV A%sT
## Zone SystemV/EST5EDT -5:00 SystemV E%sT
## Zone SystemV/CST6CDT -6:00 SystemV C%sT
--- a/make/data/tzdata/zone.tab Thu Aug 08 17:23:13 2019 -0400
+++ b/make/data/tzdata/zone.tab Thu Aug 08 17:27:17 2019 -0400
@@ -355,7 +355,10 @@
RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
-RU +4457+03406 Europe/Simferopol MSK+00 - Crimea
+# The obsolescent zone.tab format cannot represent Europe/Simferopol well.
+# Put it in RU section and list as UA. See "territorial claims" above.
+# Programs should use zone1970.tab instead; see above.
+UA +4457+03406 Europe/Simferopol MSK+00 - Crimea
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan
RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd
--- a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java Thu Aug 08 17:23:13 2019 -0400
+++ b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java Thu Aug 08 17:27:17 2019 -0400
@@ -50,7 +50,8 @@
private final static String[] NUMBER_PATTERN_KEYS = {
"NumberPatterns/decimal",
"NumberPatterns/currency",
- "NumberPatterns/percent"
+ "NumberPatterns/percent",
+ "NumberPatterns/accounting"
};
private final static String[] COMPACT_NUMBER_PATTERN_KEYS = {
@@ -222,8 +223,12 @@
if (value == null) {
value = (String) parentsMap.remove(key);
}
- if (value.length() == 0) {
- CLDRConverter.warning("empty pattern for " + key);
+ if (value == null || value.isEmpty()) {
+ if (!key.endsWith("accounting")) {
+ // print warning unless it is for "accounting",
+ // which may be missing.
+ CLDRConverter.warning("empty pattern for " + key);
+ }
}
numberPatterns[i] = value;
}
--- a/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java Thu Aug 08 17:23:13 2019 -0400
+++ b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -596,19 +596,24 @@
}
break;
case "currencyFormat":
- // for FormatData
- // copy string for later assembly into NumberPatterns
- if (attributes.getValue("type").equals("standard")) {
- pushStringEntry(qName, attributes, "NumberPatterns/currency");
- } else {
- pushIgnoredContainer(qName);
+ {
+ // for FormatData
+ // copy string for later assembly into NumberPatterns
+ String cfStyle = attributes.getValue("type");
+ if (cfStyle.equals("standard")) {
+ pushStringEntry(qName, attributes, "NumberPatterns/currency");
+ } else if (cfStyle.equals("accounting")) {
+ pushStringEntry(qName, attributes, "NumberPatterns/accounting");
+ } else {
+ pushIgnoredContainer(qName);
+ }
}
break;
case "percentFormat":
// for FormatData
// copy string for later assembly into NumberPatterns
if (attributes.getValue("type").equals("standard")) {
- pushStringEntry(qName, attributes, "NumberPatterns/percent");
+ pushStringEntry(qName, attributes, "NumberPatterns/percent");
} else {
pushIgnoredContainer(qName);
}
--- a/make/launcher/Launcher-jdk.aot.gmk Thu Aug 08 17:23:13 2019 -0400
+++ b/make/launcher/Launcher-jdk.aot.gmk Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -46,7 +46,7 @@
--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=$(call CommaList, jdk.internal.vm.compiler jdk.aot) \
--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=$(call CommaList, jdk.internal.vm.compiler jdk.aot) \
--add-exports=jdk.internal.vm.ci/jdk.vm.ci.sparc=$(call CommaList, jdk.internal.vm.compiler jdk.aot) \
- -XX:+UseAOT \
+ -XX:+UnlockExperimentalVMOptions -XX:+UseAOT \
-XX:+CalculateClassFingerprint \
-Djvmci.UseProfilingInformation=false \
-Dgraal.UseExceptionProbability=false \
--- a/make/lib/Awt2dLibraries.gmk Thu Aug 08 17:23:13 2019 -0400
+++ b/make/lib/Awt2dLibraries.gmk Thu Aug 08 17:27:17 2019 -0400
@@ -786,7 +786,8 @@
LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
endif
- LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
+ LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
+ -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
ifeq ($(call isTargetOs, linux), true)
ifeq ($(call isTargetCpuArch, ppc), true)
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -259,29 +259,6 @@
// generate code to handle arguments
iterate(fingerprint);
- // set the call format
- // n.b. allow extra 1 for the JNI_Env in c_rarg0
- unsigned int call_format = ((_num_int_args + 1) << 6) | (_num_fp_args << 2);
-
- switch (method()->result_type()) {
- case T_VOID:
- call_format |= MacroAssembler::ret_type_void;
- break;
- case T_FLOAT:
- call_format |= MacroAssembler::ret_type_float;
- break;
- case T_DOUBLE:
- call_format |= MacroAssembler::ret_type_double;
- break;
- default:
- call_format |= MacroAssembler::ret_type_integral;
- break;
- }
-
- // // store the call format in the method
- // __ movw(r0, call_format);
- // __ str(r0, Address(rmethod, Method::call_format_offset()));
-
// return result handler
__ lea(r0, ExternalAddress(Interpreter::result_handler(method()->result_type())));
__ ret(lr);
@@ -392,28 +369,6 @@
_num_fp_args = 0;
}
- // n.b. allow extra 1 for the JNI_Env in c_rarg0
- unsigned int get_call_format()
- {
- unsigned int call_format = ((_num_int_args + 1) << 6) | (_num_fp_args << 2);
-
- switch (method()->result_type()) {
- case T_VOID:
- call_format |= MacroAssembler::ret_type_void;
- break;
- case T_FLOAT:
- call_format |= MacroAssembler::ret_type_float;
- break;
- case T_DOUBLE:
- call_format |= MacroAssembler::ret_type_double;
- break;
- default:
- call_format |= MacroAssembler::ret_type_integral;
- break;
- }
-
- return call_format;
- }
};
@@ -429,9 +384,6 @@
SlowSignatureHandler ssh(m, (address)from, to);
ssh.iterate(UCONST64(-1));
- // // set the call format
- // method->set_call_format(ssh.get_call_format());
-
// return result handler
return Interpreter::result_handler(m->result_type());
JRT_END
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -34,7 +34,6 @@
class SignatureHandlerGenerator: public NativeSignatureIterator {
private:
MacroAssembler* _masm;
- unsigned int _call_format;
unsigned int _num_fp_args;
unsigned int _num_int_args;
int _stack_offset;
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -1182,8 +1182,6 @@
//
public:
- // enum used for aarch64--x86 linkage to define return type of x86 function
- enum ret_type { ret_type_void, ret_type_integral, ret_type_float, ret_type_double};
void ldr_constant(Register dest, const Address &const_addr) {
if (NearCpool) {
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -502,7 +502,7 @@
// only occur on method entry so emit it only for vtos with step 0.
if ((EnableJVMCI || UseAOT) && state == vtos && step == 0) {
Label L;
- __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
+ __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset()));
__ cbz(rscratch1, L);
// Clear flag.
__ strb(zr, Address(rthread, JavaThread::pending_monitorenter_offset()));
@@ -513,7 +513,7 @@
#ifdef ASSERT
if (EnableJVMCI) {
Label L;
- __ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
+ __ ldrb(rscratch1, Address(rthread, JavaThread::pending_monitorenter_offset()));
__ cbz(rscratch1, L);
__ stop("unexpected pending monitor in deopt entry");
__ bind(L);
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -250,9 +250,6 @@
(offset_of(frame::top_ijava_frame_abi, _component))
struct ijava_state {
-#ifdef ASSERT
- uint64_t ijava_reserved; // Used for assertion.
-#endif
uint64_t method;
uint64_t mirror;
uint64_t locals;
@@ -409,12 +406,6 @@
// The size of a cInterpreter object.
static inline int interpreter_frame_cinterpreterstate_size_in_bytes();
- private:
-
- ConstantPoolCache** interpreter_frame_cpoolcache_addr() const;
-
- public:
-
// Additional interface for entry frames:
inline entry_frame_locals* get_entry_frame_locals() const {
return (entry_frame_locals*) (((address) fp()) - entry_frame_locals_size);
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -130,19 +130,22 @@
inline intptr_t** frame::interpreter_frame_locals_addr() const {
return (intptr_t**) &(get_ijava_state()->locals);
}
+
inline intptr_t* frame::interpreter_frame_bcp_addr() const {
return (intptr_t*) &(get_ijava_state()->bcp);
}
+
inline intptr_t* frame::interpreter_frame_mdp_addr() const {
return (intptr_t*) &(get_ijava_state()->mdx);
}
+
// Pointer beyond the "oldest/deepest" BasicObjectLock on stack.
inline BasicObjectLock* frame::interpreter_frame_monitor_end() const {
- return (BasicObjectLock *) get_ijava_state()->monitors;
+ return (BasicObjectLock*) get_ijava_state()->monitors;
}
inline BasicObjectLock* frame::interpreter_frame_monitor_begin() const {
- return (BasicObjectLock *) get_ijava_state();
+ return (BasicObjectLock*) get_ijava_state();
}
// Return register stack slot addr at which currently interpreted method is found.
@@ -154,23 +157,21 @@
return (oop*) &(get_ijava_state()->mirror);
}
-inline ConstantPoolCache** frame::interpreter_frame_cpoolcache_addr() const {
- return (ConstantPoolCache**) &(get_ijava_state()->cpoolCache);
-}
inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
return (ConstantPoolCache**) &(get_ijava_state()->cpoolCache);
}
inline oop* frame::interpreter_frame_temp_oop_addr() const {
- return (oop *) &(get_ijava_state()->oop_tmp);
+ return (oop*) &(get_ijava_state()->oop_tmp);
}
+
inline intptr_t* frame::interpreter_frame_esp() const {
return (intptr_t*) get_ijava_state()->esp;
}
// Convenient setters
inline void frame::interpreter_frame_set_monitor_end(BasicObjectLock* end) { get_ijava_state()->monitors = (intptr_t) end;}
-inline void frame::interpreter_frame_set_cpcache(ConstantPoolCache* cp) { *frame::interpreter_frame_cpoolcache_addr() = cp; }
+inline void frame::interpreter_frame_set_cpcache(ConstantPoolCache* cp) { *interpreter_frame_cache_addr() = cp; }
inline void frame::interpreter_frame_set_esp(intptr_t* esp) { get_ijava_state()->esp = (intptr_t) esp; }
inline void frame::interpreter_frame_set_top_frame_sp(intptr_t* top_frame_sp) { get_ijava_state()->top_frame_sp = (intptr_t) top_frame_sp; }
inline void frame::interpreter_frame_set_sender_sp(intptr_t* sender_sp) { get_ijava_state()->sender_sp = (intptr_t) sender_sp; }
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -116,3 +116,9 @@
__ verify_oop(value);
__ bind(done);
}
+
+void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register dst, Register jni_env,
+ Register obj, Register tmp, Label& slowpath) {
+ __ clrrdi(dst, obj, JNIHandles::weak_tag_size);
+ __ ld(dst, 0, dst); // Resolve (untagged) jobject.
+}
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -49,6 +49,9 @@
virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2, bool needs_frame);
+ virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register dst, Register jni_env,
+ Register obj, Register tmp, Label& slowpath);
+
virtual void barrier_stubs_init() {}
};
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -768,16 +768,6 @@
ld(Rscratch1, 0, R1_SP); // *SP
ld(Rsender_sp, _ijava_state_neg(sender_sp), Rscratch1); // top_frame_sp
ld(Rscratch2, 0, Rscratch1); // **SP
-#ifdef ASSERT
- {
- Label Lok;
- ld(R0, _ijava_state_neg(ijava_reserved), Rscratch1);
- cmpdi(CCR0, R0, 0x5afe);
- beq(CCR0, Lok);
- stop("frame corrupted (remove activation)", 0x5afe);
- bind(Lok);
- }
-#endif
if (return_pc!=noreg) {
ld(return_pc, _abi(lr), Rscratch1); // LR
}
@@ -2263,14 +2253,6 @@
stop("frame too small (restore istate)", 0x5432);
bind(Lok);
}
- {
- Label Lok;
- ld(R0, _ijava_state_neg(ijava_reserved), scratch);
- cmpdi(CCR0, R0, 0x5afe);
- beq(CCR0, Lok);
- stop("frame corrupted (restore istate)", 0x5afe);
- bind(Lok);
- }
#endif
}
--- a/src/hotspot/cpu/ppc/jniFastGetField_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/jniFastGetField_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019 SAP SE. 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
@@ -24,16 +24,138 @@
*/
#include "precompiled.hpp"
-#include "asm/assembler.inline.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
#include "memory/resourceArea.hpp"
#include "prims/jniFastGetField.hpp"
#include "prims/jvm_misc.hpp"
#include "runtime/safepoint.hpp"
+#define __ masm->
+
+#define BUFFER_SIZE 48*BytesPerInstWord
+
+
+// Common register usage:
+// R3/F0: result
+// R3_ARG1: jni env
+// R4_ARG2: obj
+// R5_ARG3: jfield id
address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
- // We don't have fast jni accessors.
- return (address) -1;
+ const char *name;
+ switch (type) {
+ case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
+ case T_BYTE: name = "jni_fast_GetByteField"; break;
+ case T_CHAR: name = "jni_fast_GetCharField"; break;
+ case T_SHORT: name = "jni_fast_GetShortField"; break;
+ case T_INT: name = "jni_fast_GetIntField"; break;
+ case T_LONG: name = "jni_fast_GetLongField"; break;
+ case T_FLOAT: name = "jni_fast_GetFloatField"; break;
+ case T_DOUBLE: name = "jni_fast_GetDoubleField"; break;
+ default: ShouldNotReachHere();
+ name = NULL; // unreachable
+ }
+ ResourceMark rm;
+ BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE);
+ CodeBuffer cbuf(blob);
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ address fast_entry = __ function_entry();
+
+ Label slow;
+
+ const Register Rcounter_addr = R6_ARG4,
+ Rcounter = R7_ARG5,
+ Robj = R8_ARG6,
+ Rtmp = R9_ARG7;
+ const int counter_offs = __ load_const_optimized(Rcounter_addr,
+ SafepointSynchronize::safepoint_counter_addr(),
+ R0, true);
+
+ __ ld(Rcounter, counter_offs, Rcounter_addr);
+ __ andi_(R0, Rcounter, 1);
+ __ bne(CCR0, slow);
+
+ if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
+ // Field may be volatile.
+ __ fence();
+ } else {
+ // Using acquire to order wrt. JVMTI check and load of result.
+ __ isync(); // order wrt. to following load(s)
+ }
+
+ if (JvmtiExport::can_post_field_access()) {
+ // Check to see if a field access watch has been set before we
+ // take the fast path.
+ int fac_offs = __ load_const_optimized(Rtmp, JvmtiExport::get_field_access_count_addr(),
+ R0, true);
+ __ lwa(Rtmp, fac_offs, Rtmp);
+ __ cmpwi(CCR0, Rtmp, 0);
+ __ bne(CCR0, slow);
+ }
+
+ BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+ bs->try_resolve_jobject_in_native(masm, Robj, R3_ARG1, R4_ARG2, Rtmp, slow);
+
+ __ srwi(Rtmp, R5_ARG3, 2); // offset
+
+ assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
+ speculative_load_pclist[count] = __ pc(); // Used by the segfault handler
+ bool is_fp = false;
+ switch (type) {
+ case T_BOOLEAN: __ lbzx(Rtmp, Rtmp, Robj); break;
+ case T_BYTE: __ lbzx(Rtmp, Rtmp, Robj); __ extsb(Rtmp, Rtmp); break;
+ case T_CHAR: __ lhzx(Rtmp, Rtmp, Robj); break;
+ case T_SHORT: __ lhax(Rtmp, Rtmp, Robj); break;
+ case T_INT: __ lwax(Rtmp, Rtmp, Robj); break;
+ case T_LONG: __ ldx( Rtmp, Rtmp, Robj); break;
+ case T_FLOAT: __ lfsx(F1_RET, Rtmp, Robj); is_fp = true; break;
+ case T_DOUBLE: __ lfdx(F1_RET, Rtmp, Robj); is_fp = true; break;
+ default: ShouldNotReachHere();
+ }
+
+ // Order preceding load(s) wrt. succeeding check (LoadStore for volatile field).
+ if (is_fp) {
+ Label next;
+ __ fcmpu(CCR0, F1_RET, F1_RET);
+ __ bne(CCR0, next);
+ __ bind(next);
+ } else {
+ __ twi_0(Rtmp);
+ }
+ __ isync();
+
+ __ ld(R0, counter_offs, Rcounter_addr);
+ __ cmpd(CCR0, R0, Rcounter);
+ __ bne(CCR0, slow);
+
+ if (!is_fp) {
+ __ mr(R3_RET, Rtmp);
+ }
+ __ blr();
+
+ slowcase_entry_pclist[count++] = __ pc();
+ __ bind(slow);
+ address slow_case_addr;
+ switch (type) {
+ case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
+ case T_BYTE: slow_case_addr = jni_GetByteField_addr(); break;
+ case T_CHAR: slow_case_addr = jni_GetCharField_addr(); break;
+ case T_SHORT: slow_case_addr = jni_GetShortField_addr(); break;
+ case T_INT: slow_case_addr = jni_GetIntField_addr(); break;
+ case T_LONG: slow_case_addr = jni_GetLongField_addr(); break;
+ case T_FLOAT: slow_case_addr = jni_GetFloatField_addr(); break;
+ case T_DOUBLE: slow_case_addr = jni_GetDoubleField_addr(); break;
+ default: ShouldNotReachHere();
+ slow_case_addr = NULL; // unreachable
+ }
+ __ load_const_optimized(R12, slow_case_addr, R0);
+ __ call_c_and_return_to_caller(R12); // tail call
+
+ __ flush();
+
+ return fast_entry;
}
address JNI_FastGetField::generate_fast_get_boolean_field() {
@@ -57,19 +179,13 @@
}
address JNI_FastGetField::generate_fast_get_long_field() {
- // We don't have fast jni accessors.
- return (address) -1;
-}
-
-address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
- // We don't have fast jni accessors.
- return (address) -1;
+ return generate_fast_get_int_field0(T_LONG);
}
address JNI_FastGetField::generate_fast_get_float_field() {
- return generate_fast_get_float_field0(T_FLOAT);
+ return generate_fast_get_int_field0(T_FLOAT);
}
address JNI_FastGetField::generate_fast_get_double_field() {
- return generate_fast_get_float_field0(T_DOUBLE);
+ return generate_fast_get_int_field0(T_DOUBLE);
}
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -2719,10 +2719,6 @@
__ ld(frame_size_reg, 0, frame_sizes_reg);
__ std(pc_reg, _abi(lr), R1_SP);
__ push_frame(frame_size_reg, R0/*tmp*/);
-#ifdef ASSERT
- __ load_const_optimized(pc_reg, 0x5afe);
- __ std(pc_reg, _ijava_state_neg(ijava_reserved), R1_SP);
-#endif
__ std(R1_SP, _ijava_state_neg(sender_sp), R1_SP);
__ addi(number_of_frames_reg, number_of_frames_reg, -1);
__ addi(frame_sizes_reg, frame_sizes_reg, wordSize);
@@ -2795,10 +2791,6 @@
__ std(R12_scratch2, _abi(lr), R1_SP);
// Initialize initial_caller_sp.
-#ifdef ASSERT
- __ load_const_optimized(pc_reg, 0x5afe);
- __ std(pc_reg, _ijava_state_neg(ijava_reserved), R1_SP);
-#endif
__ std(frame_size_reg, _ijava_state_neg(sender_sp), R1_SP);
#ifdef ASSERT
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1050,17 +1050,14 @@
// Get mirror and store it in the frame as GC root for this Method*.
__ load_mirror_from_const_method(R12_scratch2, Rconst_method);
- __ addi(R26_monitor, R1_SP, - frame::ijava_state_size);
- __ addi(R15_esp, R26_monitor, - Interpreter::stackElementSize);
+ __ addi(R26_monitor, R1_SP, -frame::ijava_state_size);
+ __ addi(R15_esp, R26_monitor, -Interpreter::stackElementSize);
// Store values.
- // R15_esp, R14_bcp, R26_monitor, R28_mdx are saved at java calls
- // in InterpreterMacroAssembler::call_from_interpreter.
__ std(R19_method, _ijava_state_neg(method), R1_SP);
__ std(R12_scratch2, _ijava_state_neg(mirror), R1_SP);
- __ std(R21_sender_SP, _ijava_state_neg(sender_sp), R1_SP);
+ __ std(R18_locals, _ijava_state_neg(locals), R1_SP);
__ std(R27_constPoolCache, _ijava_state_neg(cpoolCache), R1_SP);
- __ std(R18_locals, _ijava_state_neg(locals), R1_SP);
// Note: esp, bcp, monitor, mdx live in registers. Hence, the correct version can only
// be found in the frame after save_interpreter_state is done. This is always true
@@ -1068,31 +1065,20 @@
// because e.g. frame::interpreter_frame_bcp() will not access the correct value
// (Enhanced Stack Trace).
// The signal handler does not save the interpreter state into the frame.
+
+ // We have to initialize some of these frame slots for native calls (accessed by GC).
+ // Also initialize them for non-native calls for better tool support (even though
+ // you may not get the most recent version as described above).
__ li(R0, 0);
-#ifdef ASSERT
- // Fill remaining slots with constants.
- __ load_const_optimized(R11_scratch1, 0x5afe);
- __ load_const_optimized(R12_scratch2, 0xdead);
-#endif
- // We have to initialize some frame slots for native calls (accessed by GC).
- if (native_call) {
- __ std(R26_monitor, _ijava_state_neg(monitors), R1_SP);
- __ std(R14_bcp, _ijava_state_neg(bcp), R1_SP);
- if (ProfileInterpreter) { __ std(R28_mdx, _ijava_state_neg(mdx), R1_SP); }
- }
-#ifdef ASSERT
- else {
- __ std(R12_scratch2, _ijava_state_neg(monitors), R1_SP);
- __ std(R12_scratch2, _ijava_state_neg(bcp), R1_SP);
- __ std(R12_scratch2, _ijava_state_neg(mdx), R1_SP);
- }
- __ std(R11_scratch1, _ijava_state_neg(ijava_reserved), R1_SP);
- __ std(R12_scratch2, _ijava_state_neg(esp), R1_SP);
- __ std(R12_scratch2, _ijava_state_neg(lresult), R1_SP);
- __ std(R12_scratch2, _ijava_state_neg(fresult), R1_SP);
-#endif
+ __ std(R26_monitor, _ijava_state_neg(monitors), R1_SP);
+ __ std(R14_bcp, _ijava_state_neg(bcp), R1_SP);
+ if (ProfileInterpreter) { __ std(R28_mdx, _ijava_state_neg(mdx), R1_SP); }
+ __ std(R15_esp, _ijava_state_neg(esp), R1_SP);
+ __ std(R0, _ijava_state_neg(oop_tmp), R1_SP); // only used for native_call
+
+ // Store sender's SP and this frame's top SP.
__ subf(R12_scratch2, top_frame_size, R1_SP);
- __ std(R0, _ijava_state_neg(oop_tmp), R1_SP);
+ __ std(R21_sender_SP, _ijava_state_neg(sender_sp), R1_SP);
__ std(R12_scratch2, _ijava_state_neg(top_frame_sp), R1_SP);
// Push top frame.
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -111,3 +111,9 @@
__ verify_oop(value);
__ bind(Ldone);
}
+
+void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+ Register obj, Register tmp, Label& slowpath) {
+ __ z_nill(obj, ~JNIHandles::weak_tag_mask);
+ __ z_lg(obj, 0, obj); // Resolve (untagged) jobject.
+}
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -46,6 +46,9 @@
virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2);
+ virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
+ Register obj, Register tmp, Label& slowpath);
+
virtual void barrier_stubs_init() {}
};
--- a/src/hotspot/cpu/s390/jniFastGetField_s390.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/cpu/s390/jniFastGetField_s390.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -24,8 +24,13 @@
*/
#include "precompiled.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
+#include "gc/shared/barrierSetAssembler.hpp"
+#include "memory/resourceArea.hpp"
#include "prims/jniFastGetField.hpp"
#include "prims/jvm_misc.hpp"
+#include "runtime/safepoint.hpp"
// TSO ensures that loads are blocking and ordered with respect to
// to earlier loads, so we don't need LoadLoad membars.
@@ -34,9 +39,103 @@
#define BUFFER_SIZE 30*sizeof(jint)
+// Common register usage:
+// Z_RET/Z_FRET: result
+// Z_ARG1: jni env
+// Z_ARG2: obj
+// Z_ARG3: jfield id
+
address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
- // Don't use fast jni accessors.
- return (address) -1;
+ const char *name;
+ switch (type) {
+ case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
+ case T_BYTE: name = "jni_fast_GetByteField"; break;
+ case T_CHAR: name = "jni_fast_GetCharField"; break;
+ case T_SHORT: name = "jni_fast_GetShortField"; break;
+ case T_INT: name = "jni_fast_GetIntField"; break;
+ case T_LONG: name = "jni_fast_GetLongField"; break;
+ case T_FLOAT: name = "jni_fast_GetFloatField"; break;
+ case T_DOUBLE: name = "jni_fast_GetDoubleField"; break;
+ default: ShouldNotReachHere();
+ name = NULL; // unreachable
+ }
+ ResourceMark rm;
+ BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE);
+ CodeBuffer cbuf(blob);
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ address fast_entry = __ pc();
+
+ Label slow;
+
+ // We can only kill the remaining volatile registers.
+ const Register Rcounter = Z_ARG4,
+ Robj = Z_R1_scratch,
+ Rtmp = Z_R0_scratch;
+ __ load_const_optimized(Robj, SafepointSynchronize::safepoint_counter_addr());
+ __ z_lg(Rcounter, Address(Robj));
+ __ z_tmll(Rcounter, 1);
+ __ z_brnaz(slow);
+
+ if (JvmtiExport::can_post_field_access()) {
+ // Check to see if a field access watch has been set before we
+ // take the fast path.
+ __ load_const_optimized(Robj, JvmtiExport::get_field_access_count_addr());
+ __ z_lt(Robj, Address(Robj));
+ __ z_brne(slow);
+ }
+
+ __ z_lgr(Robj, Z_ARG2);
+ BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
+ bs->try_resolve_jobject_in_native(masm, Z_ARG1, Robj, Rtmp, slow);
+
+ __ z_srlg(Rtmp, Z_ARG3, 2); // offset
+ __ z_agr(Robj, Rtmp);
+
+ assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
+ speculative_load_pclist[count] = __ pc(); // Used by the segfault handler
+ bool is_fp = false;
+ switch (type) {
+ case T_BOOLEAN: __ z_llgc(Rtmp, Address(Robj)); break;
+ case T_BYTE: __ z_lgb( Rtmp, Address(Robj)); break;
+ case T_CHAR: __ z_llgh(Rtmp, Address(Robj)); break;
+ case T_SHORT: __ z_lgh( Rtmp, Address(Robj)); break;
+ case T_INT: __ z_lgf( Rtmp, Address(Robj)); break;
+ case T_LONG: __ z_lg( Rtmp, Address(Robj)); break;
+ case T_FLOAT: __ mem2freg_opt(Z_FRET, Address(Robj), false); is_fp = true; break;
+ case T_DOUBLE: __ mem2freg_opt(Z_FRET, Address(Robj), true ); is_fp = true; break;
+ default: ShouldNotReachHere();
+ }
+
+ __ load_const_optimized(Robj, SafepointSynchronize::safepoint_counter_addr());
+ __ z_cg(Rcounter, Address(Robj));
+ __ z_brne(slow);
+
+ if (!is_fp) {
+ __ z_lgr(Z_RET, Rtmp);
+ }
+ __ z_br(Z_R14);
+
+ slowcase_entry_pclist[count++] = __ pc();
+ __ bind(slow);
+ address slow_case_addr;
+ switch (type) {
+ case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
+ case T_BYTE: slow_case_addr = jni_GetByteField_addr(); break;
+ case T_CHAR: slow_case_addr = jni_GetCharField_addr(); break;
+ case T_SHORT: slow_case_addr = jni_GetShortField_addr(); break;
+ case T_INT: slow_case_addr = jni_GetIntField_addr(); break;
+ case T_LONG: slow_case_addr = jni_GetLongField_addr(); break;
+ case T_FLOAT: slow_case_addr = jni_GetFloatField_addr(); break;
+ case T_DOUBLE: slow_case_addr = jni_GetDoubleField_addr(); break;
+ default: ShouldNotReachHere();
+ slow_case_addr = NULL; // unreachable
+ }
+ __ load_const_optimized(Robj, slow_case_addr);
+ __ z_br(Robj); // tail call
+
+ __ flush();
+
+ return fast_entry;
}
address JNI_FastGetField::generate_fast_get_boolean_field() {
@@ -60,19 +159,13 @@
}
address JNI_FastGetField::generate_fast_get_long_field() {
- // Don't use fast jni accessors.
- return (address) -1;
-}
-
-address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
- // Don't use fast jni accessors.
- return (address) -1;
+ return generate_fast_get_int_field0(T_LONG);
}
address JNI_FastGetField::generate_fast_get_float_field() {
- return generate_fast_get_float_field0(T_FLOAT);
+ return generate_fast_get_int_field0(T_FLOAT);
}
address JNI_FastGetField::generate_fast_get_double_field() {
- return generate_fast_get_float_field0(T_DOUBLE);
+ return generate_fast_get_int_field0(T_DOUBLE);
}
--- a/src/hotspot/os/aix/os_aix.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os/aix/os_aix.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1313,6 +1313,8 @@
// for the same architecture as Hotspot is running on.
void *os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+ log_info(os)("attempting shared library load of %s", filename);
+
if (ebuf && ebuflen > 0) {
ebuf[0] = '\0';
ebuf[ebuflen - 1] = '\0';
@@ -1329,6 +1331,7 @@
Events::log(NULL, "Loaded shared library %s", filename);
// Reload dll cache. Don't do this in signal handling.
LoadedLibraries::reload();
+ log_info(os)("shared library load of %s was successful", filename);
return result;
} else {
// error analysis when dlopen fails
@@ -1341,6 +1344,7 @@
filename, ::getenv("LIBPATH"), ::getenv("LD_LIBRARY_PATH"), error_report);
}
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ log_info(os)("shared library load of %s failed, %s", filename, error_report);
}
return NULL;
}
@@ -1661,16 +1665,8 @@
////////////////////////////////////////////////////////////////////////////////
// sun.misc.Signal support
-static volatile jint sigint_count = 0;
-
static void
UserHandler(int sig, void *siginfo, void *context) {
- // 4511530 - sem_post is serialized and handled by the manager thread. When
- // the program is interrupted by Ctrl-C, SIGINT is sent to every thread. We
- // don't want to flood the manager thread with sem_post requests.
- if (sig == SIGINT && Atomic::add(1, &sigint_count) > 1)
- return;
-
// Ctrl-C is pressed during error reporting, likely because the error
// handler fails to abort. Let VM die immediately.
if (sig == SIGINT && VMError::is_error_reported()) {
@@ -1810,7 +1806,6 @@
}
static int check_pending_signals() {
- Atomic::store(0, &sigint_count);
for (;;) {
for (int i = 0; i < NSIG + 1; i++) {
jint n = pending_signals[i];
--- a/src/hotspot/os/bsd/os_bsd.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os/bsd/os_bsd.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1263,10 +1263,13 @@
#ifdef STATIC_BUILD
return os::get_default_process_handle();
#else
+ log_info(os)("attempting shared library load of %s", filename);
+
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
Events::log(NULL, "Loaded shared library %s", filename);
// Successful loading
+ log_info(os)("shared library load of %s was successful", filename);
return result;
}
@@ -1280,6 +1283,7 @@
ebuf[ebuflen-1]='\0';
}
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ log_info(os)("shared library load of %s failed, %s", filename, error_report);
return NULL;
#endif // STATIC_BUILD
@@ -1289,10 +1293,12 @@
#ifdef STATIC_BUILD
return os::get_default_process_handle();
#else
+ log_info(os)("attempting shared library load of %s", filename);
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
Events::log(NULL, "Loaded shared library %s", filename);
// Successful loading
+ log_info(os)("shared library load of %s was successful", filename);
return result;
}
@@ -1308,6 +1314,7 @@
ebuf[ebuflen-1]='\0';
}
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ log_info(os)("shared library load of %s failed, %s", filename, error_report);
int diag_msg_max_length=ebuflen-strlen(ebuf);
char* diag_msg_buf=ebuf+strlen(ebuf);
@@ -1775,16 +1782,7 @@
////////////////////////////////////////////////////////////////////////////////
// sun.misc.Signal support
-static volatile jint sigint_count = 0;
-
static void UserHandler(int sig, void *siginfo, void *context) {
- // 4511530 - sem_post is serialized and handled by the manager thread. When
- // the program is interrupted by Ctrl-C, SIGINT is sent to every thread. We
- // don't want to flood the manager thread with sem_post requests.
- if (sig == SIGINT && Atomic::add(1, &sigint_count) > 1) {
- return;
- }
-
// Ctrl-C is pressed during error reporting, likely because the error
// handler fails to abort. Let VM die immediately.
if (sig == SIGINT && VMError::is_error_reported()) {
@@ -1854,7 +1852,6 @@
}
static int check_pending_signals() {
- Atomic::store(0, &sigint_count);
for (;;) {
for (int i = 0; i < NSIG + 1; i++) {
jint n = pending_signals[i];
--- a/src/hotspot/os/linux/os_linux.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os/linux/os_linux.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1739,6 +1739,8 @@
void * result = NULL;
bool load_attempted = false;
+ log_info(os)("attempting shared library load of %s", filename);
+
// Check whether the library to load might change execution rights
// of the stack. If they are changed, the protection of the stack
// guard pages will be lost. We need a safepoint to fix this.
@@ -1990,8 +1992,10 @@
ebuf[ebuflen-1]='\0';
}
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ log_info(os)("shared library load of %s failed, %s", filename, error_report);
} else {
Events::log(NULL, "Loaded shared library %s", filename);
+ log_info(os)("shared library load of %s was successful", filename);
}
return result;
}
@@ -2676,16 +2680,7 @@
////////////////////////////////////////////////////////////////////////////////
// sun.misc.Signal support
-static volatile jint sigint_count = 0;
-
static void UserHandler(int sig, void *siginfo, void *context) {
- // 4511530 - sem_post is serialized and handled by the manager thread. When
- // the program is interrupted by Ctrl-C, SIGINT is sent to every thread. We
- // don't want to flood the manager thread with sem_post requests.
- if (sig == SIGINT && Atomic::add(1, &sigint_count) > 1) {
- return;
- }
-
// Ctrl-C is pressed during error reporting, likely because the error
// handler fails to abort. Let VM die immediately.
if (sig == SIGINT && VMError::is_error_reported()) {
@@ -2758,7 +2753,6 @@
}
static int check_pending_signals() {
- Atomic::store(0, &sigint_count);
for (;;) {
for (int i = 0; i < NSIG + 1; i++) {
jint n = pending_signals[i];
--- a/src/hotspot/os/solaris/os_solaris.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os/solaris/os_solaris.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1532,10 +1532,13 @@
// same architecture as Hotspot is running on
void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+ log_info(os)("attempting shared library load of %s", filename);
+
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
// Successful loading
Events::log(NULL, "Loaded shared library %s", filename);
+ log_info(os)("shared library load of %s was successful", filename);
return result;
}
@@ -1550,6 +1553,7 @@
}
Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ log_info(os)("shared library load of %s failed, %s", filename, error_report);
int diag_msg_max_length=ebuflen-strlen(ebuf);
char* diag_msg_buf=ebuf+strlen(ebuf);
--- a/src/hotspot/os/windows/os_windows.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os/windows/os_windows.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1365,11 +1365,14 @@
// in case of error it checks if .dll/.so was built for the
// same architecture as Hotspot is running on
void * os::dll_load(const char *name, char *ebuf, int ebuflen) {
+ log_info(os)("attempting shared library load of %s", name);
+
void * result = LoadLibrary(name);
if (result != NULL) {
Events::log(NULL, "Loaded shared library %s", name);
// Recalculate pdb search path if a DLL was loaded successfully.
SymbolEngine::recalc_search_path();
+ log_info(os)("shared library load of %s was successful", name);
return result;
}
DWORD errcode = GetLastError();
@@ -1378,6 +1381,7 @@
lasterror(ebuf, (size_t) ebuflen);
ebuf[ebuflen - 1] = '\0';
Events::log(NULL, "Loading shared library %s failed, error code %lu", name, errcode);
+ log_info(os)("shared library load of %s failed, error code %lu", name, errcode);
if (errcode == ERROR_MOD_NOT_FOUND) {
strncpy(ebuf, "Can't find dependent libraries", ebuflen - 1);
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -477,6 +477,15 @@
return 1;
}
}
+
+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
+ // and the heap gets shrunk before the field access.
+ if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+ address addr = JNI_FastGetField::find_slowcase_pc(pc);
+ if (addr != (address)-1) {
+ stub = addr;
+ }
+ }
}
run_stub:
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -502,6 +502,15 @@
return true;
}
}
+
+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
+ // and the heap gets shrunk before the field access.
+ if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+ address addr = JNI_FastGetField::find_slowcase_pc(pc);
+ if (addr != (address)-1) {
+ stub = addr;
+ }
+ }
}
if (stub != NULL) {
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -479,6 +479,15 @@
return true;
}
}
+
+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
+ // and the heap gets shrunk before the field access.
+ if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+ address addr = JNI_FastGetField::find_slowcase_pc(pc);
+ if (addr != (address)-1) {
+ stub = addr;
+ }
+ }
}
if (stub != NULL) {
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -309,8 +309,7 @@
// unless verifying at a safepoint.
public:
- ClassLoaderDataGraphIterator() : _next(ClassLoaderDataGraph::_head),
- _nsv(true, !SafepointSynchronize::is_at_safepoint()) {
+ ClassLoaderDataGraphIterator() : _next(ClassLoaderDataGraph::_head) {
_thread = Thread::current();
assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
}
--- a/src/hotspot/share/classfile/symbolTable.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/classfile/symbolTable.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -45,10 +45,8 @@
// and not set it too short before we decide to resize,
// to match previous startup behavior
const double PREF_AVG_LIST_LEN = 8.0;
-// 2^17 (131,072) is max size, which is about 6.5 times as large
-// as the previous table size (used to be 20,011),
-// which never resized
-const size_t END_SIZE = 17;
+// 2^24 is max size, like StringTable.
+const size_t END_SIZE = 24;
// If a chain gets to 100 something might be wrong
const size_t REHASH_LEN = 100;
--- a/src/hotspot/share/code/compiledIC.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/code/compiledIC.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -52,8 +52,7 @@
CompiledICLocker::CompiledICLocker(CompiledMethod* method)
: _method(method),
_behaviour(CompiledICProtectionBehaviour::current()),
- _locked(_behaviour->lock(_method)),
- _nsv(true, !SafepointSynchronize::is_at_safepoint()) {
+ _locked(_behaviour->lock(_method)) {
}
CompiledICLocker::~CompiledICLocker() {
--- a/src/hotspot/share/code/nmethod.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/code/nmethod.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1313,7 +1313,7 @@
nmethodLocker nml(this);
methodHandle the_method(method());
// This can be called while the system is already at a safepoint which is ok
- NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+ NoSafepointVerifier nsv;
// during patching, depending on the nmethod state we must notify the GC that
// code has been unloaded, unregistering it. We cannot do this right while
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -6969,7 +6969,7 @@
}
ConcurrentMarkSweepThread::synchronize(true);
- bml->lock();
+ bml->lock_without_safepoint_check();
_collector->startTimer();
}
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -417,7 +417,8 @@
Node* tls = __ thread(); // ThreadLocalStorage
Node* no_base = __ top();
- float unlikely = PROB_UNLIKELY(0.999);
+ float likely = PROB_LIKELY_MAG(3);
+ float unlikely = PROB_UNLIKELY_MAG(3);
Node* young_card = __ ConI((jint)G1CardTable::g1_young_card_val());
Node* dirty_card = __ ConI((jint)G1CardTable::dirty_card_val());
Node* zeroX = __ ConX(0);
@@ -460,17 +461,17 @@
Node* xor_res = __ URShiftX ( __ XorX( cast, __ CastPX(__ ctrl(), val)), __ ConI(HeapRegion::LogOfHRGrainBytes));
// if (xor_res == 0) same region so skip
- __ if_then(xor_res, BoolTest::ne, zeroX); {
+ __ if_then(xor_res, BoolTest::ne, zeroX, likely); {
// No barrier if we are storing a NULL
- __ if_then(val, BoolTest::ne, kit->null(), unlikely); {
+ __ if_then(val, BoolTest::ne, kit->null(), likely); {
// Ok must mark the card if not already dirty
// load the original value of the card
Node* card_val = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
- __ if_then(card_val, BoolTest::ne, young_card); {
+ __ if_then(card_val, BoolTest::ne, young_card, unlikely); {
kit->sync_kit(ideal);
kit->insert_store_load_for_barrier();
__ sync_kit(kit);
--- a/src/hotspot/share/gc/g1/g1Analytics.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1Analytics.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -88,7 +88,7 @@
_young_other_cost_per_region_ms_seq(new TruncatedSeq(TruncatedSeqLength)),
_non_young_other_cost_per_region_ms_seq(new TruncatedSeq(TruncatedSeqLength)),
_pending_cards_seq(new TruncatedSeq(TruncatedSeqLength)),
- _rs_lengths_seq(new TruncatedSeq(TruncatedSeqLength)),
+ _rs_length_seq(new TruncatedSeq(TruncatedSeqLength)),
_cost_per_byte_ms_during_cm_seq(new TruncatedSeq(TruncatedSeqLength)),
_recent_prev_end_times_for_all_gcs_sec(new TruncatedSeq(NumPrevPausesForHeuristics)),
_recent_avg_pause_time_ratio(0.0),
@@ -210,8 +210,8 @@
_pending_cards_seq->add(pending_cards);
}
-void G1Analytics::report_rs_lengths(double rs_lengths) {
- _rs_lengths_seq->add(rs_lengths);
+void G1Analytics::report_rs_length(double rs_length) {
+ _rs_length_seq->add(rs_length);
}
size_t G1Analytics::predict_rs_length_diff() const {
@@ -310,8 +310,8 @@
return get_new_prediction(_concurrent_mark_cleanup_times_ms);
}
-size_t G1Analytics::predict_rs_lengths() const {
- return get_new_size_prediction(_rs_lengths_seq);
+size_t G1Analytics::predict_rs_length() const {
+ return get_new_size_prediction(_rs_length_seq);
}
size_t G1Analytics::predict_pending_cards() const {
--- a/src/hotspot/share/gc/g1/g1Analytics.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1Analytics.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -58,7 +58,7 @@
TruncatedSeq* _non_young_other_cost_per_region_ms_seq;
TruncatedSeq* _pending_cards_seq;
- TruncatedSeq* _rs_lengths_seq;
+ TruncatedSeq* _rs_length_seq;
TruncatedSeq* _cost_per_byte_ms_during_cm_seq;
@@ -109,7 +109,7 @@
void report_non_young_other_cost_per_region_ms(double other_cost_per_region_ms);
void report_constant_other_time_ms(double constant_other_time_ms);
void report_pending_cards(double pending_cards);
- void report_rs_lengths(double rs_lengths);
+ void report_rs_length(double rs_length);
size_t predict_rs_length_diff() const;
@@ -146,7 +146,7 @@
double predict_cleanup_time_ms() const;
- size_t predict_rs_lengths() const;
+ size_t predict_rs_length() const;
size_t predict_pending_cards() const;
double predict_cost_per_byte_ms() const;
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -2154,6 +2154,12 @@
GCLocker::stall_until_clear();
}
}
+ } else if (GCLocker::should_discard(cause, gc_count_before)) {
+ // Return false to be consistent with VMOp failure due to
+ // another collection slipping in after our gc_count but before
+ // our request is processed. _gc_locker collections upgraded by
+ // GCLockerInvokesConcurrent are handled above and never discarded.
+ return false;
} else {
if (cause == GCCause::_gc_locker || cause == GCCause::_wb_young_gc
DEBUG_ONLY(|| cause == GCCause::_scavenge_alot)) {
@@ -4052,7 +4058,7 @@
G1SerialFreeCollectionSetClosure _cl;
const size_t* _surviving_young_words;
- size_t _rs_lengths;
+ size_t _rs_length;
volatile jint _serial_work_claim;
@@ -4084,7 +4090,7 @@
HeapRegion* r = g1h->region_at(region_idx);
assert(!g1h->is_on_master_free_list(r), "sanity");
- Atomic::add(r->rem_set()->occupied_locked(), &_rs_lengths);
+ Atomic::add(r->rem_set()->occupied_locked(), &_rs_length);
if (!is_young) {
g1h->_hot_card_cache->reset_card_counts(r);
@@ -4117,7 +4123,7 @@
_cl.complete_work();
G1Policy* policy = G1CollectedHeap::heap()->policy();
- policy->record_max_rs_lengths(_rs_lengths);
+ policy->record_max_rs_length(_rs_length);
policy->cset_regions_freed();
}
public:
@@ -4126,7 +4132,7 @@
_collection_set(collection_set),
_cl(evacuation_info, surviving_young_words),
_surviving_young_words(surviving_young_words),
- _rs_lengths(0),
+ _rs_length(0),
_serial_work_claim(0),
_parallel_work_claim(0),
_num_work_items(collection_set->region_length()),
--- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -61,14 +61,14 @@
_collection_set_max_length(0),
_num_optional_regions(0),
_bytes_used_before(0),
- _recorded_rs_lengths(0),
+ _recorded_rs_length(0),
_inc_build_state(Inactive),
_inc_part_start(0),
_inc_bytes_used_before(0),
- _inc_recorded_rs_lengths(0),
- _inc_recorded_rs_lengths_diffs(0),
+ _inc_recorded_rs_length(0),
+ _inc_recorded_rs_length_diff(0),
_inc_predicted_elapsed_time_ms(0.0),
- _inc_predicted_elapsed_time_ms_diffs(0.0) {
+ _inc_predicted_elapsed_time_ms_diff(0.0) {
}
G1CollectionSet::~G1CollectionSet() {
@@ -108,8 +108,8 @@
_candidates = NULL;
}
-void G1CollectionSet::set_recorded_rs_lengths(size_t rs_lengths) {
- _recorded_rs_lengths = rs_lengths;
+void G1CollectionSet::set_recorded_rs_length(size_t rs_length) {
+ _recorded_rs_length = rs_length;
}
// Add the heap region at the head of the non-incremental collection set
@@ -127,7 +127,7 @@
assert(_collection_set_cur_length <= _collection_set_max_length, "Collection set now larger than maximum size.");
_bytes_used_before += hr->used();
- _recorded_rs_lengths += hr->rem_set()->occupied();
+ _recorded_rs_length += hr->rem_set()->occupied();
_old_region_length++;
_g1h->old_set_remove(hr);
@@ -148,10 +148,10 @@
_inc_bytes_used_before = 0;
- _inc_recorded_rs_lengths = 0;
- _inc_recorded_rs_lengths_diffs = 0;
+ _inc_recorded_rs_length = 0;
+ _inc_recorded_rs_length_diff = 0;
_inc_predicted_elapsed_time_ms = 0.0;
- _inc_predicted_elapsed_time_ms_diffs = 0.0;
+ _inc_predicted_elapsed_time_ms_diff = 0.0;
update_incremental_marker();
}
@@ -160,32 +160,32 @@
assert(_inc_build_state == Active, "Precondition");
assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
- // The two "main" fields, _inc_recorded_rs_lengths and
+ // The two "main" fields, _inc_recorded_rs_length and
// _inc_predicted_elapsed_time_ms, are updated by the thread
// that adds a new region to the CSet. Further updates by the
// concurrent refinement thread that samples the young RSet lengths
- // are accumulated in the *_diffs fields. Here we add the diffs to
+ // are accumulated in the *_diff fields. Here we add the diffs to
// the "main" fields.
- if (_inc_recorded_rs_lengths_diffs >= 0) {
- _inc_recorded_rs_lengths += _inc_recorded_rs_lengths_diffs;
+ if (_inc_recorded_rs_length_diff >= 0) {
+ _inc_recorded_rs_length += _inc_recorded_rs_length_diff;
} else {
// This is defensive. The diff should in theory be always positive
// as RSets can only grow between GCs. However, given that we
// sample their size concurrently with other threads updating them
// it's possible that we might get the wrong size back, which
// could make the calculations somewhat inaccurate.
- size_t diffs = (size_t) (-_inc_recorded_rs_lengths_diffs);
- if (_inc_recorded_rs_lengths >= diffs) {
- _inc_recorded_rs_lengths -= diffs;
+ size_t diffs = (size_t) (-_inc_recorded_rs_length_diff);
+ if (_inc_recorded_rs_length >= diffs) {
+ _inc_recorded_rs_length -= diffs;
} else {
- _inc_recorded_rs_lengths = 0;
+ _inc_recorded_rs_length = 0;
}
}
- _inc_predicted_elapsed_time_ms += _inc_predicted_elapsed_time_ms_diffs;
+ _inc_predicted_elapsed_time_ms += _inc_predicted_elapsed_time_ms_diff;
- _inc_recorded_rs_lengths_diffs = 0;
- _inc_predicted_elapsed_time_ms_diffs = 0.0;
+ _inc_recorded_rs_length_diff = 0;
+ _inc_predicted_elapsed_time_ms_diff = 0.0;
}
void G1CollectionSet::clear() {
@@ -252,23 +252,23 @@
assert(hr->is_young(), "Precondition");
assert(!SafepointSynchronize::is_at_safepoint(), "should not be at a safepoint");
- // We could have updated _inc_recorded_rs_lengths and
+ // We could have updated _inc_recorded_rs_length and
// _inc_predicted_elapsed_time_ms directly but we'd need to do
// that atomically, as this code is executed by a concurrent
// refinement thread, potentially concurrently with a mutator thread
// allocating a new region and also updating the same fields. To
// avoid the atomic operations we accumulate these updates on two
- // separate fields (*_diffs) and we'll just add them to the "main"
+ // separate fields (*_diff) and we'll just add them to the "main"
// fields at the start of a GC.
ssize_t old_rs_length = (ssize_t) hr->recorded_rs_length();
- ssize_t rs_lengths_diff = (ssize_t) new_rs_length - old_rs_length;
- _inc_recorded_rs_lengths_diffs += rs_lengths_diff;
+ ssize_t rs_length_diff = (ssize_t) new_rs_length - old_rs_length;
+ _inc_recorded_rs_length_diff += rs_length_diff;
double old_elapsed_time_ms = hr->predicted_elapsed_time_ms();
double new_region_elapsed_time_ms = predict_region_elapsed_time_ms(hr);
double elapsed_ms_diff = new_region_elapsed_time_ms - old_elapsed_time_ms;
- _inc_predicted_elapsed_time_ms_diffs += elapsed_ms_diff;
+ _inc_predicted_elapsed_time_ms_diff += elapsed_ms_diff;
hr->set_recorded_rs_length(new_rs_length);
hr->set_predicted_elapsed_time_ms(new_region_elapsed_time_ms);
@@ -316,7 +316,7 @@
hr->set_recorded_rs_length(rs_length);
hr->set_predicted_elapsed_time_ms(region_elapsed_time_ms);
- _inc_recorded_rs_lengths += rs_length;
+ _inc_recorded_rs_length += rs_length;
_inc_predicted_elapsed_time_ms += region_elapsed_time_ms;
_inc_bytes_used_before += hr->used();
}
@@ -437,7 +437,7 @@
// The number of recorded young regions is the incremental
// collection set's current size
- set_recorded_rs_lengths(_inc_recorded_rs_lengths);
+ set_recorded_rs_length(_inc_recorded_rs_length);
double young_end_time_sec = os::elapsedTime();
phase_times()->record_young_cset_choice_time_ms((young_end_time_sec - young_start_time_sec) * 1000.0);
--- a/src/hotspot/share/gc/g1/g1CollectionSet.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -164,7 +164,7 @@
// The number of cards in the remembered set in the collection set. Set from
// the incrementally built collection set at the start of an evacuation
// pause, and updated as more regions are added to the collection set.
- size_t _recorded_rs_lengths;
+ size_t _recorded_rs_length;
enum CSetBuildType {
Active, // We are actively building the collection set
@@ -188,25 +188,25 @@
// only one thread can be allocating a new CSet region (currently,
// it does so after taking the Heap_lock) hence no need to
// synchronize updates to this field.
- size_t _inc_recorded_rs_lengths;
+ size_t _inc_recorded_rs_length;
// A concurrent refinement thread periodically samples the young
- // region RSets and needs to update _inc_recorded_rs_lengths as
+ // region RSets and needs to update _inc_recorded_rs_length as
// the RSets grow. Instead of having to synchronize updates to that
// field we accumulate them in this field and add it to
- // _inc_recorded_rs_lengths_diffs at the start of a GC.
- ssize_t _inc_recorded_rs_lengths_diffs;
+ // _inc_recorded_rs_length_diff at the start of a GC.
+ ssize_t _inc_recorded_rs_length_diff;
// The predicted elapsed time it will take to collect the regions in
// the CSet. This is updated by the thread that adds a new region to
- // the CSet. See the comment for _inc_recorded_rs_lengths about
+ // the CSet. See the comment for _inc_recorded_rs_length about
// MT-safety assumptions.
double _inc_predicted_elapsed_time_ms;
- // See the comment for _inc_recorded_rs_lengths_diffs.
- double _inc_predicted_elapsed_time_ms_diffs;
+ // See the comment for _inc_recorded_rs_length_diff.
+ double _inc_predicted_elapsed_time_ms_diff;
- void set_recorded_rs_lengths(size_t rs_lengths);
+ void set_recorded_rs_length(size_t rs_length);
G1CollectorState* collector_state();
G1GCPhaseTimes* phase_times();
@@ -293,7 +293,7 @@
void iterate_optional(HeapRegionClosure* cl) const;
- size_t recorded_rs_lengths() { return _recorded_rs_lengths; }
+ size_t recorded_rs_length() { return _recorded_rs_length; }
size_t bytes_used_before() const {
return _bytes_used_before;
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -2587,7 +2587,7 @@
// and do_marking_step() is not being called serially.
bool do_stealing = do_termination && !is_serial;
- double diff_prediction_ms = _g1h->policy()->predictor().get_new_prediction(&_marking_step_diffs_ms);
+ double diff_prediction_ms = _g1h->policy()->predictor().get_new_prediction(&_marking_step_diff_ms);
_time_target_ms = time_target_ms - diff_prediction_ms;
// set up the variables that are used in the work-based scheme to
@@ -2829,7 +2829,7 @@
// Keep statistics of how well we did with respect to hitting
// our target only if we actually timed out (if we aborted for
// other reasons, then the results might get skewed).
- _marking_step_diffs_ms.add(diff_ms);
+ _marking_step_diff_ms.add(diff_ms);
}
if (_cm->has_overflown()) {
@@ -2912,11 +2912,11 @@
_elapsed_time_ms(0.0),
_termination_time_ms(0.0),
_termination_start_time_ms(0.0),
- _marking_step_diffs_ms()
+ _marking_step_diff_ms()
{
guarantee(task_queue != NULL, "invariant");
- _marking_step_diffs_ms.add(0.5);
+ _marking_step_diff_ms.add(0.5);
}
// These are formatting macros that are used below to ensure
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -700,7 +700,7 @@
// When this task got into the termination protocol
double _termination_start_time_ms;
- TruncatedSeq _marking_step_diffs_ms;
+ TruncatedSeq _marking_step_diff_ms;
// Updates the local fields after this task has claimed
// a new region to scan
--- a/src/hotspot/share/gc/g1/g1Policy.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -68,8 +68,8 @@
_reserve_regions(0),
_young_gen_sizer(G1YoungGenSizer::create_gen_sizer()),
_free_regions_at_end_of_collection(0),
- _max_rs_lengths(0),
- _rs_lengths_prediction(0),
+ _max_rs_length(0),
+ _rs_length_prediction(0),
_pending_cards(0),
_bytes_allocated_in_old_since_last_gc(0),
_initial_mark_to_mixed(),
@@ -219,23 +219,23 @@
}
uint G1Policy::update_young_list_max_and_target_length() {
- return update_young_list_max_and_target_length(_analytics->predict_rs_lengths());
+ return update_young_list_max_and_target_length(_analytics->predict_rs_length());
}
-uint G1Policy::update_young_list_max_and_target_length(size_t rs_lengths) {
- uint unbounded_target_length = update_young_list_target_length(rs_lengths);
+uint G1Policy::update_young_list_max_and_target_length(size_t rs_length) {
+ uint unbounded_target_length = update_young_list_target_length(rs_length);
update_max_gc_locker_expansion();
return unbounded_target_length;
}
-uint G1Policy::update_young_list_target_length(size_t rs_lengths) {
- YoungTargetLengths young_lengths = young_list_target_lengths(rs_lengths);
+uint G1Policy::update_young_list_target_length(size_t rs_length) {
+ YoungTargetLengths young_lengths = young_list_target_lengths(rs_length);
_young_list_target_length = young_lengths.first;
return young_lengths.second;
}
-G1Policy::YoungTargetLengths G1Policy::young_list_target_lengths(size_t rs_lengths) const {
+G1Policy::YoungTargetLengths G1Policy::young_list_target_lengths(size_t rs_length) const {
YoungTargetLengths result;
// Calculate the absolute and desired min bounds first.
@@ -256,7 +256,7 @@
if (use_adaptive_young_list_length()) {
if (collector_state()->in_young_only_phase()) {
young_list_target_length =
- calculate_young_list_target_length(rs_lengths,
+ calculate_young_list_target_length(rs_length,
base_min_length,
desired_min_length,
desired_max_length);
@@ -301,7 +301,7 @@
}
uint
-G1Policy::calculate_young_list_target_length(size_t rs_lengths,
+G1Policy::calculate_young_list_target_length(size_t rs_length,
uint base_min_length,
uint desired_min_length,
uint desired_max_length) const {
@@ -326,8 +326,8 @@
const double target_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
const double survivor_regions_evac_time = predict_survivor_regions_evac_time();
const size_t pending_cards = _analytics->predict_pending_cards();
- const size_t adj_rs_lengths = rs_lengths + _analytics->predict_rs_length_diff();
- const size_t scanned_cards = _analytics->predict_card_num(adj_rs_lengths, true /* for_young_gc */);
+ const size_t adj_rs_length = rs_length + _analytics->predict_rs_length_diff();
+ const size_t scanned_cards = _analytics->predict_card_num(adj_rs_length, true /* for_young_gc */);
const double base_time_ms =
predict_base_elapsed_time_ms(pending_cards, scanned_cards) +
survivor_regions_evac_time;
@@ -414,25 +414,25 @@
return survivor_regions_evac_time;
}
-void G1Policy::revise_young_list_target_length_if_necessary(size_t rs_lengths) {
+void G1Policy::revise_young_list_target_length_if_necessary(size_t rs_length) {
guarantee(use_adaptive_young_list_length(), "should not call this otherwise" );
- if (rs_lengths > _rs_lengths_prediction) {
+ if (rs_length > _rs_length_prediction) {
// add 10% to avoid having to recalculate often
- size_t rs_lengths_prediction = rs_lengths * 1100 / 1000;
- update_rs_lengths_prediction(rs_lengths_prediction);
+ size_t rs_length_prediction = rs_length * 1100 / 1000;
+ update_rs_length_prediction(rs_length_prediction);
- update_young_list_max_and_target_length(rs_lengths_prediction);
+ update_young_list_max_and_target_length(rs_length_prediction);
}
}
-void G1Policy::update_rs_lengths_prediction() {
- update_rs_lengths_prediction(_analytics->predict_rs_lengths());
+void G1Policy::update_rs_length_prediction() {
+ update_rs_length_prediction(_analytics->predict_rs_length());
}
-void G1Policy::update_rs_lengths_prediction(size_t prediction) {
+void G1Policy::update_rs_length_prediction(size_t prediction) {
if (collector_state()->in_young_only_phase() && use_adaptive_young_list_length()) {
- _rs_lengths_prediction = prediction;
+ _rs_length_prediction = prediction;
}
}
@@ -471,7 +471,7 @@
// Reset survivors SurvRateGroup.
_survivor_surv_rate_group->reset();
update_young_list_max_and_target_length();
- update_rs_lengths_prediction();
+ update_rs_length_prediction();
_bytes_allocated_in_old_since_last_gc = 0;
@@ -692,29 +692,29 @@
_analytics->report_cost_per_remset_card_ms(cost_per_remset_card_ms, this_pause_was_young_only);
}
- if (_max_rs_lengths > 0) {
+ if (_max_rs_length > 0) {
double cards_per_entry_ratio =
- (double) remset_cards_scanned / (double) _max_rs_lengths;
+ (double) remset_cards_scanned / (double) _max_rs_length;
_analytics->report_cards_per_entry_ratio(cards_per_entry_ratio, this_pause_was_young_only);
}
- // This is defensive. For a while _max_rs_lengths could get
- // smaller than _recorded_rs_lengths which was causing
+ // This is defensive. For a while _max_rs_length could get
+ // smaller than _recorded_rs_length which was causing
// rs_length_diff to get very large and mess up the RSet length
// predictions. The reason was unsafe concurrent updates to the
- // _inc_cset_recorded_rs_lengths field which the code below guards
+ // _inc_cset_recorded_rs_length field which the code below guards
// against (see CR 7118202). This bug has now been fixed (see CR
// 7119027). However, I'm still worried that
- // _inc_cset_recorded_rs_lengths might still end up somewhat
+ // _inc_cset_recorded_rs_length might still end up somewhat
// inaccurate. The concurrent refinement thread calculates an
// RSet's length concurrently with other CR threads updating it
// which might cause it to calculate the length incorrectly (if,
// say, it's in mid-coarsening). So I'll leave in the defensive
// conditional below just in case.
size_t rs_length_diff = 0;
- size_t recorded_rs_lengths = _collection_set->recorded_rs_lengths();
- if (_max_rs_lengths > recorded_rs_lengths) {
- rs_length_diff = _max_rs_lengths - recorded_rs_lengths;
+ size_t recorded_rs_length = _collection_set->recorded_rs_length();
+ if (_max_rs_length > recorded_rs_length) {
+ rs_length_diff = _max_rs_length - recorded_rs_length;
}
_analytics->report_rs_length_diff((double) rs_length_diff);
@@ -745,7 +745,7 @@
// During mixed gc we do not use them for young gen sizing.
if (this_pause_was_young_only) {
_analytics->report_pending_cards((double) _pending_cards);
- _analytics->report_rs_lengths((double) _max_rs_lengths);
+ _analytics->report_rs_length((double) _max_rs_length);
}
}
@@ -757,7 +757,7 @@
_free_regions_at_end_of_collection = _g1h->num_free_regions();
- update_rs_lengths_prediction();
+ update_rs_length_prediction();
// Do not update dynamic IHOP due to G1 periodic collection as it is highly likely
// that in this case we are not running in a "normal" operating mode.
@@ -889,7 +889,7 @@
}
double G1Policy::predict_base_elapsed_time_ms(size_t pending_cards) const {
- size_t rs_length = _analytics->predict_rs_lengths() + _analytics->predict_rs_length_diff();
+ size_t rs_length = _analytics->predict_rs_length() + _analytics->predict_rs_length_diff();
size_t card_num = _analytics->predict_card_num(rs_length, collector_state()->in_young_only_phase());
return predict_base_elapsed_time_ms(pending_cards, card_num);
}
--- a/src/hotspot/share/gc/g1/g1Policy.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -96,9 +96,9 @@
uint _free_regions_at_end_of_collection;
- size_t _max_rs_lengths;
+ size_t _max_rs_length;
- size_t _rs_lengths_prediction;
+ size_t _rs_length_prediction;
size_t _pending_cards;
@@ -132,8 +132,8 @@
hr->install_surv_rate_group(_survivor_surv_rate_group);
}
- void record_max_rs_lengths(size_t rs_lengths) {
- _max_rs_lengths = rs_lengths;
+ void record_max_rs_length(size_t rs_length) {
+ _max_rs_length = rs_length;
}
double predict_base_elapsed_time_ms(size_t pending_cards) const;
@@ -194,17 +194,17 @@
double _mark_cleanup_start_sec;
// Updates the internal young list maximum and target lengths. Returns the
- // unbounded young list target length.
+ // unbounded young list target length. If no rs_length parameter is passed,
+ // predict the RS length using the prediction model, otherwise use the
+ // given rs_length as the prediction.
uint update_young_list_max_and_target_length();
- uint update_young_list_max_and_target_length(size_t rs_lengths);
+ uint update_young_list_max_and_target_length(size_t rs_length);
// Update the young list target length either by setting it to the
// desired fixed value or by calculating it using G1's pause
- // prediction model. If no rs_lengths parameter is passed, predict
- // the RS lengths using the prediction model, otherwise use the
- // given rs_lengths as the prediction.
+ // prediction model.
// Returns the unbounded young list target length.
- uint update_young_list_target_length(size_t rs_lengths);
+ uint update_young_list_target_length(size_t rs_length);
// Calculate and return the minimum desired young list target
// length. This is the minimum desired young list length according
@@ -217,12 +217,12 @@
uint calculate_young_list_desired_max_length() const;
// Calculate and return the maximum young list target length that
- // can fit into the pause time goal. The parameters are: rs_lengths
+ // can fit into the pause time goal. The parameters are: rs_length
// represent the prediction of how large the young RSet lengths will
// be, base_min_length is the already existing number of regions in
// the young list, min_length and max_length are the desired min and
// max young list length according to the user's inputs.
- uint calculate_young_list_target_length(size_t rs_lengths,
+ uint calculate_young_list_target_length(size_t rs_length,
uint base_min_length,
uint desired_min_length,
uint desired_max_length) const;
@@ -230,10 +230,10 @@
// Result of the bounded_young_list_target_length() method, containing both the
// bounded as well as the unbounded young list target lengths in this order.
typedef Pair<uint, uint, StackObj> YoungTargetLengths;
- YoungTargetLengths young_list_target_lengths(size_t rs_lengths) const;
+ YoungTargetLengths young_list_target_lengths(size_t rs_length) const;
- void update_rs_lengths_prediction();
- void update_rs_lengths_prediction(size_t prediction);
+ void update_rs_length_prediction();
+ void update_rs_length_prediction(size_t prediction);
// Check whether a given young length (young_length) fits into the
// given target pause time and whether the prediction for the amount
@@ -295,10 +295,10 @@
G1GCPhaseTimes* phase_times() const { return _phase_times; }
- // Check the current value of the young list RSet lengths and
+ // Check the current value of the young list RSet length and
// compare it against the last prediction. If the current value is
// higher, recalculate the young list target length prediction.
- void revise_young_list_target_length_if_necessary(size_t rs_lengths);
+ void revise_young_list_target_length_if_necessary(size_t rs_length);
// This should be called after the heap is resized.
void record_new_heap_size(uint new_number_of_regions);
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -110,7 +110,7 @@
}
while (!should_terminate()) {
- sample_young_list_rs_lengths();
+ sample_young_list_rs_length();
if (os::supports_vtime()) {
_vtime_accum = (os::elapsedVTime() - vtime_start);
@@ -132,14 +132,14 @@
class G1YoungRemSetSamplingClosure : public HeapRegionClosure {
SuspendibleThreadSetJoiner* _sts;
size_t _regions_visited;
- size_t _sampled_rs_lengths;
+ size_t _sampled_rs_length;
public:
G1YoungRemSetSamplingClosure(SuspendibleThreadSetJoiner* sts) :
- HeapRegionClosure(), _sts(sts), _regions_visited(0), _sampled_rs_lengths(0) { }
+ HeapRegionClosure(), _sts(sts), _regions_visited(0), _sampled_rs_length(0) { }
virtual bool do_heap_region(HeapRegion* r) {
size_t rs_length = r->rem_set()->occupied();
- _sampled_rs_lengths += rs_length;
+ _sampled_rs_length += rs_length;
// Update the collection set policy information for this region
G1CollectedHeap::heap()->collection_set()->update_young_region_prediction(r, rs_length);
@@ -158,10 +158,10 @@
return false;
}
- size_t sampled_rs_lengths() const { return _sampled_rs_lengths; }
+ size_t sampled_rs_length() const { return _sampled_rs_length; }
};
-void G1YoungRemSetSamplingThread::sample_young_list_rs_lengths() {
+void G1YoungRemSetSamplingThread::sample_young_list_rs_length() {
SuspendibleThreadSetJoiner sts;
G1CollectedHeap* g1h = G1CollectedHeap::heap();
G1Policy* policy = g1h->policy();
@@ -173,7 +173,7 @@
g1cs->iterate(&cl);
if (cl.is_complete()) {
- policy->revise_young_list_target_length_if_necessary(cl.sampled_rs_lengths());
+ policy->revise_young_list_target_length_if_necessary(cl.sampled_rs_length());
}
}
}
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -47,7 +47,7 @@
double _vtime_accum; // Accumulated virtual time.
- void sample_young_list_rs_lengths();
+ void sample_young_list_rs_length();
void run_service();
void check_for_periodic_gc();
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -520,6 +520,10 @@
full_gc_count = total_full_collections();
}
+ if (GCLocker::should_discard(cause, gc_count)) {
+ return;
+ }
+
VM_ParallelGCSystemGC op(gc_count, full_gc_count, cause);
VMThread::execute(&op);
}
@@ -612,6 +616,55 @@
UseParallelOldGC ? PSParallelCompact::accumulated_time()->seconds() : PSMarkSweepProxy::accumulated_time()->seconds());
}
+PreGenGCValues ParallelScavengeHeap::get_pre_gc_values() const {
+ const PSYoungGen* const young = young_gen();
+ const MutableSpace* const eden = young->eden_space();
+ const MutableSpace* const from = young->from_space();
+ const MutableSpace* const to = young->to_space();
+ const PSOldGen* const old = old_gen();
+
+ return PreGenGCValues(young->used_in_bytes(),
+ young->capacity_in_bytes(),
+ eden->used_in_bytes(),
+ eden->capacity_in_bytes(),
+ from->used_in_bytes(),
+ from->capacity_in_bytes(),
+ old->used_in_bytes(),
+ old->capacity_in_bytes());
+}
+
+void ParallelScavengeHeap::print_heap_change(const PreGenGCValues& pre_gc_values) const {
+ const PSYoungGen* const young = young_gen();
+ const MutableSpace* const eden = young->eden_space();
+ const MutableSpace* const from = young->from_space();
+ const PSOldGen* const old = old_gen();
+
+ log_info(gc, heap)(HEAP_CHANGE_FORMAT" "
+ HEAP_CHANGE_FORMAT" "
+ HEAP_CHANGE_FORMAT,
+ HEAP_CHANGE_FORMAT_ARGS(young->name(),
+ pre_gc_values.young_gen_used(),
+ pre_gc_values.young_gen_capacity(),
+ young->used_in_bytes(),
+ young->capacity_in_bytes()),
+ HEAP_CHANGE_FORMAT_ARGS("Eden",
+ pre_gc_values.eden_used(),
+ pre_gc_values.eden_capacity(),
+ eden->used_in_bytes(),
+ eden->capacity_in_bytes()),
+ HEAP_CHANGE_FORMAT_ARGS("From",
+ pre_gc_values.from_used(),
+ pre_gc_values.from_capacity(),
+ from->used_in_bytes(),
+ from->capacity_in_bytes()));
+ log_info(gc, heap)(HEAP_CHANGE_FORMAT,
+ HEAP_CHANGE_FORMAT_ARGS(old->name(),
+ pre_gc_values.old_gen_used(),
+ pre_gc_values.old_gen_capacity(),
+ old->used_in_bytes(),
+ old->capacity_in_bytes()));
+ MetaspaceUtils::print_metaspace_change(pre_gc_values.metaspace_sizes());
+}
void ParallelScavengeHeap::verify(VerifyOption option /* ignored */) {
// Why do we need the total_collections()-filter below?
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -33,12 +33,12 @@
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/gcPolicyCounters.hpp"
#include "gc/shared/gcWhen.hpp"
+#include "gc/shared/preGCValues.hpp"
#include "gc/shared/referenceProcessor.hpp"
#include "gc/shared/softRefPolicy.hpp"
#include "gc/shared/strongRootsScope.hpp"
#include "logging/log.hpp"
#include "memory/metaspace.hpp"
-#include "memory/metaspace/metaspaceSizesSnapshot.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/ostream.hpp"
@@ -224,6 +224,9 @@
virtual void gc_threads_do(ThreadClosure* tc) const;
virtual void print_tracing_info() const;
+ PreGenGCValues get_pre_gc_values() const;
+ void print_heap_change(const PreGenGCValues& pre_gc_values) const;
+
void verify(VerifyOption option /* ignored */);
// Resize the young generation. The reserved space for the
@@ -251,27 +254,6 @@
GCMemoryManager* young_gc_manager() const { return _young_manager; }
};
-// Simple class for storing info about the heap at the start of GC, to be used
-// after GC for comparison/printing.
-class PreGCValues {
-public:
- PreGCValues(ParallelScavengeHeap* heap) :
- _heap_used(heap->used()),
- _young_gen_used(heap->young_gen()->used_in_bytes()),
- _old_gen_used(heap->old_gen()->used_in_bytes()) { }
-
- size_t heap_used() const { return _heap_used; }
- size_t young_gen_used() const { return _young_gen_used; }
- size_t old_gen_used() const { return _old_gen_used; }
- const metaspace::MetaspaceSizesSnapshot& metaspace_sizes() const { return _meta_sizes; }
-
-private:
- size_t _heap_used;
- size_t _young_gen_used;
- size_t _old_gen_used;
- const metaspace::MetaspaceSizesSnapshot _meta_sizes;
-};
-
// Class that can be used to print information about the
// adaptive size policy at intervals specified by
// AdaptiveSizePolicyOutputInterval. Only print information
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -193,7 +193,7 @@
BiasedLocking::preserve_marks();
- const PreGCValues pre_gc_values(heap);
+ const PreGenGCValues pre_gc_values = heap->get_pre_gc_values();
allocate_stacks();
@@ -348,9 +348,7 @@
accumulated_time()->stop();
}
- young_gen->print_used_change(pre_gc_values.young_gen_used());
- old_gen->print_used_change(pre_gc_values.old_gen_used());
- MetaspaceUtils::print_metaspace_change(pre_gc_values.metaspace_sizes());
+ heap->print_heap_change(pre_gc_values);
// Track memory usage and detect low memory
MemoryService::track_memory_usage();
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -443,11 +443,6 @@
st->print(" object"); object_space()->print_on(st);
}
-void PSOldGen::print_used_change(size_t prev_used) const {
- log_info(gc, heap)("%s: " SIZE_FORMAT "K->" SIZE_FORMAT "K(" SIZE_FORMAT "K)",
- name(), prev_used / K, used_in_bytes() / K, capacity_in_bytes() / K);
-}
-
void PSOldGen::update_counters() {
if (UsePerfData) {
_space_counters->update_all();
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -198,7 +198,6 @@
// Debugging - do not use for time critical operations
virtual void print() const;
virtual void print_on(outputStream* st) const;
- void print_used_change(size_t prev_used) const;
void verify();
void verify_object_start_array();
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1779,7 +1779,7 @@
// miscellaneous bookkeeping.
pre_compact();
- const PreGCValues pre_gc_values(heap);
+ const PreGenGCValues pre_gc_values = heap->get_pre_gc_values();
// Get the compaction manager reserved for the VM thread.
ParCompactionManager* const vmthread_cm =
@@ -1923,9 +1923,7 @@
accumulated_time()->stop();
}
- young_gen->print_used_change(pre_gc_values.young_gen_used());
- old_gen->print_used_change(pre_gc_values.old_gen_used());
- MetaspaceUtils::print_metaspace_change(pre_gc_values.metaspace_sizes());
+ heap->print_heap_change(pre_gc_values);
// Track memory usage and detect low memory
MemoryService::track_memory_usage();
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -42,7 +42,6 @@
class PSParallelCompact;
class GCTaskManager;
class GCTaskQueue;
-class PreGCValues;
class MoveAndUpdateClosure;
class RefProcTaskExecutor;
class ParallelOldTracer;
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -328,7 +328,7 @@
reference_processor()->enable_discovery();
reference_processor()->setup_policy(false);
- const PreGCValues pre_gc_values(heap);
+ const PreGenGCValues pre_gc_values = heap->get_pre_gc_values();
// Reset our survivor overflow.
set_survivor_overflow(false);
@@ -598,9 +598,7 @@
accumulated_time()->stop();
}
- young_gen->print_used_change(pre_gc_values.young_gen_used());
- old_gen->print_used_change(pre_gc_values.old_gen_used());
- MetaspaceUtils::print_metaspace_change(pre_gc_values.metaspace_sizes());
+ heap->print_heap_change(pre_gc_values);
// Track memory usage and detect low memory
MemoryService::track_memory_usage();
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -49,11 +49,16 @@
}
}
+static bool is_cause_full(GCCause::Cause cause) {
+ return (cause != GCCause::_gc_locker) && (cause != GCCause::_wb_young_gc)
+ DEBUG_ONLY(&& (cause != GCCause::_scavenge_alot));
+}
+
// Only used for System.gc() calls
VM_ParallelGCSystemGC::VM_ParallelGCSystemGC(uint gc_count,
uint full_gc_count,
GCCause::Cause gc_cause) :
- VM_GC_Operation(gc_count, gc_cause, full_gc_count, true /* full */)
+ VM_GC_Operation(gc_count, gc_cause, full_gc_count, is_cause_full(gc_cause))
{
}
@@ -63,8 +68,7 @@
ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
GCCauseSetter gccs(heap, _gc_cause);
- if (_gc_cause == GCCause::_gc_locker || _gc_cause == GCCause::_wb_young_gc
- DEBUG_ONLY(|| _gc_cause == GCCause::_scavenge_alot)) {
+ if (!_full) {
// If (and only if) the scavenge fails, this will invoke a full gc.
heap->invoke_scavenge();
} else {
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -766,12 +766,6 @@
st->print(" to "); to_space()->print_on(st);
}
-// Note that a space is not printed before the [NAME:
-void PSYoungGen::print_used_change(size_t prev_used) const {
- log_info(gc, heap)("%s: " SIZE_FORMAT "K->" SIZE_FORMAT "K(" SIZE_FORMAT "K)",
- name(), prev_used / K, used_in_bytes() / K, capacity_in_bytes() / K);
-}
-
size_t PSYoungGen::available_for_expansion() {
ShouldNotReachHere();
return 0;
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -180,7 +180,6 @@
// Debugging - do not use for time critical operations
void print() const;
void print_on(outputStream* st) const;
- void print_used_change(size_t prev_used) const;
virtual const char* name() const { return "PSYoungGen"; }
void verify();
--- a/src/hotspot/share/gc/shared/gcLocker.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/gcLocker.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -36,6 +36,7 @@
volatile jint GCLocker::_jni_lock_count = 0;
volatile bool GCLocker::_needs_gc = false;
volatile bool GCLocker::_doing_gc = false;
+unsigned int GCLocker::_total_collections = 0;
#ifdef ASSERT
volatile jint GCLocker::_debug_jni_lock_count = 0;
@@ -115,6 +116,11 @@
}
}
+bool GCLocker::should_discard(GCCause::Cause cause, uint total_collections) {
+ return (cause == GCCause::_gc_locker) &&
+ (_total_collections != total_collections);
+}
+
void GCLocker::jni_lock(JavaThread* thread) {
assert(!thread->in_critical(), "shouldn't currently be in a critical region");
MonitorLocker ml(JNICritical_lock);
@@ -138,7 +144,13 @@
decrement_debug_jni_lock_count();
thread->exit_critical();
if (needs_gc() && !is_active_internal()) {
- // We're the last thread out. Cause a GC to occur.
+ // We're the last thread out. Request a GC.
+ // Capture the current total collections, to allow detection of
+ // other collections that make this one unnecessary. The value of
+ // total_collections() is only changed at a safepoint, so there
+ // must not be a safepoint between the lock becoming inactive and
+ // getting the count, else there may be unnecessary GCLocker GCs.
+ _total_collections = Universe::heap()->total_collections();
_doing_gc = true;
{
// Must give up the lock while at a safepoint
--- a/src/hotspot/share/gc/shared/gcLocker.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/gcLocker.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -25,6 +25,7 @@
#ifndef SHARE_GC_SHARED_GCLOCKER_HPP
#define SHARE_GC_SHARED_GCLOCKER_HPP
+#include "gc/shared/gcCause.hpp"
#include "memory/allocation.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
@@ -45,6 +46,7 @@
static volatile bool _needs_gc; // heap is filling, we need a GC
// note: bool is typedef'd as jint
static volatile bool _doing_gc; // unlock_critical() is doing a GC
+ static uint _total_collections; // value for _gc_locker collection
#ifdef ASSERT
// This lock count is updated for all operations and is used to
@@ -98,6 +100,12 @@
// Sets _needs_gc if is_active() is true. Returns is_active().
static bool check_active_before_gc();
+ // Return true if the designated collection is a GCLocker request
+ // that should be discarded. Returns true if cause == GCCause::_gc_locker
+ // and the given total collection value indicates a collection has been
+ // done since the GCLocker request was made.
+ static bool should_discard(GCCause::Cause cause, uint total_collections);
+
// Stalls the caller (who should not be in a jni critical section)
// until needs_gc() clears. Note however that needs_gc() may be
// set at a subsequent safepoint and/or cleared under the
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -194,7 +194,8 @@
uint full_gc_count_before,
GCCause::Cause gc_cause,
GenCollectedHeap::GenerationType max_generation)
- : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, true /* full */),
+ : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before,
+ max_generation != GenCollectedHeap::YoungGen /* full */),
_max_generation(max_generation) { }
~VM_GenCollectFull() {}
virtual VMOp_Type type() const { return VMOp_GenCollectFull; }
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -947,8 +947,9 @@
// public collection interfaces
void GenCollectedHeap::collect(GCCause::Cause cause) {
- if (cause == GCCause::_wb_young_gc) {
- // Young collection for the WhiteBox API.
+ if ((cause == GCCause::_wb_young_gc) ||
+ (cause == GCCause::_gc_locker)) {
+ // Young collection for WhiteBox or GCLocker.
collect(cause, YoungGen);
} else {
#ifdef ASSERT
@@ -986,6 +987,11 @@
// Read the GC count while holding the Heap_lock
unsigned int gc_count_before = total_collections();
unsigned int full_gc_count_before = total_full_collections();
+
+ if (GCLocker::should_discard(cause, gc_count_before)) {
+ return;
+ }
+
{
MutexUnlocker mu(Heap_lock); // give up heap lock, execute gets it back
VM_GenCollectFull op(gc_count_before, full_gc_count_before,
@@ -1000,24 +1006,15 @@
void GenCollectedHeap::do_full_collection(bool clear_all_soft_refs,
GenerationType last_generation) {
- GenerationType local_last_generation;
- if (!incremental_collection_will_fail(false /* don't consult_young */) &&
- gc_cause() == GCCause::_gc_locker) {
- local_last_generation = YoungGen;
- } else {
- local_last_generation = last_generation;
- }
-
do_collection(true, // full
clear_all_soft_refs, // clear_all_soft_refs
0, // size
false, // is_tlab
- local_last_generation); // last_generation
+ last_generation); // last_generation
// Hack XXX FIX ME !!!
// A scavenge may not have been attempted, or may have
// been attempted and failed, because the old gen was too full
- if (local_last_generation == YoungGen && gc_cause() == GCCause::_gc_locker &&
- incremental_collection_will_fail(false /* don't consult_young */)) {
+ if (gc_cause() == GCCause::_gc_locker && incremental_collection_failed()) {
log_debug(gc, jni)("GC locker: Trying a full collection because scavenge failed");
// This time allow the old gen to be collected as well
do_collection(true, // full
--- a/src/hotspot/share/gc/shared/memAllocator.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -172,11 +172,9 @@
// This is a VM policy failure, so how do we exhaustively test it?
assert(!_thread->has_pending_exception(),
"shouldn't be allocating with pending exception");
- if (StrictSafepointChecks) {
- // Allocation of an oop can always invoke a safepoint,
- // hence, the true argument.
- _thread->check_for_valid_safepoint_state(true);
- }
+ // Allocation of an oop can always invoke a safepoint,
+ // hence, the true argument.
+ _thread->check_for_valid_safepoint_state(true);
}
#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/gc/shared/preGCValues.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Twitter, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHARED_PREGCVALUES_HPP
+#define SHARE_GC_SHARED_PREGCVALUES_HPP
+
+#include "memory/metaspace/metaspaceSizesSnapshot.hpp"
+
+// Simple class for storing info about the heap at the start of GC, to be used
+// after GC for comparison/printing.
+class PreGenGCValues {
+public:
+ PreGenGCValues(size_t young_gen_used,
+ size_t young_gen_capacity,
+ size_t eden_used,
+ size_t eden_capacity,
+ size_t from_used,
+ size_t from_capacity,
+ size_t old_gen_used,
+ size_t old_gen_capacity)
+ : _young_gen_used(young_gen_used),
+ _young_gen_capacity(young_gen_capacity),
+ _eden_used(eden_used),
+ _eden_capacity(eden_capacity),
+ _from_used(from_used),
+ _from_capacity(from_capacity),
+ _old_gen_used(old_gen_used),
+ _old_gen_capacity(old_gen_capacity) { }
+
+ size_t young_gen_used() const { return _young_gen_used; }
+ size_t young_gen_capacity() const { return _young_gen_capacity; }
+ size_t eden_used() const { return _eden_used; }
+ size_t eden_capacity() const { return _eden_capacity; }
+ size_t from_used() const { return _from_used; }
+ size_t from_capacity() const { return _from_capacity; }
+ size_t old_gen_used() const { return _old_gen_used; }
+ size_t old_gen_capacity() const { return _old_gen_capacity; }
+ const metaspace::MetaspaceSizesSnapshot& metaspace_sizes() const { return _meta_sizes; }
+
+private:
+ const size_t _young_gen_used;
+ const size_t _young_gen_capacity;
+ const size_t _eden_used;
+ const size_t _eden_capacity;
+ const size_t _from_used;
+ const size_t _from_capacity;
+ const size_t _old_gen_used;
+ const size_t _old_gen_capacity;
+ const metaspace::MetaspaceSizesSnapshot _meta_sizes;
+};
+
+#endif // SHARE_GC_SHARED_PREGCVALUES_HPP
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -184,6 +184,11 @@
} else {
// Otherwise, the queue contained exactly one element; we take the slow
// path.
+
+ // The barrier is required to prevent reordering the two reads of _age:
+ // one is the _age.get() below, and the other is _age.top() above the if-stmt.
+ // The algorithm may fail if _age.get() reads an older value than _age.top().
+ OrderAccess::loadload();
return pop_local_slow(localBot, _age.get());
}
}
--- a/src/hotspot/share/gc/shared/workgroup.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shared/workgroup.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -433,7 +433,6 @@
if (old == 0) {
old = Atomic::cmpxchg(1u, &_tasks[t], 0u);
}
- assert(_tasks[t] == 1, "What else?");
bool res = old == 0;
#ifdef ASSERT
if (res) {
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -670,42 +670,6 @@
}
}
}
- for( uint i = 0; i < n->len(); ++i ) {
- Node *m = n->in(i);
- if (m == NULL) continue;
-
- // In most cases, inputs should be known to be non null. If it's
- // not the case, it could be a missing cast_not_null() in an
- // intrinsic or support might be needed in AddPNode::Ideal() to
- // avoid a NULL+offset input.
- if (!(n->is_Phi() ||
- (n->is_SafePoint() && (!n->is_CallRuntime() || !strcmp(n->as_Call()->_name, "shenandoah_wb_pre") || !strcmp(n->as_Call()->_name, "unsafe_arraycopy"))) ||
- n->Opcode() == Op_CmpP ||
- n->Opcode() == Op_CmpN ||
- (n->Opcode() == Op_StoreP && i == StoreNode::ValueIn) ||
- (n->Opcode() == Op_StoreN && i == StoreNode::ValueIn) ||
- n->is_ConstraintCast() ||
- n->Opcode() == Op_Return ||
- n->Opcode() == Op_Conv2B ||
- n->is_AddP() ||
- n->Opcode() == Op_CMoveP ||
- n->Opcode() == Op_CMoveN ||
- n->Opcode() == Op_Rethrow ||
- n->is_MemBar() ||
- n->is_Mem() ||
- n->Opcode() == Op_AryEq ||
- n->Opcode() == Op_SCMemProj ||
- n->Opcode() == Op_EncodeP ||
- n->Opcode() == Op_DecodeN ||
- n->Opcode() == Op_ShenandoahEnqueueBarrier ||
- n->Opcode() == Op_ShenandoahLoadReferenceBarrier)) {
- if (m->bottom_type()->make_oopptr() && m->bottom_type()->make_oopptr()->meet(TypePtr::NULL_PTR) == m->bottom_type()) {
- report_verify_failure("Shenandoah verification: null input", n, m);
- }
- }
-
- wq.push(m);
- }
}
if (verify_no_useless_barrier) {
@@ -3123,6 +3087,7 @@
return needs_barrier_impl(phase, n->in(1), visited);
case Op_LoadN:
return true;
+ case Op_CMoveN:
case Op_CMoveP:
return needs_barrier_impl(phase, n->in(2), visited) ||
needs_barrier_impl(phase, n->in(3), visited);
@@ -3274,6 +3239,7 @@
case Op_StrComp:
case Op_StrIndexOf:
case Op_StrIndexOfChar:
+ case Op_HasNegatives:
if (!ShenandoahOptimizeStableFinals) {
strength = WEAK;
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -200,7 +200,7 @@
break;
}
case 2: {
- CodeCache_lock->lock();
+ CodeCache_lock->lock_without_safepoint_check();
break;
}
default:
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1582,7 +1582,7 @@
class ShenandoahConcurrentRootsEvacUpdateTask : public AbstractGangTask {
private:
- ShenandoahJNIHandleRoots<true /*concurrent*/> _jni_roots;
+ ShenandoahVMRoots<true /*concurrent*/> _vm_roots;
ShenandoahWeakRoots<true /*concurrent*/> _weak_roots;
ShenandoahClassLoaderDataRoots<true /*concurrent*/, false /*single threaded*/> _cld_roots;
@@ -1597,7 +1597,7 @@
// jni_roots and weak_roots are OopStorage backed roots, concurrent iteration
// may race against OopStorage::release() calls.
ShenandoahEvacUpdateOopStorageRootsClosure cl;
- _jni_roots.oops_do<ShenandoahEvacUpdateOopStorageRootsClosure>(&cl);
+ _vm_roots.oops_do<ShenandoahEvacUpdateOopStorageRootsClosure>(&cl);
_weak_roots.oops_do<ShenandoahEvacUpdateOopStorageRootsClosure>(&cl);
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -52,6 +52,7 @@
f(scan_jni_weak_roots, " S: JNI Weak Roots") \
f(scan_stringtable_roots, " S: String Table Roots") \
f(scan_resolved_method_table_roots, " S: Resolved Table Roots") \
+ f(scan_vm_global_roots, " S: VM Global Roots") \
f(scan_vm_weak_roots, " S: VM Weak Roots") \
f(scan_synchronizer_roots, " S: Synchronizer Roots") \
f(scan_management_roots, " S: Management Roots") \
@@ -78,6 +79,7 @@
f(update_jni_weak_roots, " U: JNI Weak Roots") \
f(update_stringtable_roots, " U: String Table Roots") \
f(update_resolved_method_table_roots, " U: Resolved Table Roots") \
+ f(update_vm_global_roots, " U: VM Global Roots") \
f(update_vm_weak_roots, " U: VM Weak Roots") \
f(update_synchronizer_roots, " U: Synchronizer Roots") \
f(update_management_roots, " U: Management Roots") \
@@ -112,6 +114,7 @@
f(evac_jni_weak_roots, " E: JNI Weak Roots") \
f(evac_stringtable_roots, " E: String Table Roots") \
f(evac_resolved_method_table_roots, " E: Resolved Table Roots") \
+ f(evac_vm_global_roots, " E: VM Global Roots") \
f(evac_vm_weak_roots, " E: VM Weak Roots") \
f(evac_synchronizer_roots, " E: Synchronizer Roots") \
f(evac_management_roots, " E: Management Roots") \
@@ -143,6 +146,7 @@
f(final_update_jni_weak_roots, " UR: JNI Weak Roots") \
f(final_update_stringtable_roots, " UR: String Table Roots") \
f(final_update_resolved_method_table_roots, " UR: Resolved Table Roots") \
+ f(final_update_vm_global_roots, " UR: VM Global Roots") \
f(final_update_vm_weak_roots, " UR: VM Weak Roots") \
f(final_update_refs_synchronizer_roots, " UR: Synchronizer Roots") \
f(final_update_refs_management_roots, " UR: Management Roots") \
@@ -169,6 +173,7 @@
f(degen_gc_update_jni_weak_roots, " DU: JNI Weak Roots") \
f(degen_gc_update_stringtable_roots, " DU: String Table Roots") \
f(degen_gc_update_resolved_method_table_roots, " DU: Resolved Table Roots") \
+ f(degen_gc_update_vm_global_roots, " DU: VM Global Roots") \
f(degen_gc_update_vm_weak_roots, " DU: VM Weak Roots") \
f(degen_gc_update_synchronizer_roots, " DU: Synchronizer Roots") \
f(degen_gc_update_management_roots, " DU: Management Roots") \
@@ -196,6 +201,7 @@
f(init_traversal_gc_jni_weak_roots, " TI: JNI Weak Roots") \
f(init_traversal_gc_stringtable_roots, " TI: String Table Roots") \
f(init_traversal_gc_resolved_method_table_roots, " TI: Resolved Table Roots") \
+ f(init_traversal_gc_vm_global_roots, " TI: VM Global Roots") \
f(init_traversal_gc_vm_weak_roots, " TI: VM Weak Roots") \
f(init_traversal_gc_synchronizer_roots, " TI: Synchronizer Roots") \
f(init_traversal_gc_management_roots, " TI: Management Roots") \
@@ -220,6 +226,7 @@
f(final_traversal_gc_jni_weak_roots, " TF: JNI Weak Roots") \
f(final_traversal_gc_stringtable_roots, " TF: String Table Roots") \
f(final_traversal_gc_resolved_method_table_roots, " TF: Resolved Table Roots") \
+ f(final_traversal_gc_vm_global_roots, " TF: VM Global Roots") \
f(final_traversal_gc_vm_weak_roots, " TF: VM Weak Roots") \
f(final_traversal_gc_synchronizer_roots, " TF: Synchronizer Roots") \
f(final_traversal_gc_management_roots, " TF: Management Roots") \
@@ -242,6 +249,7 @@
f(final_traversal_update_jni_weak_roots, " TU: JNI Weak Roots") \
f(final_traversal_update_stringtable_roots, " TU: String Table Roots") \
f(final_traversal_update_resolved_method_table_roots, " TU: Resolved Table Roots") \
+ f(final_traversal_update_vm_global_roots, " TU: VM Global Roots") \
f(final_traversal_update_vm_weak_roots, " TU: VM Weak Roots") \
f(final_traversal_update_synchronizer_roots, " TU: Synchronizer Roots") \
f(final_traversal_update_management_roots, " TU: Management Roots") \
@@ -270,6 +278,7 @@
f(full_gc_jni_weak_roots, " F: JNI Weak Roots") \
f(full_gc_stringtable_roots, " F: String Table Roots") \
f(full_gc_resolved_method_table_roots, " F: Resolved Table Roots") \
+ f(full_gc_vm_global_roots, " F: VM Global Roots") \
f(full_gc_vm_weak_roots, " F: VM Weak Roots") \
f(full_gc_synchronizer_roots, " F: Synchronizer Roots") \
f(full_gc_management_roots, " F: Management Roots") \
@@ -330,6 +339,7 @@
f(JNIWeakRoots, "JNI Weak Roots (ms):") \
f(StringTableRoots, "StringTable Roots(ms):") \
f(ResolvedMethodTableRoots, "Resolved Table Roots(ms):") \
+ f(VMGlobalRoots, "VM Global Roots(ms)") \
f(VMWeakRoots, "VM Weak Roots(ms)") \
f(ObjectSynchronizerRoots, "ObjectSynchronizer Roots (ms):") \
f(ManagementRoots, "Management Roots (ms):") \
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -52,9 +52,9 @@
}
}
-// Default the second argument for SD::oops_do.
+// Overwrite the second argument for SD::oops_do, don't include vm global oop storage.
static void system_dictionary_oops_do(OopClosure* cl) {
- SystemDictionary::oops_do(cl);
+ SystemDictionary::oops_do(cl, false);
}
ShenandoahSerialRoots::ShenandoahSerialRoots() :
@@ -173,7 +173,7 @@
_serial_weak_roots.weak_oops_do(oops, worker_id);
if (_include_concurrent_roots) {
CLDToOopClosure clds(oops, ClassLoaderData::_claim_strong);
- _jni_roots.oops_do<OopClosure>(oops, worker_id);
+ _vm_roots.oops_do<OopClosure>(oops, worker_id);
_cld_roots.cld_do(&clds, worker_id);
_weak_roots.oops_do<OopClosure>(oops, worker_id);
}
@@ -202,7 +202,7 @@
AlwaysTrueClosure always_true;
_serial_roots.oops_do(oops, worker_id);
- _jni_roots.oops_do(oops, worker_id);
+ _vm_roots.oops_do(oops, worker_id);
_thread_roots.oops_do(oops, NULL, worker_id);
_cld_roots.cld_do(&adjust_cld_closure, worker_id);
@@ -227,7 +227,7 @@
ResourceMark rm;
_serial_roots.oops_do(oops, 0);
- _jni_roots.oops_do(oops, 0);
+ _vm_roots.oops_do(oops, 0);
_cld_roots.cld_do(&clds, 0);
_thread_roots.threads_do(&tc_cl, 0);
_code_roots.code_blobs_do(&code, 0);
@@ -242,7 +242,7 @@
ResourceMark rm;
_serial_roots.oops_do(oops, 0);
- _jni_roots.oops_do(oops, 0);
+ _vm_roots.oops_do(oops, 0);
_cld_roots.always_strong_cld_do(&clds, 0);
_thread_roots.threads_do(&tc_cl, 0);
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -93,17 +93,23 @@
};
template <bool CONCURRENT>
-class ShenandoahWeakRoot {
+class ShenandoahVMRoot {
private:
OopStorage::ParState<CONCURRENT, false /* is_const */> _itr;
const ShenandoahPhaseTimings::GCParPhases _phase;
public:
- ShenandoahWeakRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase);
+ ShenandoahVMRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase);
template <typename Closure>
void oops_do(Closure* cl, uint worker_id);
};
+template <bool CONCURRENT>
+class ShenandoahWeakRoot : public ShenandoahVMRoot<CONCURRENT> {
+public:
+ ShenandoahWeakRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase);
+};
+
template <>
class ShenandoahWeakRoot<false /*concurrent*/> {
private:
@@ -150,11 +156,13 @@
};
template <bool CONCURRENT>
-class ShenandoahJNIHandleRoots {
+class ShenandoahVMRoots {
private:
- OopStorage::ParState<CONCURRENT, false /*is_const*/> _itr;
+ ShenandoahVMRoot<CONCURRENT> _jni_handle_roots;
+ ShenandoahVMRoot<CONCURRENT> _vm_global_roots;
+
public:
- ShenandoahJNIHandleRoots();
+ ShenandoahVMRoots();
template <typename T>
void oops_do(T* cl, uint worker_id = 0);
@@ -217,7 +225,7 @@
ShenandoahSerialRoots _serial_roots;
ShenandoahThreadRoots _thread_roots;
ShenandoahCodeCacheRoots<ITR> _code_roots;
- ShenandoahJNIHandleRoots<false /*concurrent*/ > _jni_roots;
+ ShenandoahVMRoots<false /*concurrent*/ > _vm_roots;
ShenandoahClassLoaderDataRoots<false /*concurrent*/, false /*single threaded*/>
_cld_roots;
public:
@@ -243,7 +251,7 @@
private:
ShenandoahSerialRoots _serial_roots;
ShenandoahThreadRoots _thread_roots;
- ShenandoahJNIHandleRoots<false /*concurrent*/> _jni_roots;
+ ShenandoahVMRoots<false /*concurrent*/> _vm_roots;
ShenandoahClassLoaderDataRoots<false /*concurrent*/, true /*single threaded*/>
_cld_roots;
ShenandoahCodeCacheRoots<ShenandoahAllCodeRootsIterator> _code_roots;
@@ -259,7 +267,7 @@
class ShenandoahRootEvacuator : public ShenandoahRootProcessor {
private:
ShenandoahSerialRoots _serial_roots;
- ShenandoahJNIHandleRoots<false /*concurrent*/> _jni_roots;
+ ShenandoahVMRoots<false /*concurrent*/> _vm_roots;
ShenandoahClassLoaderDataRoots<false /*concurrent*/, false /*single threaded*/>
_cld_roots;
ShenandoahThreadRoots _thread_roots;
@@ -279,7 +287,7 @@
class ShenandoahRootUpdater : public ShenandoahRootProcessor {
private:
ShenandoahSerialRoots _serial_roots;
- ShenandoahJNIHandleRoots<false /*concurrent*/> _jni_roots;
+ ShenandoahVMRoots<false /*concurrent*/> _vm_roots;
ShenandoahClassLoaderDataRoots<false /*concurrent*/, false /*single threaded*/>
_cld_roots;
ShenandoahThreadRoots _thread_roots;
@@ -300,7 +308,7 @@
class ShenandoahRootAdjuster : public ShenandoahRootProcessor {
private:
ShenandoahSerialRoots _serial_roots;
- ShenandoahJNIHandleRoots<false /*concurrent*/> _jni_roots;
+ ShenandoahVMRoots<false /*concurrent*/> _vm_roots;
ShenandoahClassLoaderDataRoots<false /*concurrent*/, false /*single threaded*/>
_cld_roots;
ShenandoahThreadRoots _thread_roots;
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -37,22 +37,27 @@
#include "runtime/safepoint.hpp"
template <bool CONCURRENT>
-inline ShenandoahWeakRoot<CONCURRENT>::ShenandoahWeakRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase) :
+inline ShenandoahVMRoot<CONCURRENT>::ShenandoahVMRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase) :
_itr(storage), _phase(phase) {
}
template <bool CONCURRENT>
template <typename Closure>
-inline void ShenandoahWeakRoot<CONCURRENT>::oops_do(Closure* cl, uint worker_id) {
+inline void ShenandoahVMRoot<CONCURRENT>::oops_do(Closure* cl, uint worker_id) {
if (CONCURRENT) {
_itr.oops_do(cl);
} else {
ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
- ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::ThreadRoots, worker_id);
+ ShenandoahWorkerTimingsTracker timer(worker_times, _phase, worker_id);
_itr.oops_do(cl);
}
}
+template <bool CONCURRENT>
+inline ShenandoahWeakRoot<CONCURRENT>::ShenandoahWeakRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase) :
+ ShenandoahVMRoot<CONCURRENT>(storage, phase) {
+}
+
inline ShenandoahWeakRoot<false>::ShenandoahWeakRoot(OopStorage* storage, ShenandoahPhaseTimings::GCParPhases phase) :
_itr(storage), _phase(phase) {
}
@@ -103,20 +108,16 @@
}
template <bool CONCURRENT>
-ShenandoahJNIHandleRoots<CONCURRENT>::ShenandoahJNIHandleRoots() :
- _itr(JNIHandles::global_handles()) {
+ShenandoahVMRoots<CONCURRENT>::ShenandoahVMRoots() :
+ _jni_handle_roots(JNIHandles::global_handles(), ShenandoahPhaseTimings::JNIRoots),
+ _vm_global_roots(SystemDictionary::vm_global_oop_storage(), ShenandoahPhaseTimings::VMGlobalRoots) {
}
template <bool CONCURRENT>
template <typename T>
-void ShenandoahJNIHandleRoots<CONCURRENT>::oops_do(T* cl, uint worker_id) {
- if (CONCURRENT) {
- _itr.oops_do(cl);
- } else {
- ShenandoahWorkerTimings* worker_times = ShenandoahHeap::heap()->phase_timings()->worker_times();
- ShenandoahWorkerTimingsTracker timer(worker_times, ShenandoahPhaseTimings::JNIRoots, worker_id);
- _itr.oops_do(cl);
- }
+void ShenandoahVMRoots<CONCURRENT>::oops_do(T* cl, uint worker_id) {
+ _jni_handle_roots.oops_do(cl, worker_id);
+ _vm_global_roots.oops_do(cl, worker_id);
}
template <bool CONCURRENT, bool SINGLE_THREADED>
@@ -231,7 +232,7 @@
ResourceMark rm;
_serial_roots.oops_do(oops, worker_id);
- _jni_roots.oops_do(oops, worker_id);
+ _vm_roots.oops_do(oops, worker_id);
if (clds != NULL) {
_cld_roots.cld_do(clds, worker_id);
@@ -256,7 +257,7 @@
ResourceMark rm;
_serial_roots.oops_do(oops, worker_id);
- _jni_roots.oops_do(oops, worker_id);
+ _vm_roots.oops_do(oops, worker_id);
_cld_roots.always_strong_cld_do(clds, worker_id);
_thread_roots.threads_do(&tc_cl, worker_id);
}
@@ -267,7 +268,7 @@
CLDToOopClosure clds(keep_alive, ClassLoaderData::_claim_strong);
_serial_roots.oops_do(keep_alive, worker_id);
- _jni_roots.oops_do(keep_alive, worker_id);
+ _vm_roots.oops_do(keep_alive, worker_id);
_thread_roots.oops_do(keep_alive, NULL, worker_id);
_cld_roots.cld_do(&clds, worker_id);
--- a/src/hotspot/share/gc/z/zDirector.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zDirector.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -66,7 +66,7 @@
const double time_since_last_gc = ZStatCycle::time_since_last();
const double time_until_gc = ZCollectionInterval - time_since_last_gc;
- log_debug(gc, director)("Rule: Timer, Interval: %us, TimeUntilGC: %.3lfs",
+ log_debug(gc, director)("Rule: Timer, Interval: %us, TimeUntilGC: %.3fs",
ZCollectionInterval, time_until_gc);
return time_until_gc <= 0;
@@ -133,7 +133,7 @@
const double sample_interval = 1.0 / ZStatAllocRate::sample_hz;
const double time_until_gc = time_until_oom - max_duration_of_gc - sample_interval;
- log_debug(gc, director)("Rule: Allocation Rate, MaxAllocRate: %.3lfMB/s, Free: " SIZE_FORMAT "MB, MaxDurationOfGC: %.3lfs, TimeUntilGC: %.3lfs",
+ log_debug(gc, director)("Rule: Allocation Rate, MaxAllocRate: %.3fMB/s, Free: " SIZE_FORMAT "MB, MaxDurationOfGC: %.3fs, TimeUntilGC: %.3fs",
max_alloc_rate / M, free / M, max_duration_of_gc, time_until_gc);
return time_until_gc <= 0;
@@ -162,7 +162,7 @@
const double time_since_last_gc_threshold = 5 * 60; // 5 minutes
if (used < used_threshold && time_since_last_gc < time_since_last_gc_threshold) {
// Don't even consider doing a proactive GC
- log_debug(gc, director)("Rule: Proactive, UsedUntilEnabled: " SIZE_FORMAT "MB, TimeUntilEnabled: %.3lfs",
+ log_debug(gc, director)("Rule: Proactive, UsedUntilEnabled: " SIZE_FORMAT "MB, TimeUntilEnabled: %.3fs",
(used_threshold - used) / M,
time_since_last_gc_threshold - time_since_last_gc);
return false;
@@ -175,7 +175,7 @@
const double acceptable_gc_interval = max_duration_of_gc * ((assumed_throughput_drop_during_gc / acceptable_throughput_drop) - 1.0);
const double time_until_gc = acceptable_gc_interval - time_since_last_gc;
- log_debug(gc, director)("Rule: Proactive, AcceptableGCInterval: %.3lfs, TimeSinceLastGC: %.3lfs, TimeUntilGC: %.3lfs",
+ log_debug(gc, director)("Rule: Proactive, AcceptableGCInterval: %.3fs, TimeSinceLastGC: %.3fs, TimeUntilGC: %.3fs",
acceptable_gc_interval, time_since_last_gc, time_until_gc);
return time_until_gc <= 0;
@@ -198,7 +198,7 @@
const size_t free = free_with_reserve - MIN2(free_with_reserve, max_reserve);
const double free_percent = percent_of(free, max_capacity);
- log_debug(gc, director)("Rule: High Usage, Free: " SIZE_FORMAT "MB(%.1lf%%)",
+ log_debug(gc, director)("Rule: High Usage, Free: " SIZE_FORMAT "MB(%.1f%%)",
free / M, free_percent);
return free_percent <= 5.0;
--- a/src/hotspot/share/gc/z/zDriver.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zDriver.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -87,8 +87,8 @@
GCIdMark gc_id_mark(_gc_id);
IsGCActiveMark gc_active_mark;
- // Verify roots
- ZVerify::roots_strong();
+ // Verify before operation
+ ZVerify::before_zoperation();
// Execute operation
_success = do_operation();
@@ -211,6 +211,17 @@
}
};
+class VM_ZVerify : public VM_Operation {
+public:
+ virtual VMOp_Type type() const {
+ return VMOp_ZVerify;
+ }
+
+ virtual void doit() {
+ ZVerify::after_weak_processing();
+ }
+};
+
ZDriver::ZDriver() :
_gc_cycle_port(),
_gc_locker_port() {
@@ -308,10 +319,9 @@
// Full verification
VM_Verify op;
VMThread::execute(&op);
-
} else if (ZVerifyRoots || ZVerifyObjects) {
// Limited verification
- VM_ZVerifyOperation op;
+ VM_ZVerify op;
VMThread::execute(&op);
}
}
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -188,19 +188,13 @@
obj->oop_iterate(&cl);
}
-class ZHeapIterateConcurrentRootsIterator : public ZConcurrentRootsIterator {
-public:
- ZHeapIterateConcurrentRootsIterator() :
- ZConcurrentRootsIterator(ClassLoaderData::_claim_other) {}
-};
-
template <bool VisitWeaks>
void ZHeapIterator::objects_do(ObjectClosure* cl) {
ZStatTimerDisable disable;
// Push roots to visit
- push_roots<ZRootsIterator, false /* Concurrent */, false /* Weak */>();
- push_roots<ZHeapIterateConcurrentRootsIterator, true /* Concurrent */, false /* Weak */>();
+ push_roots<ZRootsIterator, false /* Concurrent */, false /* Weak */>();
+ push_roots<ZConcurrentRootsIteratorClaimOther, true /* Concurrent */, false /* Weak */>();
if (VisitWeaks) {
push_roots<ZWeakRootsIterator, false /* Concurrent */, true /* Weak */>();
push_roots<ZConcurrentWeakRootsIterator, true /* Concurrent */, true /* Weak */>();
--- a/src/hotspot/share/gc/z/zMark.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zMark.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -634,17 +634,16 @@
class ZMarkConcurrentRootsTask : public ZTask {
private:
SuspendibleThreadSetJoiner _sts_joiner;
- ZConcurrentRootsIterator _roots;
+ ZConcurrentRootsIteratorClaimStrong _roots;
ZMarkConcurrentRootsIteratorClosure _cl;
public:
ZMarkConcurrentRootsTask(ZMark* mark) :
ZTask("ZMarkConcurrentRootsTask"),
- _sts_joiner(true /* active */),
- _roots(ClassLoaderData::_claim_strong),
+ _sts_joiner(),
+ _roots(),
_cl() {
ClassLoaderDataGraph_lock->lock();
- ClassLoaderDataGraph::clear_claimed_marks();
}
~ZMarkConcurrentRootsTask() {
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -113,8 +113,8 @@
log_debug(gc, nmethod)("Rebuilding NMethod Table: "
SIZE_FORMAT "->" SIZE_FORMAT " entries, "
- SIZE_FORMAT "(%.0lf%%->%.0lf%%) registered, "
- SIZE_FORMAT "(%.0lf%%->%.0lf%%) unregistered",
+ SIZE_FORMAT "(%.0f%%->%.0f%%) registered, "
+ SIZE_FORMAT "(%.0f%%->%.0f%%) unregistered",
_size, new_size,
_nregistered, percent_of(_nregistered, _size), percent_of(_nregistered, new_size),
_nunregistered, percent_of(_nunregistered, _size), 0.0);
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -44,6 +44,7 @@
ZObjectAllocator::ZObjectAllocator(uint nworkers) :
_nworkers(nworkers),
_used(0),
+ _undone(0),
_shared_medium_page(NULL),
_shared_small_page(NULL),
_worker_small_page(NULL) {}
@@ -58,6 +59,13 @@
return page;
}
+void ZObjectAllocator::undo_alloc_page(ZPage* page) {
+ // Increment undone bytes
+ Atomic::add(page->size(), _undone.addr());
+
+ ZHeap::heap()->undo_alloc_page(page);
+}
+
uintptr_t ZObjectAllocator::alloc_object_in_shared_page(ZPage** shared_page,
uint8_t page_type,
size_t page_size,
@@ -99,7 +107,7 @@
addr = prev_addr;
// Undo new page allocation
- ZHeap::heap()->undo_alloc_page(new_page);
+ undo_alloc_page(new_page);
}
}
}
@@ -208,7 +216,7 @@
assert(page->type() == ZPageTypeLarge, "Invalid page type");
// Undo page allocation
- ZHeap::heap()->undo_alloc_page(page);
+ undo_alloc_page(page);
return true;
}
@@ -268,13 +276,19 @@
size_t ZObjectAllocator::used() const {
size_t total_used = 0;
+ size_t total_undone = 0;
- ZPerCPUConstIterator<size_t> iter(&_used);
- for (const size_t* cpu_used; iter.next(&cpu_used);) {
+ ZPerCPUConstIterator<size_t> iter_used(&_used);
+ for (const size_t* cpu_used; iter_used.next(&cpu_used);) {
total_used += *cpu_used;
}
- return total_used;
+ ZPerCPUConstIterator<size_t> iter_undone(&_undone);
+ for (const size_t* cpu_undone; iter_undone.next(&cpu_undone);) {
+ total_undone += *cpu_undone;
+ }
+
+ return total_used - total_undone;
}
size_t ZObjectAllocator::remaining() const {
@@ -291,8 +305,9 @@
void ZObjectAllocator::retire_pages() {
assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
- // Reset used
+ // Reset used and undone bytes
_used.set_all(0);
+ _undone.set_all(0);
// Reset allocation pages
_shared_medium_page.set(NULL);
--- a/src/hotspot/share/gc/z/zObjectAllocator.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -33,11 +33,13 @@
private:
const uint _nworkers;
ZPerCPU<size_t> _used;
+ ZPerCPU<size_t> _undone;
ZContended<ZPage*> _shared_medium_page;
ZPerCPU<ZPage*> _shared_small_page;
ZPerWorker<ZPage*> _worker_small_page;
ZPage* alloc_page(uint8_t type, size_t size, ZAllocationFlags flags);
+ void undo_alloc_page(ZPage* page);
// Allocate an object in a shared page. Allocate and
// atomically install a new page if necessary.
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -337,7 +337,7 @@
// Failed, or partly failed, to increase capacity. Adjust current
// max capacity to avoid further attempts to increase capacity.
log_error(gc)("Forced to lower max Java heap size from "
- SIZE_FORMAT "M(%.0lf%%) to " SIZE_FORMAT "M(%.0lf%%)",
+ SIZE_FORMAT "M(%.0f%%) to " SIZE_FORMAT "M(%.0f%%)",
_current_max_capacity / M, percent_of(_current_max_capacity, _max_capacity),
_capacity / M, percent_of(_capacity, _max_capacity));
@@ -572,7 +572,7 @@
const size_t cached_after = _cache.available();
const size_t cached_before = cached_after + flushed;
- log_info(gc, heap)("Page Cache: " SIZE_FORMAT "M(%.0lf%%)->" SIZE_FORMAT "M(%.0lf%%), "
+ log_info(gc, heap)("Page Cache: " SIZE_FORMAT "M(%.0f%%)->" SIZE_FORMAT "M(%.0f%%), "
"Flushed: " SIZE_FORMAT "M",
cached_before / M, percent_of(cached_before, max_capacity()),
cached_after / M, percent_of(cached_after, max_capacity()),
@@ -660,7 +660,7 @@
}
if (uncommitted > 0) {
- log_info(gc, heap)("Capacity: " SIZE_FORMAT "M(%.0lf%%)->" SIZE_FORMAT "M(%.0lf%%), "
+ log_info(gc, heap)("Capacity: " SIZE_FORMAT "M(%.0f%%)->" SIZE_FORMAT "M(%.0f%%), "
"Uncommitted: " SIZE_FORMAT "M",
capacity_before / M, percent_of(capacity_before, max_capacity()),
capacity_after / M, percent_of(capacity_after, max_capacity()),
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -272,6 +272,7 @@
_vm_handles(this),
_class_loader_data_graph(this) {
ZStatTimer timer(ZSubPhaseConcurrentRootsSetup);
+ ClassLoaderDataGraph::clear_claimed_marks(cld_claim);
}
ZConcurrentRootsIterator::~ZConcurrentRootsIterator() {
@@ -409,26 +410,3 @@
_string_table.oops_do(cl);
_resolved_method_table.oops_do(cl);
}
-
-ZThreadRootsIterator::ZThreadRootsIterator() :
- _threads(this) {
- assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
- ZStatTimer timer(ZSubPhasePauseRootsSetup);
- Threads::change_thread_claim_token();
-}
-
-ZThreadRootsIterator::~ZThreadRootsIterator() {
- ZStatTimer timer(ZSubPhasePauseRootsTeardown);
- Threads::assert_all_threads_claimed();
-}
-
-void ZThreadRootsIterator::do_threads(ZRootsIteratorClosure* cl) {
- ZStatTimer timer(ZSubPhasePauseRootsThreads);
- ResourceMark rm;
- Threads::possibly_parallel_oops_do(true, cl, NULL);
-}
-
-void ZThreadRootsIterator::oops_do(ZRootsIteratorClosure* cl) {
- ZStatTimer timer(ZSubPhasePauseRoots);
- _threads.oops_do(cl);
-}
--- a/src/hotspot/share/gc/z/zRootsIterator.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zRootsIterator.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -111,9 +111,9 @@
class ZConcurrentRootsIterator {
private:
- ZOopStorageIterator _jni_handles_iter;
- ZOopStorageIterator _vm_handles_iter;
- int _cld_claim;
+ ZOopStorageIterator _jni_handles_iter;
+ ZOopStorageIterator _vm_handles_iter;
+ const int _cld_claim;
void do_jni_handles(ZRootsIteratorClosure* cl);
void do_vm_handles(ZRootsIteratorClosure* cl);
@@ -130,13 +130,31 @@
void oops_do(ZRootsIteratorClosure* cl);
};
+class ZConcurrentRootsIteratorClaimStrong : public ZConcurrentRootsIterator {
+public:
+ ZConcurrentRootsIteratorClaimStrong() :
+ ZConcurrentRootsIterator(ClassLoaderData::_claim_strong) {}
+};
+
+class ZConcurrentRootsIteratorClaimOther : public ZConcurrentRootsIterator {
+public:
+ ZConcurrentRootsIteratorClaimOther() :
+ ZConcurrentRootsIterator(ClassLoaderData::_claim_other) {}
+};
+
+class ZConcurrentRootsIteratorClaimNone : public ZConcurrentRootsIterator {
+public:
+ ZConcurrentRootsIteratorClaimNone() :
+ ZConcurrentRootsIterator(ClassLoaderData::_claim_none) {}
+};
+
class ZWeakRootsIterator {
private:
void do_jvmti_weak_export(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl);
void do_jfr_weak(BoolObjectClosure* is_alive, ZRootsIteratorClosure* cl);
- ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jvmti_weak_export> _jvmti_weak_export;
- ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jfr_weak> _jfr_weak;
+ ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jvmti_weak_export> _jvmti_weak_export;
+ ZSerialWeakOopsDo<ZWeakRootsIterator, &ZWeakRootsIterator::do_jfr_weak> _jfr_weak;
public:
ZWeakRootsIterator();
@@ -170,17 +188,4 @@
void oops_do(ZRootsIteratorClosure* cl);
};
-class ZThreadRootsIterator {
-private:
- void do_threads(ZRootsIteratorClosure* cl);
-
- ZParallelOopsDo<ZThreadRootsIterator, &ZThreadRootsIterator::do_threads> _threads;
-
-public:
- ZThreadRootsIterator();
- ~ZThreadRootsIterator();
-
- void oops_do(ZRootsIteratorClosure* cl);
-};
-
#endif // SHARE_GC_Z_ZROOTSITERATOR_HPP
--- a/src/hotspot/share/gc/z/zStat.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zStat.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -41,11 +41,11 @@
#include "utilities/debug.hpp"
#include "utilities/ticks.hpp"
-#define ZSIZE_FMT SIZE_FORMAT "M(%.0lf%%)"
+#define ZSIZE_FMT SIZE_FORMAT "M(%.0f%%)"
#define ZSIZE_ARGS(size) ((size) / M), (percent_of(size, ZStatHeap::max_capacity()))
#define ZTABLE_ARGS_NA "%9s", "-"
-#define ZTABLE_ARGS(size) SIZE_FORMAT_W(8) "M (%.0lf%%)", \
+#define ZTABLE_ARGS(size) SIZE_FORMAT_W(8) "M (%.0f%%)", \
((size) / M), (percent_of(size, ZStatHeap::max_capacity()))
//
--- a/src/hotspot/share/gc/z/zTracer.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zTracer.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -80,7 +80,7 @@
}
void ZTracer::send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value) {
- NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+ NoSafepointVerifier nsv;
EventZStatisticsCounter e;
if (e.should_commit()) {
@@ -92,7 +92,7 @@
}
void ZTracer::send_stat_sampler(uint32_t sampler_id, uint64_t value) {
- NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+ NoSafepointVerifier nsv;
EventZStatisticsSampler e;
if (e.should_commit()) {
@@ -103,7 +103,7 @@
}
void ZTracer::send_thread_phase(const char* name, const Ticks& start, const Ticks& end) {
- NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+ NoSafepointVerifier nsv;
EventZThreadPhase e(UNTIMED);
if (e.should_commit()) {
@@ -116,7 +116,7 @@
}
void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve) {
- NoSafepointVerifier nsv(true, !SafepointSynchronize::is_at_safepoint());
+ NoSafepointVerifier nsv;
EventZPageAllocation e;
if (e.should_commit()) {
--- a/src/hotspot/share/gc/z/zVerify.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zVerify.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -23,7 +23,6 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.hpp"
-#include "classfile/classLoaderDataGraph.hpp"
#include "gc/z/zAddress.hpp"
#include "gc/z/zHeap.inline.hpp"
#include "gc/z/zOop.hpp"
@@ -31,41 +30,65 @@
#include "gc/z/zRootsIterator.hpp"
#include "gc/z/zStat.hpp"
#include "gc/z/zVerify.hpp"
-#include "memory/allocation.hpp"
#include "memory/iterator.inline.hpp"
-#include "oops/oop.inline.hpp"
+#include "oops/oop.hpp"
+
+#define BAD_OOP_ARG(o, p) "Bad oop " PTR_FORMAT " found at " PTR_FORMAT, p2i(o), p2i(p)
-#define BAD_OOP_REPORT(addr) \
- "Bad oop " PTR_FORMAT " found at " PTR_FORMAT ", expected " PTR_FORMAT, \
- addr, p2i(p), ZAddress::good(addr)
+static void verify_oop(oop* p) {
+ const oop o = RawAccess<>::oop_load(p);
+ if (o != NULL) {
+ const uintptr_t addr = ZOop::to_address(o);
+ guarantee(ZAddress::is_good(addr), BAD_OOP_ARG(o, p));
+ guarantee(oopDesc::is_oop(ZOop::from_address(addr)), BAD_OOP_ARG(o, p));
+ }
+}
-class ZVerifyRootsClosure : public ZRootsIteratorClosure {
+static void verify_possibly_weak_oop(oop* p) {
+ const oop o = RawAccess<>::oop_load(p);
+ if (o != NULL) {
+ const uintptr_t addr = ZOop::to_address(o);
+ guarantee(ZAddress::is_good(addr) || ZAddress::is_finalizable_good(addr), BAD_OOP_ARG(o, p));
+ guarantee(oopDesc::is_oop(ZOop::from_address(ZAddress::good(addr))), BAD_OOP_ARG(o, p));
+ }
+}
+
+class ZVerifyRootClosure : public ZRootsIteratorClosure {
public:
virtual void do_oop(oop* p) {
- uintptr_t value = ZOop::to_address(*p);
-
- if (value == 0) {
- return;
- }
+ verify_oop(p);
+ }
- guarantee(!ZAddress::is_finalizable(value), BAD_OOP_REPORT(value));
- guarantee(ZAddress::is_good(value), BAD_OOP_REPORT(value));
- guarantee(oopDesc::is_oop(ZOop::from_address(value)), BAD_OOP_REPORT(value));
+ virtual void do_oop(narrowOop*) {
+ ShouldNotReachHere();
}
- virtual void do_oop(narrowOop*) { ShouldNotReachHere(); }
};
-template <bool VisitReferents>
class ZVerifyOopClosure : public ClaimMetadataVisitingOopIterateClosure, public ZRootsIteratorClosure {
+private:
+ const bool _verify_weaks;
+
public:
- ZVerifyOopClosure() :
- ClaimMetadataVisitingOopIterateClosure(ClassLoaderData::_claim_other) {}
+ ZVerifyOopClosure(bool verify_weaks) :
+ ClaimMetadataVisitingOopIterateClosure(ClassLoaderData::_claim_other),
+ _verify_weaks(verify_weaks) {}
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+ virtual void do_oop(oop* p) {
+ if (_verify_weaks) {
+ verify_possibly_weak_oop(p);
+ } else {
+ // We should never encounter finalizable oops through strong
+ // paths. This assumes we have only visited strong roots.
+ verify_oop(p);
+ }
+ }
+
+ virtual void do_oop(narrowOop* p) {
+ ShouldNotReachHere();
+ }
virtual ReferenceIterationMode reference_iteration_mode() {
- return VisitReferents ? DO_FIELDS : DO_FIELDS_EXCEPT_REFERENT;
+ return _verify_weaks ? DO_FIELDS : DO_FIELDS_EXCEPT_REFERENT;
}
#ifdef ASSERT
@@ -76,47 +99,37 @@
#endif
};
-class ZVerifyObjectClosure : public ObjectClosure {
-private:
- bool _visit_referents;
+template <typename RootsIterator>
+void ZVerify::roots() {
+ assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
+ assert(!ZResurrection::is_blocked(), "Invalid phase");
-public:
- ZVerifyObjectClosure(bool visit_referents) : _visit_referents(visit_referents) {}
- virtual void do_object(oop o);
-};
-
-template <typename RootsIterator>
-void ZVerify::roots_impl() {
if (ZVerifyRoots) {
- ZVerifyRootsClosure cl;
+ ZVerifyRootClosure cl;
RootsIterator iter;
iter.oops_do(&cl);
}
}
void ZVerify::roots_strong() {
- roots_impl<ZRootsIterator>();
-}
-
-class ZVerifyConcurrentRootsIterator : public ZConcurrentRootsIterator {
-public:
- ZVerifyConcurrentRootsIterator()
- : ZConcurrentRootsIterator(ClassLoaderData::_claim_none) {}
-};
-
-void ZVerify::roots_concurrent() {
- roots_impl<ZVerifyConcurrentRootsIterator>();
+ roots<ZRootsIterator>();
}
void ZVerify::roots_weak() {
- assert(!ZResurrection::is_blocked(), "Invalid phase");
+ roots<ZWeakRootsIterator>();
+}
- roots_impl<ZWeakRootsIterator>();
+void ZVerify::roots_concurrent_strong() {
+ roots<ZConcurrentRootsIteratorClaimNone>();
+}
+
+void ZVerify::roots_concurrent_weak() {
+ roots<ZConcurrentWeakRootsIterator>();
}
void ZVerify::roots(bool verify_weaks) {
roots_strong();
- roots_concurrent();
+ roots_concurrent_strong();
if (verify_weaks) {
roots_weak();
roots_concurrent_weak();
@@ -124,64 +137,36 @@
}
void ZVerify::objects(bool verify_weaks) {
+ assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
+ assert(ZGlobalPhase == ZPhaseMarkCompleted, "Invalid phase");
+ assert(!ZResurrection::is_blocked(), "Invalid phase");
+
if (ZVerifyObjects) {
- ZVerifyObjectClosure cl(verify_weaks);
- ZHeap::heap()->object_iterate(&cl, verify_weaks);
+ ZVerifyOopClosure cl(verify_weaks);
+ ObjectToOopClosure object_cl(&cl);
+ ZHeap::heap()->object_iterate(&object_cl, verify_weaks);
}
}
-void ZVerify::roots_concurrent_weak() {
- assert(!ZResurrection::is_blocked(), "Invalid phase");
-
- roots_impl<ZConcurrentWeakRootsIterator>();
-}
-
void ZVerify::roots_and_objects(bool verify_weaks) {
- ZStatTimerDisable _disable;
-
roots(verify_weaks);
objects(verify_weaks);
}
+void ZVerify::before_zoperation() {
+ // Verify strong roots
+ ZStatTimerDisable disable;
+ roots_strong();
+}
+
void ZVerify::after_mark() {
- // Only verify strong roots and references.
+ // Verify all strong roots and strong references
+ ZStatTimerDisable disable;
roots_and_objects(false /* verify_weaks */);
}
void ZVerify::after_weak_processing() {
- // Also verify weaks - all should have been processed at this point.
+ // Verify all roots and all references
+ ZStatTimerDisable disable;
roots_and_objects(true /* verify_weaks */);
}
-
-template <bool VisitReferents>
-void ZVerifyOopClosure<VisitReferents>::do_oop(oop* p) {
- guarantee(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
- guarantee(ZGlobalPhase == ZPhaseMarkCompleted, "Invalid phase");
- guarantee(!ZResurrection::is_blocked(), "Invalid phase");
-
- const oop o = RawAccess<>::oop_load(p);
- if (o == NULL) {
- return;
- }
-
- const uintptr_t addr = ZOop::to_address(o);
- if (VisitReferents) {
- guarantee(ZAddress::is_good(addr) || ZAddress::is_finalizable_good(addr), BAD_OOP_REPORT(addr));
- } else {
- // Should not encounter finalizable oops through strong-only paths. Assumes only strong roots are visited.
- guarantee(ZAddress::is_good(addr), BAD_OOP_REPORT(addr));
- }
-
- const uintptr_t good_addr = ZAddress::good(addr);
- guarantee(oopDesc::is_oop(ZOop::from_address(good_addr)), BAD_OOP_REPORT(addr));
-}
-
-void ZVerifyObjectClosure::do_object(oop o) {
- if (_visit_referents) {
- ZVerifyOopClosure<true /* VisitReferents */> cl;
- o->oop_iterate((OopIterateClosure*)&cl);
- } else {
- ZVerifyOopClosure<false /* VisitReferents */> cl;
- o->oop_iterate(&cl);
- }
-}
--- a/src/hotspot/share/gc/z/zVerify.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/gc/z/zVerify.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -28,47 +28,21 @@
class ZVerify : public AllStatic {
private:
- template <typename RootsIterator>
- static void roots_impl();
- static void roots(bool verify_weaks);
+ template <typename RootsIterator> static void roots();
+ static void roots_strong();
static void roots_weak();
- static void roots_concurrent();
+ static void roots_concurrent_strong();
static void roots_concurrent_weak();
+ static void roots(bool verify_weaks);
static void objects(bool verify_weaks);
-
- static void roots_and_objects(bool visit_weaks);
+ static void roots_and_objects(bool verify_weaks);
public:
- // Verify strong (non-concurrent) roots. Should always be good.
- static void roots_strong();
-
- // Verify all strong roots and references after marking.
+ static void before_zoperation();
static void after_mark();
-
- // Verify strong and weak roots and references.
static void after_weak_processing();
};
-class VM_ZVerifyOperation : public VM_Operation {
-public:
- virtual bool needs_inactive_gc_locker() const {
- // An inactive GC locker is needed in operations where we change the bad
- // mask or move objects. Changing the bad mask will invalidate all oops,
- // which makes it conceptually the same thing as moving all objects.
- return false;
- }
-
- virtual void doit() {
- ZVerify::after_weak_processing();
- }
-
- bool success() const {
- return true;
- }
-
- virtual VMOp_Type type() const { return VMOp_ZVerify; }
-};
-
#endif // SHARE_GC_Z_ZVERIFY_HPP
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -181,34 +181,33 @@
}
};
-void ObjectSampleCheckpoint::install(JfrCheckpointWriter& writer, bool class_unload) {
+void ObjectSampleCheckpoint::install(JfrCheckpointWriter& writer, bool class_unload, bool type_set) {
if (!writer.has_data()) {
return;
}
assert(writer.has_data(), "invariant");
const JfrCheckpointBlobHandle h_cp = writer.checkpoint_blob();
+ CheckpointInstall install(h_cp);
// Class unload implies a safepoint.
// Not class unload implies the object sampler is locked, because it was claimed exclusively earlier.
// Therefore: direct access the object sampler instance is safe.
- const ObjectSampler* const object_sampler = ObjectSampler::sampler();
+ ObjectSampler* const object_sampler = ObjectSampler::sampler();
assert(object_sampler != NULL, "invariant");
ObjectSample* const last = const_cast<ObjectSample*>(object_sampler->last());
const ObjectSample* const last_resolved = object_sampler->last_resolved();
- CheckpointInstall install(h_cp);
- if (class_unload) {
- // all samples need class unload information
- do_samples(last, NULL, install);
- return;
- }
-
- // only new samples since last resolved checkpoint
+ // install only to new samples since last resolved checkpoint
if (last != last_resolved) {
do_samples(last, last_resolved, install);
- const_cast<ObjectSampler*>(object_sampler)->set_last_resolved(last);
+ if (class_unload) {
+ return;
+ }
+ if (type_set) {
+ object_sampler->set_last_resolved(last);
+ }
}
}
@@ -289,6 +288,6 @@
JfrStackTraceRepository::write_metadata(writer);
// install the stacktrace checkpoint information to the candidates
- ObjectSampleCheckpoint::install(writer, false);
+ ObjectSampleCheckpoint::install(writer, false, false);
return true;
}
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -35,7 +35,7 @@
class ObjectSampleCheckpoint : AllStatic {
public:
- static void install(JfrCheckpointWriter& writer, bool class_unload);
+ static void install(JfrCheckpointWriter& writer, bool class_unload, bool type_set);
static void write(ObjectSampler* sampler, EdgeStore* edge_store, bool emit_all, Thread* thread);
static int mark(ObjectSampler* sampler, ObjectSampleMarker& marker, bool emit_all);
};
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -311,7 +311,7 @@
if (LeakProfiler::is_running()) {
JfrCheckpointWriter leakp_writer(false, true, Thread::current());
type_set.write(writer, &leakp_writer);
- ObjectSampleCheckpoint::install(leakp_writer, true);
+ ObjectSampleCheckpoint::install(leakp_writer, true, true);
return;
}
type_set.write(writer, NULL);
@@ -322,7 +322,7 @@
if (LeakProfiler::is_running()) {
JfrCheckpointWriter leakp_writer(false, true, Thread::current());
type_set.write(writer, &leakp_writer);
- ObjectSampleCheckpoint::install(leakp_writer, false);
+ ObjectSampleCheckpoint::install(leakp_writer, false, true);
return;
}
type_set.write(writer, NULL);
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -27,7 +27,6 @@
#include "jfr/utilities/jfrTypes.hpp"
#include "runtime/atomic.hpp"
-#include "runtime/orderAccess.hpp"
#include "utilities/macros.hpp"
#ifdef VM_LITTLE_ENDIAN
@@ -40,46 +39,45 @@
inline void set_bits(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
- const jbyte current = OrderAccess::load_acquire(dest);
- if (bits != (current & bits)) {
+ if (bits != (*dest & bits)) {
*dest |= bits;
}
}
-inline void set_mask(jbyte mask, jbyte* const dest) {
- assert(dest != NULL, "invariant");
- const jbyte current = OrderAccess::load_acquire(dest);
- if (mask != (current & mask)) {
- *dest &= mask;
- }
+inline jbyte traceid_and(jbyte current, jbyte bits) {
+ return current & bits;
+}
+
+inline jbyte traceid_or(jbyte current, jbyte bits) {
+ return current | bits;
}
-inline void set_bits_cas(jbyte bits, jbyte* const dest) {
+inline jbyte traceid_xor(jbyte current, jbyte bits) {
+ return current ^ bits;
+}
+
+template <jbyte op(jbyte, jbyte)>
+inline void set_bits_cas_form(jbyte bits, jbyte* const dest) {
assert(dest != NULL, "invariant");
do {
- const jbyte current = OrderAccess::load_acquire(dest);
- if (bits == (current & bits)) {
- return;
- }
- const jbyte new_value = current | bits;
+ const jbyte current = *dest;
+ const jbyte new_value = op(current, bits);
if (Atomic::cmpxchg(new_value, dest, current) == current) {
return;
}
} while (true);
}
+inline void set_bits_cas(jbyte bits, jbyte* const dest) {
+ set_bits_cas_form<traceid_or>(bits, dest);
+}
+
inline void clear_bits_cas(jbyte bits, jbyte* const dest) {
- assert(dest != NULL, "invariant");
- do {
- const jbyte current = OrderAccess::load_acquire(dest);
- if (bits != (current & bits)) {
- return;
- }
- const jbyte new_value = current ^ bits;
- if (Atomic::cmpxchg(new_value, dest, current) == current) {
- return;
- }
- } while (true);
+ set_bits_cas_form<traceid_xor>(bits, dest);
+}
+
+inline void set_mask(jbyte mask, jbyte* const dest) {
+ set_bits_cas_form<traceid_and>(mask, dest);
}
inline void set_traceid_bits(jbyte bits, traceid* dest) {
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -108,7 +108,7 @@
#define SET_USED_THIS_EPOCH(ptr) (SET_TAG(ptr, IN_USE_THIS_EPOCH_BIT))
#define SET_USED_PREV_EPOCH(ptr) (SET_TAG_CAS(ptr, IN_USE_PREV_EPOCH_BIT))
#define SET_LEAKP_USED_THIS_EPOCH(ptr) (SET_LEAKP_TAG(ptr, IN_USE_THIS_EPOCH_BIT))
-#define SET_LEAKP_USED_PREV_EPOCH(ptr) (SET_LEAKP_TAG(ptr, IN_USE_PREV_EPOCH_BIT))
+#define SET_LEAKP_USED_PREV_EPOCH(ptr) (SET_LEAKP_TAG_CAS(ptr, IN_USE_PREV_EPOCH_BIT))
#define SET_METHOD_AND_CLASS_USED_THIS_EPOCH(kls) (SET_TAG(kls, METHOD_AND_CLASS_IN_USE_THIS_EPOCH_BITS))
#define USED_THIS_EPOCH(ptr) (((ptr)->trace_id() & IN_USE_THIS_EPOCH_BIT) != 0)
--- a/src/hotspot/share/opto/c2_globals.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/c2_globals.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -107,9 +107,6 @@
notproduct(bool, PrintOptoInlining, false, \
"Print compiler2 inlining decisions") \
\
- notproduct(bool, VerifyOpto, false, \
- "Apply more time consuming verification during compilation") \
- \
notproduct(bool, VerifyIdealNodeCount, false, \
"Verify that tracked dead ideal node count is accurate") \
\
@@ -513,7 +510,7 @@
"Sets max value cached by the java.lang.Integer autobox cache") \
range(0, max_jint) \
\
- experimental(bool, AggressiveUnboxing, true, \
+ experimental(bool, AggressiveUnboxing, false, \
"Control optimizations for aggressive boxing elimination") \
\
develop(bool, TracePostallocExpand, false, "Trace expanding nodes after" \
--- a/src/hotspot/share/opto/chaitin.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/chaitin.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1190,7 +1190,7 @@
while ((neighbor = elements.next()) != 0) {
LRG *n = &lrgs(neighbor);
#ifdef ASSERT
- if( VerifyOpto || VerifyRegisterAllocator ) {
+ if (VerifyRegisterAllocator) {
assert( _ifg->effective_degree(neighbor) == n->degree(), "" );
}
#endif
--- a/src/hotspot/share/opto/ifnode.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/ifnode.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1480,12 +1480,6 @@
if (TraceIterativeGVN) {
tty->print(" Removing IfNode: "); this->dump();
}
- if (VerifyOpto && !igvn->allow_progress()) {
- // Found an equivalent dominating test,
- // we can not guarantee reaching a fix-point for these during iterativeGVN
- // since intervening nodes may not change.
- return NULL;
- }
#endif
igvn->hash_delete(this); // Remove self to prevent spurious V-N
--- a/src/hotspot/share/opto/indexSet.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/indexSet.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -211,20 +211,10 @@
// Individual IndexSets can be placed on a free list. This is done in PhaseLive.
IndexSet *next() {
-#ifdef ASSERT
- if( VerifyOpto ) {
- check_watch("removed from free list?", ((_next == NULL) ? 0 : _next->_serial_number));
- }
-#endif
return _next;
}
void set_next(IndexSet *next) {
-#ifdef ASSERT
- if( VerifyOpto ) {
- check_watch("put on free list?", ((next == NULL) ? 0 : next->_serial_number));
- }
-#endif
_next = next;
}
@@ -239,10 +229,6 @@
// Set a block in the top level array
void set_block(uint index, BitBlock *block) {
-#ifdef ASSERT
- if( VerifyOpto )
- check_watch("set block", index);
-#endif
_blocks[index] = block;
}
@@ -259,10 +245,6 @@
//-------------------------- Primitive set operations --------------------------
void clear() {
-#ifdef ASSERT
- if( VerifyOpto )
- check_watch("clear");
-#endif
_count = 0;
for (uint i = 0; i < _max_blocks; i++) {
BitBlock *block = _blocks[i];
@@ -281,10 +263,6 @@
}
bool insert(uint element) {
-#ifdef ASSERT
- if( VerifyOpto )
- check_watch("insert", element);
-#endif
if (element == 0) {
return 0;
}
@@ -300,11 +278,6 @@
}
bool remove(uint element) {
-#ifdef ASSERT
- if( VerifyOpto )
- check_watch("remove", element);
-#endif
-
BitBlock *block = get_block_containing(element);
bool present = block->remove(element);
if (present) {
--- a/src/hotspot/share/opto/live.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/live.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -383,7 +383,7 @@
// Verify that graphs and base pointers are still sane.
void PhaseChaitin::verify( ResourceArea *a, bool verify_ifg ) const {
#ifdef ASSERT
- if( VerifyOpto || VerifyRegisterAllocator ) {
+ if (VerifyRegisterAllocator) {
_cfg.verify();
verify_base_ptrs(a);
if(verify_ifg)
--- a/src/hotspot/share/opto/loopopts.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/loopopts.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1427,9 +1427,8 @@
// Some institutional knowledge is needed here: 'x' is
// yanked because if the optimizer runs GVN on it all the
// cloned x's will common up and undo this optimization and
- // be forced back in the loop. This is annoying because it
- // makes +VerifyOpto report false-positives on progress. I
- // tried setting control edges on the x's to force them to
+ // be forced back in the loop.
+ // I tried setting control edges on the x's to force them to
// not combine, but the matching gets worried when it tries
// to fold a StoreP and an AddP together (as part of an
// address expression) and the AddP and StoreP have
--- a/src/hotspot/share/opto/macro.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/macro.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -348,6 +348,7 @@
}
Node* res = NULL;
if (ac->is_clonebasic()) {
+ assert(ac->in(ArrayCopyNode::Src) != ac->in(ArrayCopyNode::Dest), "clone source equals destination");
Node* base = ac->in(ArrayCopyNode::Src)->in(AddPNode::Base);
Node* adr = _igvn.transform(new AddPNode(base, base, MakeConX(offset)));
const TypePtr* adr_type = _igvn.type(base)->is_ptr()->add_offset(offset);
@@ -355,7 +356,7 @@
} else {
if (ac->modifies(offset, offset, &_igvn, true)) {
assert(ac->in(ArrayCopyNode::Dest) == alloc->result_cast(), "arraycopy destination should be allocation's result");
- uint shift = exact_log2(type2aelembytes(bt));
+ uint shift = exact_log2(type2aelembytes(bt));
Node* diff = _igvn.transform(new SubINode(ac->in(ArrayCopyNode::SrcPos), ac->in(ArrayCopyNode::DestPos)));
#ifdef _LP64
diff = _igvn.transform(new ConvI2LNode(diff));
@@ -366,6 +367,10 @@
Node* base = ac->in(ArrayCopyNode::Src);
Node* adr = _igvn.transform(new AddPNode(base, base, off));
const TypePtr* adr_type = _igvn.type(base)->is_ptr()->add_offset(offset);
+ if (ac->in(ArrayCopyNode::Src) == ac->in(ArrayCopyNode::Dest)) {
+ // Don't emit a new load from src if src == dst but try to get the value from memory instead
+ return value_from_mem(ac->in(TypeFunc::Memory), ctl, ft, ftype, adr_type->isa_oopptr(), alloc);
+ }
res = LoadNode::make(_igvn, ctl, mem, adr, adr_type, type, bt, MemNode::unordered, LoadNode::UnknownControl);
}
}
@@ -497,7 +502,6 @@
Arena *a = Thread::current()->resource_area();
VectorSet visited(a);
-
bool done = sfpt_mem == alloc_mem;
Node *mem = sfpt_mem;
while (!done) {
--- a/src/hotspot/share/opto/node.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/node.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1308,8 +1308,7 @@
// Con's are a popular node to re-hit in the hash table again.
if( dead->is_Con() ) return;
- // Can't put ResourceMark here since igvn->_worklist uses the same arena
- // for verify pass with +VerifyOpto and we add/remove elements in it here.
+ ResourceMark rm;
Node_List nstack(Thread::current()->resource_area());
Node *top = igvn->C->top();
--- a/src/hotspot/share/opto/phaseX.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/phaseX.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -240,12 +240,6 @@
k = _table[key]; // Get hashed value
if( !k ) { // Miss?
NOT_PRODUCT( _delete_misses++ );
-#ifdef ASSERT
- if( VerifyOpto ) {
- for( uint i=0; i < _max; i++ )
- assert( _table[i] != n, "changed edges with rehashing" );
- }
-#endif
return false; // Miss! Not in chain
}
else if( n == k ) {
@@ -707,13 +701,6 @@
NOT_PRODUCT( clear_new_values(); )
}
-//------------------------------PhaseValues------------------------------------
-// Used by +VerifyOpto. Clear out hash table but copy _types array.
-PhaseValues::PhaseValues( PhaseValues *ptv, const char *dummy ) : PhaseTransform( ptv, GVN ),
- _table(ptv->arena(),ptv->_table.size()) {
- NOT_PRODUCT( clear_new_values(); )
-}
-
//------------------------------~PhaseValues-----------------------------------
#ifndef PRODUCT
PhaseValues::~PhaseValues() {
@@ -949,14 +936,6 @@
//=============================================================================
//------------------------------PhaseIterGVN-----------------------------------
-// Initialize hash table to fresh and clean for +VerifyOpto
-PhaseIterGVN::PhaseIterGVN( PhaseIterGVN *igvn, const char *dummy ) : PhaseGVN(igvn,dummy),
- _delay_transform(false),
- _stack(C->live_nodes() >> 1),
- _worklist( ) {
-}
-
-//------------------------------PhaseIterGVN-----------------------------------
// Initialize with previous PhaseIterGVN info; used by PhaseCCP
PhaseIterGVN::PhaseIterGVN( PhaseIterGVN *igvn ) : PhaseGVN(igvn),
_delay_transform(igvn->_delay_transform),
@@ -1134,24 +1113,6 @@
#endif
C->verify_graph_edges();
- if( VerifyOpto && allow_progress() ) {
- // Must turn off allow_progress to enable assert and break recursion
- C->root()->verify();
- { // Check if any progress was missed using IterGVN
- // Def-Use info enables transformations not attempted in wash-pass
- // e.g. Region/Phi cleanup, ...
- // Null-check elision -- may not have reached fixpoint
- // do not propagate to dominated nodes
- ResourceMark rm;
- PhaseIterGVN igvn2(this,"Verify"); // Fresh and clean!
- // Fill worklist completely
- igvn2.init_worklist(C->root());
-
- igvn2.set_allow_progress(false);
- igvn2.optimize();
- igvn2.set_allow_progress(true);
- }
- }
if (VerifyIterativeGVN && PrintOpto) {
if (_verify_counter == _verify_full_passes) {
tty->print_cr("VerifyIterativeGVN: %d transforms and verify passes",
@@ -1276,22 +1237,6 @@
assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes");
#ifndef PRODUCT
verify_step(k);
- if (i && VerifyOpto ) {
- if (!allow_progress()) {
- if (i->is_Add() && (i->outcnt() == 1)) {
- // Switched input to left side because this is the only use
- } else if (i->is_If() && (i->in(0) == NULL)) {
- // This IF is dead because it is dominated by an equivalent IF When
- // dominating if changed, info is not propagated sparsely to 'this'
- // Propagating this info further will spuriously identify other
- // progress.
- return i;
- } else
- set_progress();
- } else {
- set_progress();
- }
- }
#endif
while (i != NULL) {
@@ -1318,9 +1263,6 @@
assert(i != k || is_new || (i->outcnt() > 0), "don't return dead nodes");
#ifndef PRODUCT
verify_step(k);
- if (i && VerifyOpto) {
- set_progress();
- }
#endif
}
--- a/src/hotspot/share/opto/phaseX.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/phaseX.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -377,7 +377,6 @@
public:
PhaseValues( Arena *arena, uint est_max_size );
PhaseValues( PhaseValues *pt );
- PhaseValues( PhaseValues *ptv, const char *dummy );
NOT_PRODUCT( ~PhaseValues(); )
virtual PhaseIterGVN *is_IterGVN() { return 0; }
@@ -418,7 +417,6 @@
public:
PhaseGVN( Arena *arena, uint est_max_size ) : PhaseValues( arena, est_max_size ) {}
PhaseGVN( PhaseGVN *gvn ) : PhaseValues( gvn ) {}
- PhaseGVN( PhaseGVN *gvn, const char *dummy ) : PhaseValues( gvn, dummy ) {}
// Return a node which computes the same function as this node, but
// in a faster or cheaper fashion.
@@ -474,7 +472,6 @@
public:
PhaseIterGVN( PhaseIterGVN *igvn ); // Used by CCP constructor
PhaseIterGVN( PhaseGVN *gvn ); // Used after Parser
- PhaseIterGVN( PhaseIterGVN *igvn, const char *dummy ); // Used after +VerifyOpto
// Idealize new Node 'n' with respect to its inputs and its value
virtual Node *transform( Node *a_node );
--- a/src/hotspot/share/opto/runtime.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/opto/runtime.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -1412,7 +1412,7 @@
// However, there needs to be a safepoint check in the middle! So compiled
// safepoints are completely watertight.
//
-// Thus, it cannot be a leaf since it contains the NoGCVerifier.
+// Thus, it cannot be a leaf since it contains the NoSafepointVerifier.
//
// *THIS IS NOT RECOMMENDED PROGRAMMING STYLE*
//
--- a/src/hotspot/share/prims/nativeLookup.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/prims/nativeLookup.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -138,7 +138,7 @@
#endif
};
-static address lookup_special_native(char* jni_name) {
+static address lookup_special_native(const char* jni_name) {
int count = sizeof(lookup_special_native_methods) / sizeof(JNINativeMethod);
for (int i = 0; i < count; i++) {
// NB: To ignore the jni prefix and jni postfix strstr is used matching.
@@ -151,13 +151,8 @@
address NativeLookup::lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style, bool& in_base_library, TRAPS) {
address entry;
- // Compute complete JNI name for style
- stringStream st;
- if (os_style) os::print_jni_name_prefix_on(&st, args_size);
- st.print_raw(pure_name);
- st.print_raw(long_name);
- if (os_style) os::print_jni_name_suffix_on(&st, args_size);
- char* jni_name = st.as_string();
+ const char* jni_name = compute_complete_jni_name(pure_name, long_name, args_size, os_style);
+
// If the loader is null we have a system class, so we attempt a lookup in
// the native Java library. This takes care of any bootstrapping problems.
@@ -205,40 +200,26 @@
return entry;
}
-
-address NativeLookup::lookup_critical_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style) {
- if (!method->has_native_function()) {
- return NULL;
+const char* NativeLookup::compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size, bool os_style) {
+ stringStream st;
+ if (os_style) {
+ os::print_jni_name_prefix_on(&st, args_size);
}
- address current_entry = method->native_function();
-
- char dll_name[JVM_MAXPATHLEN];
- int offset;
- if (os::dll_address_to_library_name(current_entry, dll_name, sizeof(dll_name), &offset)) {
- char ebuf[32];
- void* dll = os::dll_load(dll_name, ebuf, sizeof(ebuf));
- if (dll != NULL) {
- // Compute complete JNI name for style
- stringStream st;
- if (os_style) os::print_jni_name_prefix_on(&st, args_size);
- st.print_raw(pure_name);
- st.print_raw(long_name);
- if (os_style) os::print_jni_name_suffix_on(&st, args_size);
- char* jni_name = st.as_string();
- address critical_entry = (address)os::dll_lookup(dll, jni_name);
- // Close the handle to avoid keeping the library alive if the native method holder is unloaded.
- // This is fine because the library is still kept alive by JNI (see JVM_LoadLibrary). As soon
- // as the holder class and the library are unloaded (see JVM_UnloadLibrary), the native wrapper
- // that calls 'critical_entry' becomes unreachable and is unloaded as well.
- os::dll_unload(dll);
- return critical_entry;
- }
+ st.print_raw(pure_name);
+ st.print_raw(long_name);
+ if (os_style) {
+ os::print_jni_name_suffix_on(&st, args_size);
}
- return NULL;
+ return st.as_string();
}
+address NativeLookup::lookup_critical_style(void* dll, const char* pure_name, const char* long_name, int args_size, bool os_style) {
+ const char* jni_name = compute_complete_jni_name(pure_name, long_name, args_size, os_style);
+ assert(dll != NULL, "dll must be loaded");
+ return (address)os::dll_lookup(dll, jni_name);
+}
// Check all the formats of native implementation name to see if there is one
// for the specified method.
@@ -286,7 +267,6 @@
}
ResourceMark rm;
- address entry = NULL;
Symbol* signature = method->signature();
for (int end = 0; end < signature->utf8_length(); end++) {
@@ -296,9 +276,6 @@
}
}
- // Compute critical name
- char* critical_name = critical_jni_name(method);
-
// Compute argument size
int args_size = method->size_of_parameters();
for (SignatureStream ss(signature); !ss.at_return_type(); ss.next()) {
@@ -307,25 +284,63 @@
}
}
+ void* dll = dll_load(method);
+ address entry = NULL;
+
+ if (dll != NULL) {
+ entry = lookup_critical_style(dll, method, args_size);
+ // Close the handle to avoid keeping the library alive if the native method holder is unloaded.
+ // This is fine because the library is still kept alive by JNI (see JVM_LoadLibrary). As soon
+ // as the holder class and the library are unloaded (see JVM_UnloadLibrary), the native wrapper
+ // that calls 'critical_entry' becomes unreachable and is unloaded as well.
+ os::dll_unload(dll);
+ }
+
+ return entry; // NULL indicates not found
+}
+
+void* NativeLookup::dll_load(const methodHandle& method) {
+ if (method->has_native_function()) {
+
+ address current_entry = method->native_function();
+
+ char dll_name[JVM_MAXPATHLEN];
+ int offset;
+ if (os::dll_address_to_library_name(current_entry, dll_name, sizeof(dll_name), &offset)) {
+ char ebuf[32];
+ return os::dll_load(dll_name, ebuf, sizeof(ebuf));
+ }
+ }
+
+ return NULL;
+}
+
+address NativeLookup::lookup_critical_style(void* dll, const methodHandle& method, int args_size) {
+ address entry = NULL;
+ const char* critical_name = critical_jni_name(method);
+
// 1) Try JNI short style
- entry = lookup_critical_style(method, critical_name, "", args_size, true);
- if (entry != NULL) return entry;
+ entry = lookup_critical_style(dll, critical_name, "", args_size, true);
+ if (entry != NULL) {
+ return entry;
+ }
- // Compute long name
- char* long_name = long_jni_name(method);
+ const char* long_name = long_jni_name(method);
// 2) Try JNI long style
- entry = lookup_critical_style(method, critical_name, long_name, args_size, true);
- if (entry != NULL) return entry;
+ entry = lookup_critical_style(dll, critical_name, long_name, args_size, true);
+ if (entry != NULL) {
+ return entry;
+ }
// 3) Try JNI short style without os prefix/suffix
- entry = lookup_critical_style(method, critical_name, "", args_size, false);
- if (entry != NULL) return entry;
+ entry = lookup_critical_style(dll, critical_name, "", args_size, false);
+ if (entry != NULL) {
+ return entry;
+ }
// 4) Try JNI long style without os prefix/suffix
- entry = lookup_critical_style(method, critical_name, long_name, args_size, false);
-
- return entry; // NULL indicates not found
+ return lookup_critical_style(dll, critical_name, long_name, args_size, false);
}
// Check if there are any JVM TI prefixes which have been applied to the native method name.
--- a/src/hotspot/share/prims/nativeLookup.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/prims/nativeLookup.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -35,10 +35,14 @@
private:
// Style specific lookup
static address lookup_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style, bool& in_base_library, TRAPS);
- static address lookup_critical_style(const methodHandle& method, char* pure_name, const char* long_name, int args_size, bool os_style);
+ static address lookup_critical_style(void* dll, const char* pure_name, const char* long_name, int args_size, bool os_style);
+ static address lookup_critical_style(void* dll, const methodHandle& method, int args_size);
static address lookup_base (const methodHandle& method, bool& in_base_library, TRAPS);
static address lookup_entry(const methodHandle& method, bool& in_base_library, TRAPS);
static address lookup_entry_prefixed(const methodHandle& method, bool& in_base_library, TRAPS);
+
+ static void* dll_load(const methodHandle& method);
+ static const char* compute_complete_jni_name(const char* pure_name, const char* long_name, int args_size, bool os_style);
public:
// JNI name computation
static char* pure_jni_name(const methodHandle& method);
--- a/src/hotspot/share/runtime/arguments.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/arguments.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -537,6 +537,8 @@
{ "ThreadLocalHandshakes", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
{ "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
{ "FlightRecorder", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
+ { "FieldsAllocationStyle", JDK_Version::jdk(14), JDK_Version::jdk(15), JDK_Version::jdk(16) },
+ { "CompactFields", JDK_Version::jdk(14), JDK_Version::jdk(15), JDK_Version::jdk(16) },
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
{ "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
--- a/src/hotspot/share/runtime/globals.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/globals.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -398,10 +398,6 @@
"Set when executing debug methods in debug.cpp " \
"(to prevent triggering assertions)") \
\
- notproduct(bool, StrictSafepointChecks, trueInDebug, \
- "Enable strict checks that safepoints cannot happen for threads " \
- "that use NoSafepointVerifier") \
- \
notproduct(bool, VerifyLastFrame, false, \
"Verify oops on last frame on entry to VM") \
\
@@ -792,13 +788,14 @@
"Use SSE2 MOVQ instruction for Arraycopy") \
\
product(intx, FieldsAllocationStyle, 1, \
- "0 - type based with oops first, " \
+ "(Deprecated) 0 - type based with oops first, " \
"1 - with oops last, " \
"2 - oops in super and sub classes are together") \
range(0, 2) \
\
product(bool, CompactFields, true, \
- "Allocate nonstatic fields in gaps between previous fields") \
+ "(Deprecated) Allocate nonstatic fields in gaps " \
+ "between previous fields") \
\
notproduct(bool, PrintFieldLayout, false, \
"Print field layout for each class") \
@@ -1772,13 +1769,13 @@
range(0, 100) \
\
/* AOT parameters */ \
- product(bool, UseAOT, AOT_ONLY(true) NOT_AOT(false), \
+ experimental(bool, UseAOT, false, \
"Use AOT compiled files") \
\
- product(ccstrlist, AOTLibrary, NULL, \
+ experimental(ccstrlist, AOTLibrary, NULL, \
"AOT library") \
\
- product(bool, PrintAOT, false, \
+ experimental(bool, PrintAOT, false, \
"Print used AOT klasses and methods") \
\
notproduct(bool, PrintAOTStatistics, false, \
@@ -2339,11 +2336,11 @@
product(uintx, StringTableSize, defaultStringTableSize, \
"Number of buckets in the interned String table " \
"(will be rounded to nearest higher power of 2)") \
- range(minimumStringTableSize, 16777216ul) \
+ range(minimumStringTableSize, 16777216ul /* 2^24 */) \
\
experimental(uintx, SymbolTableSize, defaultSymbolTableSize, \
"Number of buckets in the JVM internal Symbol table") \
- range(minimumSymbolTableSize, 111*defaultSymbolTableSize) \
+ range(minimumSymbolTableSize, 16777216ul /* 2^24 */) \
\
product(bool, UseStringDeduplication, false, \
"Use string deduplication") \
@@ -2364,6 +2361,7 @@
\
experimental(intx, SurvivorAlignmentInBytes, 0, \
"Default survivor space alignment in bytes") \
+ range(8, 256) \
constraint(SurvivorAlignmentInBytesConstraintFunc,AfterErgo) \
\
product(ccstr, DumpLoadedClassList, NULL, \
--- a/src/hotspot/share/runtime/interfaceSupport.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/interfaceSupport.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -73,6 +73,14 @@
}
}
+VMNativeEntryWrapper::VMNativeEntryWrapper() {
+ if (GCALotAtAllSafepoints) InterfaceSupport::check_gc_alot();
+}
+
+VMNativeEntryWrapper::~VMNativeEntryWrapper() {
+ if (GCALotAtAllSafepoints) InterfaceSupport::check_gc_alot();
+}
+
long InterfaceSupport::_number_of_calls = 0;
long InterfaceSupport::_scavenge_alot_counter = 1;
long InterfaceSupport::_fullgc_alot_counter = 1;
@@ -292,40 +300,3 @@
}
#endif
}
-
-#ifdef ASSERT
-// JRT_LEAF rules:
-// A JRT_LEAF method may not interfere with safepointing by
-// 1) acquiring or blocking on a Mutex or JavaLock - checked
-// 2) allocating heap memory - checked
-// 3) executing a VM operation - checked
-// 4) executing a system call (including malloc) that could block or grab a lock
-// 5) invoking GC
-// 6) reaching a safepoint
-// 7) running too long
-// Nor may any method it calls.
-JRTLeafVerifier::JRTLeafVerifier()
- : NoSafepointVerifier(true, JRTLeafVerifier::should_verify_GC())
-{
-}
-
-JRTLeafVerifier::~JRTLeafVerifier()
-{
-}
-
-bool JRTLeafVerifier::should_verify_GC() {
- switch (JavaThread::current()->thread_state()) {
- case _thread_in_Java:
- // is in a leaf routine, there must be no safepoint.
- return true;
- case _thread_in_native:
- // A native thread is not subject to safepoints.
- // Even while it is in a leaf routine, GC is ok
- return false;
- default:
- // Leaf routines cannot be called from other contexts.
- ShouldNotReachHere();
- return false;
- }
-}
-#endif // ASSERT
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -327,7 +327,7 @@
}
};
-// Debug class instantiated in JRT_ENTRY and ITR_ENTRY macro.
+// Debug class instantiated in JRT_ENTRY macro.
// Can be used to verify properties on enter/exit of the VM.
#ifdef ASSERT
@@ -340,45 +340,17 @@
class VMNativeEntryWrapper {
public:
- VMNativeEntryWrapper() {
- if (GCALotAtAllSafepoints) InterfaceSupport::check_gc_alot();
- }
-
- ~VMNativeEntryWrapper() {
- if (GCALotAtAllSafepoints) InterfaceSupport::check_gc_alot();
- }
+ VMNativeEntryWrapper();
+ ~VMNativeEntryWrapper();
};
-#endif
-
-
-// VM-internal runtime interface support
-
-// Definitions for JRT (Java (Compiler/Shared) Runtime)
-
-// JRT_LEAF currently can be called from either _thread_in_Java or
-// _thread_in_native mode. In _thread_in_native, it is ok
-// for another thread to trigger GC. The rest of the JRT_LEAF
-// rules apply.
-class JRTLeafVerifier : public NoSafepointVerifier {
- static bool should_verify_GC();
- public:
-#ifdef ASSERT
- JRTLeafVerifier();
- ~JRTLeafVerifier();
-#else
- JRTLeafVerifier() {}
- ~JRTLeafVerifier() {}
-#endif
-};
-
-#ifdef ASSERT
-
class RuntimeHistogramElement : public HistogramElement {
public:
RuntimeHistogramElement(const char* name);
};
+#endif // ASSERT
+#ifdef ASSERT
#define TRACE_CALL(result_type, header) \
InterfaceSupport::_number_of_calls++; \
if (CountRuntimeCalls) { \
@@ -388,7 +360,7 @@
#else
#define TRACE_CALL(result_type, header) \
/* do nothing */
-#endif
+#endif // ASSERT
// LEAF routines do not lock, GC or throw exceptions
@@ -434,11 +406,24 @@
VM_ENTRY_BASE(result_type, header, thread) \
debug_only(VMEntryWrapper __vew;)
+// JRT_LEAF currently can be called from either _thread_in_Java or
+// _thread_in_native mode.
+//
+// JRT_LEAF rules:
+// A JRT_LEAF method may not interfere with safepointing by
+// 1) acquiring or blocking on a Mutex or JavaLock - checked
+// 2) allocating heap memory - checked
+// 3) executing a VM operation - checked
+// 4) executing a system call (including malloc) that could block or grab a lock
+// 5) invoking GC
+// 6) reaching a safepoint
+// 7) running too long
+// Nor may any method it calls.
#define JRT_LEAF(result_type, header) \
result_type header { \
VM_LEAF_BASE(result_type, header) \
- debug_only(JRTLeafVerifier __jlv;)
+ debug_only(NoSafepointVerifier __nsv;)
#define JRT_ENTRY_NO_ASYNC(result_type, header) \
--- a/src/hotspot/share/runtime/mutex.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/mutex.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -40,6 +40,10 @@
assert(!thread->is_Java_thread() || _safepoint_check_required != not_allowed,
"This lock should %s have a safepoint check for Java threads: %s",
_safepoint_check_required ? "always" : "never", name());
+
+ // If defined with safepoint_check_never, a NonJavaThread should never ask to safepoint check either.
+ assert(thread->is_Java_thread() || !do_safepoint_check || _safepoint_check_required != Monitor::_safepoint_check_never,
+ "NonJavaThread should not check for safepoint");
}
#endif // ASSERT
@@ -53,7 +57,7 @@
}
#endif // CHECK_UNHANDLED_OOPS
- DEBUG_ONLY(check_prelock_state(self, StrictSafepointChecks));
+ DEBUG_ONLY(check_prelock_state(self, true));
assert(_owner != self, "invariant");
Monitor* in_flight_monitor = NULL;
@@ -260,35 +264,24 @@
assert_owner(NULL);
}
-void Monitor::ClearMonitor(Monitor * m, const char *name) {
- m->_owner = NULL;
- if (name == NULL) {
- strcpy(m->_name, "UNKNOWN");
- } else {
- strncpy(m->_name, name, MONITOR_NAME_LEN - 1);
- m->_name[MONITOR_NAME_LEN - 1] = '\0';
- }
-}
-
-Monitor::Monitor() {
- assert(os::mutex_init_done(), "Too early!");
- ClearMonitor(this);
-}
-
-
// Only Threads_lock, Heap_lock and SR_lock may be safepoint_check_sometimes.
bool is_sometimes_ok(const char* name) {
return (strcmp(name, "Threads_lock") == 0 || strcmp(name, "Heap_lock") == 0 || strcmp(name, "SR_lock") == 0);
}
Monitor::Monitor(int Rank, const char * name, bool allow_vm_block,
- SafepointCheckRequired safepoint_check_required) {
+ SafepointCheckRequired safepoint_check_required) : _owner(NULL) {
assert(os::mutex_init_done(), "Too early!");
- ClearMonitor(this, name);
+ if (name == NULL) {
+ strcpy(_name, "UNKNOWN");
+ } else {
+ strncpy(_name, name, MONITOR_NAME_LEN - 1);
+ _name[MONITOR_NAME_LEN - 1] = '\0';
+ }
#ifdef ASSERT
_allow_vm_block = allow_vm_block;
_rank = Rank;
- NOT_PRODUCT(_safepoint_check_required = safepoint_check_required;)
+ _safepoint_check_required = safepoint_check_required;
assert(_safepoint_check_required != Monitor::_safepoint_check_sometimes || is_sometimes_ok(name),
"Lock has _safepoint_check_sometimes %s", name);
@@ -296,17 +289,8 @@
}
Mutex::Mutex(int Rank, const char * name, bool allow_vm_block,
- SafepointCheckRequired safepoint_check_required) {
- ClearMonitor((Monitor *) this, name);
-#ifdef ASSERT
- _allow_vm_block = allow_vm_block;
- _rank = Rank;
- NOT_PRODUCT(_safepoint_check_required = safepoint_check_required;)
-
- assert(_safepoint_check_required != Monitor::_safepoint_check_sometimes || is_sometimes_ok(name),
- "Lock has _safepoint_check_sometimes %s", name);
-#endif
-}
+ SafepointCheckRequired safepoint_check_required) :
+ Monitor(Rank, name, allow_vm_block, safepoint_check_required) {}
bool Monitor::owned_by_self() const {
return _owner == Thread::current();
--- a/src/hotspot/share/runtime/mutex.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/mutex.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -139,10 +139,6 @@
NOT_PRODUCT(SafepointCheckRequired _safepoint_check_required;)
- protected:
- static void ClearMonitor (Monitor * m, const char* name = NULL) ;
- Monitor() ;
-
public:
Monitor(int rank, const char *name, bool allow_vm_block = false,
SafepointCheckRequired safepoint_check_required = _safepoint_check_always);
--- a/src/hotspot/share/runtime/safepointVerifiers.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/safepointVerifiers.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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,56 +23,29 @@
*/
#include "precompiled.hpp"
-#include "runtime/safepointVerifiers.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "memory/universe.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/safepointVerifiers.hpp"
#include "utilities/debug.hpp"
-// Implementation of NoGCVerifier
-
#ifdef ASSERT
-NoGCVerifier::NoGCVerifier(bool verifygc) {
- _verifygc = verifygc;
- if (_verifygc) {
- CollectedHeap* h = Universe::heap();
- assert(!h->is_gc_active(), "GC active during NoGCVerifier");
- _old_invocations = h->total_collections();
- }
+NoSafepointVerifier::NoSafepointVerifier() : _thread(Thread::current()) {
+ _thread->_no_safepoint_count++;
}
-
-NoGCVerifier::~NoGCVerifier() {
- if (_verifygc) {
- CollectedHeap* h = Universe::heap();
- assert(!h->is_gc_active(), "GC active during NoGCVerifier");
- if (_old_invocations != h->total_collections()) {
- fatal("collection in a NoGCVerifier secured function");
- }
- }
+NoSafepointVerifier::~NoSafepointVerifier() {
+ _thread->_no_safepoint_count--;
}
-PauseNoGCVerifier::PauseNoGCVerifier(NoGCVerifier * ngcv) {
- _ngcv = ngcv;
- if (_ngcv->_verifygc) {
- // if we were verifying, then make sure that nothing is
- // wrong before we "pause" verification
- CollectedHeap* h = Universe::heap();
- assert(!h->is_gc_active(), "GC active during NoGCVerifier");
- if (_ngcv->_old_invocations != h->total_collections()) {
- fatal("collection in a NoGCVerifier secured function");
- }
- }
+PauseNoSafepointVerifier::PauseNoSafepointVerifier(NoSafepointVerifier* nsv)
+ : _nsv(nsv) {
+ assert(_nsv->_thread == Thread::current(), "must be");
+ _nsv->_thread->_no_safepoint_count--;
}
-
-PauseNoGCVerifier::~PauseNoGCVerifier() {
- if (_ngcv->_verifygc) {
- // if we were verifying before, then reenable verification
- CollectedHeap* h = Universe::heap();
- assert(!h->is_gc_active(), "GC active during NoGCVerifier");
- _ngcv->_old_invocations = h->total_collections();
- }
+PauseNoSafepointVerifier::~PauseNoSafepointVerifier() {
+ _nsv->_thread->_no_safepoint_count++;
}
-
-#endif
+#endif // ASSERT
--- a/src/hotspot/share/runtime/safepointVerifiers.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/safepointVerifiers.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -28,116 +28,31 @@
#include "memory/allocation.hpp"
#include "runtime/thread.hpp"
-// A NoGCVerifier object can be placed in methods where one assumes that
-// no garbage collection will occur. The destructor will verify this property
-// unless the constructor is called with argument false (not verifygc).
-//
-// The check will only be done in debug mode and if verifygc true.
-
-class NoGCVerifier: public StackObj {
- friend class PauseNoGCVerifier;
-
- protected:
- bool _verifygc;
- unsigned int _old_invocations;
-
- public:
-#ifdef ASSERT
- NoGCVerifier(bool verifygc = true);
- ~NoGCVerifier();
-#else
- NoGCVerifier(bool verifygc = true) {}
- ~NoGCVerifier() {}
-#endif
-};
-
-// A PauseNoGCVerifier is used to temporarily pause the behavior
-// of a NoGCVerifier object. If we are not in debug mode or if the
-// NoGCVerifier object has a _verifygc value of false, then there
-// is nothing to do.
-
-class PauseNoGCVerifier: public StackObj {
- private:
- NoGCVerifier * _ngcv;
-
- public:
-#ifdef ASSERT
- PauseNoGCVerifier(NoGCVerifier * ngcv);
- ~PauseNoGCVerifier();
-#else
- PauseNoGCVerifier(NoGCVerifier * ngcv) {}
- ~PauseNoGCVerifier() {}
-#endif
-};
-
-
// A NoSafepointVerifier object will throw an assertion failure if
// the current thread passes a possible safepoint while this object is
// instantiated. A safepoint, will either be: an oop allocation, blocking
// on a Mutex or JavaLock, or executing a VM operation.
//
-// If StrictSafepointChecks is turned off, it degrades into a NoGCVerifier
-//
-class NoSafepointVerifier : public NoGCVerifier {
+class NoSafepointVerifier : public StackObj {
friend class PauseNoSafepointVerifier;
private:
- bool _activated;
Thread *_thread;
public:
-#ifdef ASSERT
- NoSafepointVerifier(bool activated = true, bool verifygc = true ) :
- NoGCVerifier(verifygc),
- _activated(activated) {
- _thread = Thread::current();
- if (_activated) {
- _thread->_allow_safepoint_count++;
- }
- }
-
- ~NoSafepointVerifier() {
- if (_activated) {
- _thread->_allow_safepoint_count--;
- }
- }
-#else
- NoSafepointVerifier(bool activated = true, bool verifygc = true) : NoGCVerifier(verifygc){}
- ~NoSafepointVerifier() {}
-#endif
+ NoSafepointVerifier() NOT_DEBUG_RETURN;
+ ~NoSafepointVerifier() NOT_DEBUG_RETURN;
};
// A PauseNoSafepointVerifier is used to temporarily pause the
-// behavior of a NoSafepointVerifier object. If we are not in debug
-// mode then there is nothing to do. If the NoSafepointVerifier
-// object has an _activated value of false, then there is nothing to
-// do for safepoint and allocation checking, but there may still be
-// something to do for the underlying NoGCVerifier object.
+// behavior of a NoSafepointVerifier object.
-class PauseNoSafepointVerifier : public PauseNoGCVerifier {
+class PauseNoSafepointVerifier : public StackObj {
private:
- NoSafepointVerifier * _nsv;
+ NoSafepointVerifier* _nsv;
public:
-#ifdef ASSERT
- PauseNoSafepointVerifier(NoSafepointVerifier * nsv)
- : PauseNoGCVerifier(nsv) {
-
- _nsv = nsv;
- if (_nsv->_activated) {
- _nsv->_thread->_allow_safepoint_count--;
- }
- }
-
- ~PauseNoSafepointVerifier() {
- if (_nsv->_activated) {
- _nsv->_thread->_allow_safepoint_count++;
- }
- }
-#else
- PauseNoSafepointVerifier(NoSafepointVerifier * nsv)
- : PauseNoGCVerifier(nsv) {}
- ~PauseNoSafepointVerifier() {}
-#endif
+ PauseNoSafepointVerifier(NoSafepointVerifier* nsv) NOT_DEBUG_RETURN;
+ ~PauseNoSafepointVerifier() NOT_DEBUG_RETURN;
};
#endif // SHARE_RUNTIME_SAFEPOINTVERIFIERS_HPP
--- a/src/hotspot/share/runtime/synchronizer.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/synchronizer.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -442,7 +442,7 @@
ObjectLocker::ObjectLocker(Handle obj, Thread* thread, bool doLock) {
_dolock = doLock;
_thread = thread;
- debug_only(if (StrictSafepointChecks) _thread->check_for_valid_safepoint_state(false);)
+ _thread->check_for_valid_safepoint_state(false);
_obj = obj;
if (_dolock) {
--- a/src/hotspot/share/runtime/thread.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/thread.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -250,7 +250,7 @@
// plain initialization
debug_only(_owned_locks = NULL;)
- NOT_PRODUCT(_allow_safepoint_count = 0;)
+ NOT_PRODUCT(_no_safepoint_count = 0;)
NOT_PRODUCT(_skip_gcalot = false;)
_jvmti_env_iteration_count = 0;
set_allocated_bytes(0);
@@ -1020,7 +1020,7 @@
// no locks which allow_vm_block's are held
void Thread::check_for_valid_safepoint_state(bool potential_vm_operation) {
// Check if current thread is allowed to block at a safepoint
- if (!(_allow_safepoint_count == 0)) {
+ if (_no_safepoint_count > 0) {
fatal("Possible safepoint reached by thread that does not allow it");
}
if (is_Java_thread() && ((JavaThread*)this)->thread_state() != _thread_in_vm) {
@@ -3543,7 +3543,7 @@
// All NonJavaThreads (i.e., every non-JavaThread in the system).
void Threads::non_java_threads_do(ThreadClosure* tc) {
- NoSafepointVerifier nsv(!SafepointSynchronize::is_at_safepoint(), false);
+ NoSafepointVerifier nsv;
for (NonJavaThread::Iterator njti; !njti.end(); njti.step()) {
tc->do_thread(njti.current());
}
--- a/src/hotspot/share/runtime/thread.hpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/runtime/thread.hpp Thu Aug 08 17:27:17 2019 -0400
@@ -371,14 +371,15 @@
private:
- // debug support for checking if code does allow safepoints or not
- // GC points in the VM can happen because of allocation, invoking a VM operation, or blocking on
+ // Debug support for checking if code allows safepoints or not.
+ // Safepoints in the VM can happen because of allocation, invoking a VM operation, or blocking on
// mutex, or blocking on an object synchronizer (Java locking).
- // If !allow_safepoint(), then an assertion failure will happen in any of the above cases
+ // If _no_safepoint_count is non-zero, then an assertion failure will happen in any of
+ // the above cases.
//
// The class NoSafepointVerifier is used to set this counter.
//
- NOT_PRODUCT(int _allow_safepoint_count;) // If 0, thread allow a safepoint to happen
+ NOT_PRODUCT(int _no_safepoint_count;) // If 0, thread allow a safepoint to happen
// Used by SkipGCALot class.
NOT_PRODUCT(bool _skip_gcalot;) // Should we elide gc-a-lot?
--- a/src/hotspot/share/utilities/virtualizationSupport.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/src/hotspot/share/utilities/virtualizationSupport.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -40,6 +40,8 @@
static char extended_resource_info_at_startup[600];
void VirtualizationSupport::initialize() {
+ if (!ExtensiveErrorReports) return;
+
// open vmguestlib and bind SDK functions
char ebuf[1024];
dlHandle = os::dll_load("vmGuestLib", ebuf, sizeof ebuf);
--- a/src/java.base/share/classes/java/security/acl/Acl.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-import java.util.Enumeration;
-import java.security.Principal;
-
-/**
- * Interface representing an Access Control List (ACL). An Access
- * Control List is a data structure used to guard access to
- * resources.<p>
- *
- * An ACL can be thought of as a data structure with multiple ACL
- * entries. Each ACL entry, of interface type AclEntry, contains a
- * set of permissions associated with a particular principal. (A
- * principal represents an entity such as an individual user or a
- * group). Additionally, each ACL entry is specified as being either
- * positive or negative. If positive, the permissions are to be
- * granted to the associated principal. If negative, the permissions
- * are to be denied.<p>
- *
- * The ACL Entries in each ACL observe the following rules:
- *
- * <ul> <li>Each principal can have at most one positive ACL entry and
- * one negative entry; that is, multiple positive or negative ACL
- * entries are not allowed for any principal. Each entry specifies
- * the set of permissions that are to be granted (if positive) or
- * denied (if negative).
- *
- * <li>If there is no entry for a particular principal, then the
- * principal is considered to have a null (empty) permission set.
- *
- * <li>If there is a positive entry that grants a principal a
- * particular permission, and a negative entry that denies the
- * principal the same permission, the result is as though the
- * permission was never granted or denied.
- *
- * <li>Individual permissions always override permissions of the
- * group(s) to which the individual belongs. That is, individual
- * negative permissions (specific denial of permissions) override the
- * groups' positive permissions. And individual positive permissions
- * override the groups' negative permissions.
- *
- * </ul>
- *
- * The {@code java.security.acl } package provides the
- * interfaces to the ACL and related data structures (ACL entries,
- * groups, permissions, etc.).<p>
- *
- * The {@code java.security.acl.Acl } interface extends the
- * {@code java.security.acl.Owner } interface. The Owner
- * interface is used to maintain a list of owners for each ACL. Only
- * owners are allowed to modify an ACL. For example, only an owner can
- * call the ACL's {@code addEntry} method to add a new ACL entry
- * to the ACL.
- *
- * @see java.security.acl.AclEntry
- * @see java.security.acl.Owner
- * @see java.security.acl.Acl#getPermissions
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-
-@Deprecated(since="9", forRemoval=true)
-@SuppressWarnings("removal")
-public interface Acl extends Owner {
-
- /**
- * Sets the name of this ACL.
- *
- * @param caller the principal invoking this method. It must be an
- * owner of this ACL.
- *
- * @param name the name to be given to this ACL.
- *
- * @exception NotOwnerException if the caller principal
- * is not an owner of this ACL.
- *
- * @see #getName
- */
- public void setName(Principal caller, String name)
- throws NotOwnerException;
-
- /**
- * Returns the name of this ACL.
- *
- * @return the name of this ACL.
- *
- * @see #setName
- */
- public String getName();
-
- /**
- * Adds an ACL entry to this ACL. An entry associates a principal
- * (e.g., an individual or a group) with a set of
- * permissions. Each principal can have at most one positive ACL
- * entry (specifying permissions to be granted to the principal)
- * and one negative ACL entry (specifying permissions to be
- * denied). If there is already an ACL entry of the same type
- * (negative or positive) already in the ACL, false is returned.
- *
- * @param caller the principal invoking this method. It must be an
- * owner of this ACL.
- *
- * @param entry the ACL entry to be added to this ACL.
- *
- * @return true on success, false if an entry of the same type
- * (positive or negative) for the same principal is already
- * present in this ACL.
- *
- * @exception NotOwnerException if the caller principal
- * is not an owner of this ACL.
- */
- public boolean addEntry(Principal caller, AclEntry entry)
- throws NotOwnerException;
-
- /**
- * Removes an ACL entry from this ACL.
- *
- * @param caller the principal invoking this method. It must be an
- * owner of this ACL.
- *
- * @param entry the ACL entry to be removed from this ACL.
- *
- * @return true on success, false if the entry is not part of this ACL.
- *
- * @exception NotOwnerException if the caller principal is not
- * an owner of this Acl.
- */
- public boolean removeEntry(Principal caller, AclEntry entry)
- throws NotOwnerException;
-
- /**
- * Returns an enumeration for the set of allowed permissions for the
- * specified principal (representing an entity such as an individual or
- * a group). This set of allowed permissions is calculated as
- * follows:
- *
- * <ul>
- *
- * <li>If there is no entry in this Access Control List for the
- * specified principal, an empty permission set is returned.
- *
- * <li>Otherwise, the principal's group permission sets are determined.
- * (A principal can belong to one or more groups, where a group is a
- * group of principals, represented by the Group interface.)
- * The group positive permission set is the union of all
- * the positive permissions of each group that the principal belongs to.
- * The group negative permission set is the union of all
- * the negative permissions of each group that the principal belongs to.
- * If there is a specific permission that occurs in both
- * the positive permission set and the negative permission set,
- * it is removed from both.<p>
- *
- * The individual positive and negative permission sets are also
- * determined. The positive permission set contains the permissions
- * specified in the positive ACL entry (if any) for the principal.
- * Similarly, the negative permission set contains the permissions
- * specified in the negative ACL entry (if any) for the principal.
- * The individual positive (or negative) permission set is considered
- * to be null if there is not a positive (negative) ACL entry for the
- * principal in this ACL.<p>
- *
- * The set of permissions granted to the principal is then calculated
- * using the simple rule that individual permissions always override
- * the group permissions. That is, the principal's individual negative
- * permission set (specific denial of permissions) overrides the group
- * positive permission set, and the principal's individual positive
- * permission set overrides the group negative permission set.
- *
- * </ul>
- *
- * @param user the principal whose permission set is to be returned.
- *
- * @return the permission set specifying the permissions the principal
- * is allowed.
- */
- public Enumeration<Permission> getPermissions(Principal user);
-
- /**
- * Returns an enumeration of the entries in this ACL. Each element in
- * the enumeration is of type AclEntry.
- *
- * @return an enumeration of the entries in this ACL.
- */
- public Enumeration<AclEntry> entries();
-
- /**
- * Checks whether or not the specified principal has the specified
- * permission. If it does, true is returned, otherwise false is returned.
- *
- * More specifically, this method checks whether the passed permission
- * is a member of the allowed permission set of the specified principal.
- * The allowed permission set is determined by the same algorithm as is
- * used by the {@code getPermissions} method.
- *
- * @param principal the principal, assumed to be a valid authenticated
- * Principal.
- *
- * @param permission the permission to be checked for.
- *
- * @return true if the principal has the specified permission, false
- * otherwise.
- *
- * @see #getPermissions
- */
- public boolean checkPermission(Principal principal, Permission permission);
-
- /**
- * Returns a string representation of the
- * ACL contents.
- *
- * @return a string representation of the ACL contents.
- */
- public String toString();
-}
--- a/src/java.base/share/classes/java/security/acl/AclEntry.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-import java.util.Enumeration;
-import java.security.Principal;
-
-/**
- * This is the interface used for representing one entry in an Access
- * Control List (ACL).<p>
- *
- * An ACL can be thought of as a data structure with multiple ACL entry
- * objects. Each ACL entry object contains a set of permissions associated
- * with a particular principal. (A principal represents an entity such as
- * an individual user or a group). Additionally, each ACL entry is specified
- * as being either positive or negative. If positive, the permissions are
- * to be granted to the associated principal. If negative, the permissions
- * are to be denied. Each principal can have at most one positive ACL entry
- * and one negative entry; that is, multiple positive or negative ACL
- * entries are not allowed for any principal.
- *
- * Note: ACL entries are by default positive. An entry becomes a
- * negative entry only if the
- * {@link #setNegativePermissions() setNegativePermissions}
- * method is called on it.
- *
- * @see java.security.acl.Acl
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-@SuppressWarnings("removal")
-public interface AclEntry extends Cloneable {
-
- /**
- * Specifies the principal for which permissions are granted or denied
- * by this ACL entry. If a principal was already set for this ACL entry,
- * false is returned, otherwise true is returned.
- *
- * @param user the principal to be set for this entry.
- *
- * @return true if the principal is set, false if there was
- * already a principal set for this entry.
- *
- * @see #getPrincipal
- */
- public boolean setPrincipal(Principal user);
-
- /**
- * Returns the principal for which permissions are granted or denied by
- * this ACL entry. Returns null if there is no principal set for this
- * entry yet.
- *
- * @return the principal associated with this entry.
- *
- * @see #setPrincipal
- */
- public Principal getPrincipal();
-
- /**
- * Sets this ACL entry to be a negative one. That is, the associated
- * principal (e.g., a user or a group) will be denied the permission set
- * specified in the entry.
- *
- * Note: ACL entries are by default positive. An entry becomes a
- * negative entry only if this {@code setNegativePermissions}
- * method is called on it.
- */
- public void setNegativePermissions();
-
- /**
- * Returns true if this is a negative ACL entry (one denying the
- * associated principal the set of permissions in the entry), false
- * otherwise.
- *
- * @return true if this is a negative ACL entry, false if it's not.
- */
- public boolean isNegative();
-
- /**
- * Adds the specified permission to this ACL entry. Note: An entry can
- * have multiple permissions.
- *
- * @param permission the permission to be associated with
- * the principal in this entry.
- *
- * @return true if the permission was added, false if the
- * permission was already part of this entry's permission set.
- */
- public boolean addPermission(Permission permission);
-
- /**
- * Removes the specified permission from this ACL entry.
- *
- * @param permission the permission to be removed from this entry.
- *
- * @return true if the permission is removed, false if the
- * permission was not part of this entry's permission set.
- */
- public boolean removePermission(Permission permission);
-
- /**
- * Checks if the specified permission is part of the
- * permission set in this entry.
- *
- * @param permission the permission to be checked for.
- *
- * @return true if the permission is part of the
- * permission set in this entry, false otherwise.
- */
- public boolean checkPermission(Permission permission);
-
- /**
- * Returns an enumeration of the permissions in this ACL entry.
- *
- * @return an enumeration of the permissions in this ACL entry.
- */
- public Enumeration<Permission> permissions();
-
- /**
- * Returns a string representation of the contents of this ACL entry.
- *
- * @return a string representation of the contents.
- */
- public String toString();
-
- /**
- * Clones this ACL entry.
- *
- * @return a clone of this ACL entry.
- */
- public Object clone();
-}
--- a/src/java.base/share/classes/java/security/acl/AclNotFoundException.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-/**
- * This is an exception that is thrown whenever a reference is made to a
- * non-existent ACL (Access Control List).
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-public class AclNotFoundException extends Exception {
-
- private static final long serialVersionUID = 5684295034092681791L;
-
- /**
- * Constructs an AclNotFoundException.
- */
- public AclNotFoundException() {
- }
-
-}
--- a/src/java.base/share/classes/java/security/acl/Group.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-import java.util.Enumeration;
-import java.security.Principal;
-
-/**
- * This interface is used to represent a group of principals. (A principal
- * represents an entity such as an individual user or a company). <p>
- *
- * Note that Group extends Principal. Thus, either a Principal or a Group can
- * be passed as an argument to methods containing a Principal parameter. For
- * example, you can add either a Principal or a Group to a Group object by
- * calling the object's {@code addMember} method, passing it the
- * Principal or Group.
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-public interface Group extends Principal {
-
- /**
- * Adds the specified member to the group.
- *
- * @param user the principal to add to this group.
- *
- * @return true if the member was successfully added,
- * false if the principal was already a member.
- */
- public boolean addMember(Principal user);
-
- /**
- * Removes the specified member from the group.
- *
- * @param user the principal to remove from this group.
- *
- * @return true if the principal was removed, or
- * false if the principal was not a member.
- */
- public boolean removeMember(Principal user);
-
- /**
- * Returns true if the passed principal is a member of the group.
- * This method does a recursive search, so if a principal belongs to a
- * group which is a member of this group, true is returned.
- *
- * @param member the principal whose membership is to be checked.
- *
- * @return true if the principal is a member of this group,
- * false otherwise.
- */
- public boolean isMember(Principal member);
-
-
- /**
- * Returns an enumeration of the members in the group.
- * The returned objects can be instances of either Principal
- * or Group (which is a subclass of Principal).
- *
- * @return an enumeration of the group members.
- */
- public Enumeration<? extends Principal> members();
-
-}
--- a/src/java.base/share/classes/java/security/acl/LastOwnerException.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-/**
- * This is an exception that is thrown whenever an attempt is made to delete
- * the last owner of an Access Control List.
- *
- * @see java.security.acl.Owner#deleteOwner
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-public class LastOwnerException extends Exception {
-
- private static final long serialVersionUID = -5141997548211140359L;
-
- /**
- * Constructs a LastOwnerException.
- */
- public LastOwnerException() {
- }
-}
--- a/src/java.base/share/classes/java/security/acl/NotOwnerException.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-/**
- * This is an exception that is thrown whenever the modification of an object
- * (such as an Access Control List) is only allowed to be done by an owner of
- * the object, but the Principal attempting the modification is not an owner.
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-public class NotOwnerException extends Exception {
-
- private static final long serialVersionUID = -5555597911163362399L;
-
- /**
- * Constructs a NotOwnerException.
- */
- public NotOwnerException() {
- }
-}
--- a/src/java.base/share/classes/java/security/acl/Owner.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-import java.security.Principal;
-
-/**
- * Interface for managing owners of Access Control Lists (ACLs) or ACL
- * configurations. (Note that the Acl interface in the
- * {@code java.security.acl} package extends this Owner
- * interface.) The initial owner Principal should be specified as an
- * argument to the constructor of the class implementing this interface.
- *
- * @since 1.1
- * @see java.security.acl.Acl
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-@SuppressWarnings("removal")
-public interface Owner {
-
- /**
- * Adds an owner. Only owners can modify ACL contents. The caller
- * principal must be an owner of the ACL in order to invoke this method.
- * That is, only an owner can add another owner. The initial owner is
- * configured at ACL construction time.
- *
- * @param caller the principal invoking this method. It must be an owner
- * of the ACL.
- *
- * @param owner the owner that should be added to the list of owners.
- *
- * @return true if successful, false if owner is already an owner.
- * @exception NotOwnerException if the caller principal is not an owner
- * of the ACL.
- */
- public boolean addOwner(Principal caller, Principal owner)
- throws NotOwnerException;
-
- /**
- * Deletes an owner. If this is the last owner in the ACL, an exception is
- * raised.<p>
- *
- * The caller principal must be an owner of the ACL in order to invoke
- * this method.
- *
- * @param caller the principal invoking this method. It must be an owner
- * of the ACL.
- *
- * @param owner the owner to be removed from the list of owners.
- *
- * @return true if the owner is removed, false if the owner is not part
- * of the list of owners.
- *
- * @exception NotOwnerException if the caller principal is not an owner
- * of the ACL.
- *
- * @exception LastOwnerException if there is only one owner left, so that
- * deleteOwner would leave the ACL owner-less.
- */
- public boolean deleteOwner(Principal caller, Principal owner)
- throws NotOwnerException, LastOwnerException;
-
- /**
- * Returns true if the given principal is an owner of the ACL.
- *
- * @param owner the principal to be checked to determine whether or not
- * it is an owner.
- *
- * @return true if the passed principal is in the list of owners, false
- * if not.
- */
- public boolean isOwner(Principal owner);
-
-}
--- a/src/java.base/share/classes/java/security/acl/Permission.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security.acl;
-
-
-/**
- * This interface represents a permission, such as that used to grant
- * a particular type of access to a resource.
- *
- * @author Satish Dharmaraj
- * @since 1.1
- *
- * @deprecated This class is deprecated and subject to removal in a future
- * version of Java SE. It has been replaced by {@code java.security.Policy}
- * and related classes since 1.2.
- */
-@Deprecated(since="9", forRemoval=true)
-public interface Permission {
-
- /**
- * Returns true if the object passed matches the permission represented
- * in this interface.
- *
- * @param another the Permission object to compare with.
- *
- * @return true if the Permission objects are equal, false otherwise
- */
- public boolean equals(Object another);
-
- /**
- * Prints a string representation of this permission.
- *
- * @return the string representation of the permission.
- */
- public String toString();
-
-}
--- a/src/java.base/share/classes/java/security/acl/package-info.java Thu Aug 08 17:23:13 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 1998, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * The classes and interfaces in this package have been deprecated. New
- * classes should not be added to this package. The {@code java.security}
- * package contains suitable replacements. See {@link java.security.Policy}
- * and related classes for details. This package is subject to removal in a
- * future version of Java SE.
- *
- * @since 1.1
- */
-package java.security.acl;
--- a/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/security/spec/ECGenParameterSpec.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -45,9 +45,12 @@
* of the provider whose implementation will be used.
*
* @param stdName the standard name of the to-be-generated EC
- * domain parameters.
- * @throws NullPointerException if {@code stdName}
- * is null.
+ * domain parameters. See the ParameterSpec Names section in the
+ * <a href=
+ * "{@docRoot}/../specs/security/standard-names.html#parameterspec-names">
+ * Java Security Standard Algorithm Names Specification</a> for
+ * information about standard names.
+ * @throws NullPointerException if {@code stdName} is null.
*/
public ECGenParameterSpec(String stdName) {
super(stdName);
--- a/src/java.base/share/classes/java/security/spec/NamedParameterSpec.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/security/spec/NamedParameterSpec.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 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
@@ -33,7 +33,7 @@
* parameter set name. For example, NamedParameterSpec.X25519 represents the
* parameter set identified by the string "X25519". These strings are defined
* in the <a href=
- * "{@docRoot}/../specs/security/standard-names.html#parameter-spec-names">
+ * "{@docRoot}/../specs/security/standard-names.html#parameterspec-names">
* Java Security Standard Algorithm Names Specification</a>.
*
* @since 11
@@ -60,10 +60,14 @@
* list of supported names, please consult the documentation
* of the provider whose implementation will be used.
*
- * @param stdName the standard name of the algorithm parameters
+ * @param stdName the standard name of the algorithm parameters. See the
+ * ParameterSpec Names section in the
+ * <a href=
+ * "{@docRoot}/../specs/security/standard-names.html#parameterspec-names">
+ * Java Security Standard Algorithm Names Specification</a> for
+ * information about standard names.
*
- * @throws NullPointerException if {@code stdName}
- * is null.
+ * @throws NullPointerException if {@code stdName} is null.
*/
public NamedParameterSpec(String stdName) {
Objects.requireNonNull(stdName, "stdName must not be null");
--- a/src/java.base/share/classes/java/text/NumberFormat.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/text/NumberFormat.java Thu Aug 08 17:27:17 2019 -0400
@@ -575,6 +575,15 @@
/**
* Returns a currency format for the specified locale.
*
+ * <p>If the specified locale contains the "{@code cf}" (
+ * <a href="https://www.unicode.org/reports/tr35/tr35.html#UnicodeCurrencyFormatIdentifier">
+ * currency format style</a>)
+ * <a href="../util/Locale.html#def_locale_extension">Unicode extension</a>,
+ * the returned currency format uses the style if it is available.
+ * Otherwise, the style uses the default "{@code standard}" currency format.
+ * For example, if the style designates "{@code account}", negative
+ * currency amounts use a pair of parentheses in some locales.
+ *
* @param inLocale the desired locale
* @return the {@code NumberFormat} instance for currency formatting
*/
--- a/src/java.base/share/classes/java/util/Locale.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/util/Locale.java Thu Aug 08 17:27:17 2019 -0400
@@ -929,7 +929,7 @@
* if no locale is explicitly specified. It can be changed using the
* setDefault(Locale.Category, Locale) method.
*
- * @param category - the specified category to get the default locale
+ * @param category the specified category to get the default locale
* @throws NullPointerException if category is null
* @return the default locale for the specified Category for this instance
* of the Java Virtual Machine
@@ -1075,8 +1075,8 @@
* prepared to reinitialize locale-sensitive code running within the
* same Java Virtual Machine.
*
- * @param category - the specified category to set the default locale
- * @param newLocale - the new default locale
+ * @param category the specified category to set the default locale
+ * @param newLocale the new default locale
* @throws SecurityException if a security manager exists and its
* checkPermission method doesn't allow the operation.
* @throws NullPointerException if category and/or newLocale is null
--- a/src/java.base/share/classes/java/util/regex/Pattern.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java Thu Aug 08 17:27:17 2019 -0400
@@ -1506,7 +1506,7 @@
String seq = src.substring(off, j);
String nfd = Normalizer.normalize(seq, Normalizer.Form.NFD);
off = j;
- if (nfd.length() > 1) {
+ if (nfd.codePointCount(0, nfd.length()) > 1) {
ch0 = nfd.codePointAt(0);
ch1 = nfd.codePointAt(Character.charCount(ch0));
if (Character.getType(ch1) == Character.NON_SPACING_MARK) {
--- a/src/java.base/share/classes/java/util/zip/ZipEntry.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/util/zip/ZipEntry.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -522,7 +522,7 @@
* @see #getExtra()
*/
public void setExtra(byte[] extra) {
- setExtra0(extra, false);
+ setExtra0(extra, false, true);
}
/**
@@ -532,8 +532,11 @@
* the extra field data bytes
* @param doZIP64
* if true, set size and csize from ZIP64 fields if present
+ * @param isLOC
+ * true if setting the extra field for a LOC, false if for
+ * a CEN
*/
- void setExtra0(byte[] extra, boolean doZIP64) {
+ void setExtra0(byte[] extra, boolean doZIP64, boolean isLOC) {
if (extra != null) {
if (extra.length > 0xFFFF) {
throw new IllegalArgumentException("invalid extra field length");
@@ -550,15 +553,29 @@
switch (tag) {
case EXTID_ZIP64:
if (doZIP64) {
- // LOC extra zip64 entry MUST include BOTH original
- // and compressed file size fields.
- // If invalid zip64 extra fields, simply skip. Even
- // it's rare, it's possible the entry size happens to
- // be the magic value and it "accidently" has some
- // bytes in extra match the id.
- if (sz >= 16) {
- size = get64(extra, off);
- csize = get64(extra, off + 8);
+ if (isLOC) {
+ // LOC extra zip64 entry MUST include BOTH original
+ // and compressed file size fields.
+ // If invalid zip64 extra fields, simply skip. Even
+ // it's rare, it's possible the entry size happens to
+ // be the magic value and it "accidently" has some
+ // bytes in extra match the id.
+ if (sz >= 16) {
+ size = get64(extra, off);
+ csize = get64(extra, off + 8);
+ }
+ } else {
+ // CEN extra zip64
+ if (size == ZIP64_MAGICVAL) {
+ if (off + 8 > len) // invalid zip64 extra
+ break; // fields, just skip
+ size = get64(extra, off);
+ }
+ if (csize == ZIP64_MAGICVAL) {
+ if (off + 16 > len) // invalid zip64 extra
+ break; // fields, just skip
+ csize = get64(extra, off + 8);
+ }
}
}
break;
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -673,7 +673,7 @@
e.method = CENHOW(cen, pos);
if (elen != 0) {
int start = pos + CENHDR + nlen;
- e.setExtra0(Arrays.copyOfRange(cen, start, start + elen), true);
+ e.setExtra0(Arrays.copyOfRange(cen, start, start + elen), true, false);
}
if (clen != 0) {
int start = pos + CENHDR + nlen + elen;
--- a/src/java.base/share/classes/java/util/zip/ZipInputStream.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/java/util/zip/ZipInputStream.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -321,7 +321,7 @@
byte[] extra = new byte[len];
readFully(extra, 0, len);
e.setExtra0(extra,
- e.csize == ZIP64_MAGICVAL || e.size == ZIP64_MAGICVAL);
+ e.csize == ZIP64_MAGICVAL || e.size == ZIP64_MAGICVAL, true);
}
return e;
}
--- a/src/java.base/share/classes/module-info.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/module-info.java Thu Aug 08 17:27:17 2019 -0400
@@ -96,7 +96,6 @@
exports java.nio.file.attribute;
exports java.nio.file.spi;
exports java.security;
- exports java.security.acl;
exports java.security.cert;
exports java.security.interfaces;
exports java.security.spec;
--- a/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java Thu Aug 08 17:27:17 2019 -0400
@@ -119,20 +119,21 @@
public synchronized long skip(long n) throws IOException {
// special case where the channel is to a file
- if (ch instanceof SeekableByteChannel && n > 0) {
+ if (ch instanceof SeekableByteChannel) {
SeekableByteChannel sbc = (SeekableByteChannel)ch;
- try {
- long pos = sbc.position();
+ long pos = sbc.position();
+ long newPos;
+ if (n > 0) {
+ newPos = pos + n;
long size = sbc.size();
- if (pos >= size) {
- return 0L;
+ if (newPos < 0 || newPos > size) {
+ newPos = size;
}
- n = Math.min(n, size - pos);
- sbc.position(pos + n);
- return sbc.position() - pos;
- } catch (ClosedChannelException cce) {
- throw new IOException(cce);
+ } else {
+ newPos = Long.max(pos + n, 0);
}
+ sbc.position(newPos);
+ return newPos - pos;
}
return super.skip(n);
}
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java Thu Aug 08 17:27:17 2019 -0400
@@ -573,12 +573,8 @@
// we can then pass in the dom = -1, dow > 0 into ZoneInfo
//
// hacking, assume the >=24 is the result of ZRB optimization for
- // "last", it works for now. From tzdata2019a this hacking
- // will not work for Asia/Gaza and Asia/Hebron which follow
- // Palestine DST rules.
- if (dom < 0 || dom >= 24 &&
- !(zoneId.equals("Asia/Gaza") ||
- zoneId.equals("Asia/Hebron"))) {
+ // "last", it works for now.
+ if (dom < 0 || dom >= 24) {
params[1] = -1;
params[2] = toCalendarDOW[dow];
} else {
@@ -613,8 +609,6 @@
dstSavings = (startRule.offsetAfter - startRule.offsetBefore) * 1000;
// Note: known mismatching -> Asia/Amman
- // Asia/Gaza
- // Asia/Hebron
// ZoneInfo : startDayOfWeek=5 <= Thursday
// startTime=86400000 <= 24 hours
// This: startDayOfWeek=6
@@ -623,18 +617,14 @@
// its endDayOfWeek and endTime
// Below is the workarounds, it probably slows down everyone a little
if (params[2] == 6 && params[3] == 0 &&
- (zoneId.equals("Asia/Amman") ||
- zoneId.equals("Asia/Gaza") ||
- zoneId.equals("Asia/Hebron"))) {
+ (zoneId.equals("Asia/Amman"))) {
params[2] = 5;
params[3] = 86400000;
}
// Additional check for startDayOfWeek=6 and starTime=86400000
- // is needed for Asia/Amman; Asia/Gasa and Asia/Hebron
+ // is needed for Asia/Amman;
if (params[2] == 7 && params[3] == 0 &&
- (zoneId.equals("Asia/Amman") ||
- zoneId.equals("Asia/Gaza") ||
- zoneId.equals("Asia/Hebron"))) {
+ (zoneId.equals("Asia/Amman"))) {
params[2] = 6; // Friday
params[3] = 86400000; // 24h
}
--- a/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -63,7 +63,7 @@
private static final int NUMBERSTYLE = 0;
private static final int CURRENCYSTYLE = 1;
private static final int PERCENTSTYLE = 2;
- private static final int SCIENTIFICSTYLE = 3;
+ private static final int ACCOUNTINGSTYLE = 3;
private static final int INTEGERSTYLE = 4;
private final LocaleProviderAdapter.Type type;
@@ -184,6 +184,12 @@
String[] numberPatterns = adapter.getLocaleResources(override).getNumberPatterns();
DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(override);
int entry = (choice == INTEGERSTYLE) ? NUMBERSTYLE : choice;
+ if (choice == CURRENCYSTYLE &&
+ numberPatterns.length > ACCOUNTINGSTYLE &&
+ !numberPatterns[ACCOUNTINGSTYLE].isEmpty() &&
+ "account".equalsIgnoreCase(override.getUnicodeLocaleType("cf"))) {
+ entry = ACCOUNTINGSTYLE;
+ }
DecimalFormat format = new DecimalFormat(numberPatterns[entry], symbols);
if (choice == INTEGERSTYLE) {
--- a/src/java.base/share/lib/security/default.policy Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/share/lib/security/default.policy Thu Aug 08 17:27:17 2019 -0400
@@ -201,8 +201,10 @@
grant codeBase "jrt:/jdk.zipfs" {
permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete";
permission java.lang.RuntimePermission "fileSystemProvider";
+ permission java.lang.RuntimePermission "accessUserInformation";
permission java.util.PropertyPermission "os.name", "read";
permission java.util.PropertyPermission "user.dir", "read";
+ permission java.util.PropertyPermission "user.name", "read";
};
// permissions needed by applications using java.desktop module
--- a/src/java.base/windows/native/libnio/ch/Net.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.base/windows/native/libnio/ch/Net.c Thu Aug 08 17:27:17 2019 -0400
@@ -623,9 +623,6 @@
fd_set rd, wr, ex;
jint fd = fdval(env, fdo);
- t.tv_sec = (long)(timeout / 1000);
- t.tv_usec = (timeout % 1000) * 1000;
-
FD_ZERO(&rd);
FD_ZERO(&wr);
FD_ZERO(&ex);
@@ -638,7 +635,12 @@
}
FD_SET(fd, &ex);
- rv = select(fd+1, &rd, &wr, &ex, &t);
+ if (timeout >= 0) {
+ t.tv_sec = (long)(timeout / 1000);
+ t.tv_usec = (timeout % 1000) * 1000;
+ }
+
+ rv = select(fd+1, &rd, &wr, &ex, (timeout >= 0) ? &t : NULL);
/* save last winsock error */
if (rv == SOCKET_ERROR) {
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java Thu Aug 08 17:27:17 2019 -0400
@@ -535,6 +535,34 @@
}
}
+ private int getBrightness(Color c) {
+ return Math.max(c.getRed(), Math.max(c.getGreen(), c.getBlue()));
+ }
+
+ private int getMaxColorDiff(Color c1, Color c2) {
+ return Math.max(Math.abs(c1.getRed() - c2.getRed()),
+ Math.max(Math.abs(c1.getGreen() - c2.getGreen()),
+ Math.abs(c1.getBlue() - c2.getBlue())));
+ }
+
+ private int scaleColorComponent(int color, double scaleFactor) {
+ return (int)(color + color * scaleFactor);
+ }
+ private Color deriveColor(Color originalColor, int originalBrightness,
+ int targetBrightness) {
+ int r, g, b;
+ if (originalBrightness == 0) {
+ r = g = b = targetBrightness;
+ } else {
+ double scaleFactor = (targetBrightness - originalBrightness)
+ / originalBrightness ;
+ r = scaleColorComponent(originalColor.getRed(), scaleFactor);
+ g = scaleColorComponent(originalColor.getGreen(), scaleFactor);
+ b = scaleColorComponent(originalColor.getBlue(), scaleFactor);
+ }
+ return new Color(r, g, b);
+ }
+
//
// MENU
//
@@ -551,6 +579,57 @@
int gtkState = GTKLookAndFeel.synthStateToGTKState(
context.getRegion(), context.getComponentState());
if (gtkState == SynthConstants.MOUSE_OVER) {
+ if (GTKLookAndFeel.is3() && context.getRegion() == Region.MENU) {
+ GTKStyle style = (GTKStyle)context.getStyle();
+ Color highlightColor = style.getGTKColor(
+ GTKEngine.WidgetType.MENU_ITEM.ordinal(),
+ gtkState, ColorType.BACKGROUND.getID());
+ Color backgroundColor = style.getGTKColor(
+ GTKEngine.WidgetType.MENU_BAR.ordinal(),
+ SynthConstants.ENABLED, ColorType.BACKGROUND.getID());
+
+ int minBrightness = 0, maxBrightness = 255;
+ int minBrightnessDifference = 100;
+ int actualBrightnessDifference =
+ getMaxColorDiff(highlightColor, backgroundColor);
+ if (actualBrightnessDifference < minBrightnessDifference) {
+ int highlightBrightness =
+ getBrightness(highlightColor);
+ int backgroundBrightness =
+ getBrightness(backgroundColor);
+ int originalHighlightBrightness =
+ highlightBrightness;
+ if (highlightBrightness >= backgroundBrightness) {
+ if (backgroundBrightness + minBrightnessDifference <=
+ maxBrightness) {
+ highlightBrightness =
+ backgroundBrightness +
+ minBrightnessDifference;
+ } else {
+ highlightBrightness =
+ backgroundBrightness -
+ minBrightnessDifference;
+ }
+ } else {
+ if (backgroundBrightness - minBrightnessDifference >=
+ minBrightness) {
+ highlightBrightness =
+ backgroundBrightness -
+ minBrightnessDifference;
+ } else {
+ highlightBrightness =
+ backgroundBrightness +
+ minBrightnessDifference;
+ }
+ }
+
+ g.setColor(deriveColor(highlightColor,
+ originalHighlightBrightness,
+ highlightBrightness));
+ g.fillRect(x, y, w, h);
+ return;
+ }
+ }
Region id = Region.MENU_ITEM;
synchronized (UNIXToolkit.GTK_LOCK) {
if (! ENGINE.paintCachedImage(g, x, y, w, h, id)) {
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java Thu Aug 08 17:27:17 2019 -0400
@@ -205,6 +205,14 @@
return getGTKColor(null, state, type);
}
+ Color getGTKColor(int widgetType, int state, int colorType) {
+ synchronized (sun.awt.UNIXToolkit.GTK_LOCK) {
+ int rgb = nativeGetColorForState(widgetType, state,
+ colorType);
+ return new ColorUIResource(rgb);
+ }
+ }
+
/**
* Returns the color for the specified state.
*
--- a/src/java.desktop/share/legal/libpng.md Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/legal/libpng.md Thu Aug 08 17:27:17 2019 -0400
@@ -1,57 +1,87 @@
-## libpng v1.6.35
+## libpng v1.6.37
### libpng License
<pre>
-This copy of the libpng notices is provided for your convenience. In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ * Copyright (c) 1995-2019 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-If you modify libpng you may insert additional notices immediately following
-this sentence.
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement. In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
-This code is released under the libpng license.
+ 1. The origin of this software must not be misrepresented; you
+ must not claim that you wrote the original software. If you
+ use this software in a product, an acknowledgment in the product
+ documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
-libpng versions 1.0.7, July 1, 2000 through 1.6.35, September 29, 2017 are
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors:
- Simon-Pierre Cadieux
- Eric S. Raymond
- Mans Rullgard
- Cosmin Truta
- Gilles Vollant
- James Yu
- Mandar Sahastrabuddhe
- Google Inc.
- Vadim Barkov
+ Simon-Pierre Cadieux
+ Eric S. Raymond
+ Mans Rullgard
+ Cosmin Truta
+ Gilles Vollant
+ James Yu
+ Mandar Sahastrabuddhe
+ Google Inc.
+ Vadim Barkov
and with the following additions to the disclaimer:
- There is no warranty against interference with your enjoyment of the
- library or against infringement. There is no warranty that our
- efforts or the library will fulfill any of your particular purposes
- or needs. This library is provided with all faults, and the entire
- risk of satisfactory quality, performance, accuracy, and effort is with
- the user.
+ There is no warranty against interference with your enjoyment of
+ the library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is
+ with the user.
Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners and
+files that are distributed with libpng have other copyright owners, and
are released under other open source licenses.
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the list
-of Contributing Authors:
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
- Tom Lane
- Glenn Randers-Pehrson
- Willem van Schaik
+ Tom Lane
+ Glenn Randers-Pehrson
+ Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@@ -59,14 +89,14 @@
libpng-0.88, with the following individuals added to the list of
Contributing Authors:
- John Bowler
- Kevin Bracey
- Sam Bushell
- Magnus Holmgren
- Greg Roelofs
- Tom Tanner
+ John Bowler
+ Kevin Bracey
+ Sam Bushell
+ Magnus Holmgren
+ Greg Roelofs
+ Tom Tanner
-Some files in the "scripts" directory have other copyright owners
+Some files in the "scripts" directory have other copyright owners,
but are released under this license.
libpng versions 0.5, May 1995, through 0.88, January 1996, are
@@ -75,38 +105,37 @@
For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:
- Andreas Dilger
- Dave Martindale
- Guy Eric Schalnat
- Paul Schmidt
- Tim Wegner
+ Andreas Dilger
+ Dave Martindale
+ Guy Eric Schalnat
+ Paul Schmidt
+ Tim Wegner
-The PNG Reference Library is supplied "AS IS". The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose. The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
+The PNG Reference Library is supplied "AS IS". The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose. The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
Permission is hereby granted to use, copy, modify, and distribute this
source code, or portions hereof, for any purpose, without fee, subject
to the following restrictions:
- 1. The origin of this source code must not be misrepresented.
+ 1. The origin of this source code must not be misrepresented.
- 2. Altered versions must be plainly marked as such and must not
- be misrepresented as being the original source.
-
- 3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
+ 2. Altered versions must be plainly marked as such and must not
+ be misrepresented as being the original source.
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products. If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
-END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products. If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
</pre>
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES Thu Aug 08 17:27:17 2019 -0400
@@ -6063,9 +6063,47 @@
Added missing parentheses to a macro definition
(suggested by "irwir" in GitHub issue #216)
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
+Version 1.6.36 [December 1, 2018]
+ Optimized png_do_expand_palette for ARM processors.
+ Improved performance by around 10-22% on a recent ARM Chromebook.
+ (Contributed by Richard Townsend, ARM Holdings)
+ Fixed manipulation of machine-specific optimization options.
+ (Contributed by Vicki Pfau)
+ Used memcpy instead of manual pointer arithmetic on Intel SSE2.
+ (Contributed by Samuel Williams)
+ Fixed build errors with MSVC on ARM64.
+ (Contributed by Zhijie Liang)
+ Fixed detection of libm in CMakeLists.
+ (Contributed by Cameron Cawley)
+ Fixed incorrect creation of pkg-config file in CMakeLists.
+ (Contributed by Kyle Bentley)
+ Fixed the CMake build on Windows MSYS by avoiding symlinks.
+ Fixed a build warning on OpenBSD.
+ (Contributed by Theo Buehler)
+ Fixed various typos in comments.
+ (Contributed by "luz.paz")
+ Raised the minimum required CMake version from 3.0.2 to 3.1.
+ Removed yet more of the vestigial support for pre-ANSI C compilers.
+ Removed ancient makefiles for ancient systems that have been broken
+ across all previous libpng-1.6.x versions.
+ Removed the Y2K compliance statement and the export control
+ information.
+ Applied various code style and documentation fixes.
+
+Version 1.6.37 [April 14, 2019]
+ Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free.
+ Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette.
+ Fixed a memory leak in pngtest.c.
+ Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in
+ contrib/pngminus; refactor.
+ Changed the license of contrib/pngminus to MIT; refresh makefile and docs.
+ (Contributed by Willem van Schaik)
+ Fixed a typo in the libpng license v2.
+ (Contributed by Miguel Ojeda)
+ Added makefiles for AddressSanitizer-enabled builds.
+ Cleaned up various makefiles.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
+Subscription is required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe).
-
-Glenn R-P
+to subscribe.
--- a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE Thu Aug 08 17:27:17 2019 -0400
@@ -1,53 +1,82 @@
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
-This copy of the libpng notices is provided for your convenience. In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
+PNG Reference Library License version 2
+---------------------------------------
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ * Copyright (c) 1995-2019 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-If you modify libpng you may insert additional notices immediately following
-this sentence.
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement. In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
-This code is released under the libpng license.
+ 1. The origin of this software must not be misrepresented; you
+ must not claim that you wrote the original software. If you
+ use this software in a product, an acknowledgment in the product
+ documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
-libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
added to the list of Contributing Authors:
- Simon-Pierre Cadieux
- Eric S. Raymond
- Mans Rullgard
- Cosmin Truta
- Gilles Vollant
- James Yu
- Mandar Sahastrabuddhe
- Google Inc.
- Vadim Barkov
+ Simon-Pierre Cadieux
+ Eric S. Raymond
+ Mans Rullgard
+ Cosmin Truta
+ Gilles Vollant
+ James Yu
+ Mandar Sahastrabuddhe
+ Google Inc.
+ Vadim Barkov
and with the following additions to the disclaimer:
- There is no warranty against interference with your enjoyment of the
- library or against infringement. There is no warranty that our
- efforts or the library will fulfill any of your particular purposes
- or needs. This library is provided with all faults, and the entire
- risk of satisfactory quality, performance, accuracy, and effort is with
- the user.
+ There is no warranty against interference with your enjoyment of
+ the library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is
+ with the user.
Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners and
+files that are distributed with libpng have other copyright owners, and
are released under other open source licenses.
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the list
-of Contributing Authors:
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
- Tom Lane
- Glenn Randers-Pehrson
- Willem van Schaik
+ Tom Lane
+ Glenn Randers-Pehrson
+ Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@@ -55,14 +84,14 @@
libpng-0.88, with the following individuals added to the list of
Contributing Authors:
- John Bowler
- Kevin Bracey
- Sam Bushell
- Magnus Holmgren
- Greg Roelofs
- Tom Tanner
+ John Bowler
+ Kevin Bracey
+ Sam Bushell
+ Magnus Holmgren
+ Greg Roelofs
+ Tom Tanner
-Some files in the "scripts" directory have other copyright owners
+Some files in the "scripts" directory have other copyright owners,
but are released under this license.
libpng versions 0.5, May 1995, through 0.88, January 1996, are
@@ -71,63 +100,35 @@
For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:
- Andreas Dilger
- Dave Martindale
- Guy Eric Schalnat
- Paul Schmidt
- Tim Wegner
+ Andreas Dilger
+ Dave Martindale
+ Guy Eric Schalnat
+ Paul Schmidt
+ Tim Wegner
-The PNG Reference Library is supplied "AS IS". The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose. The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
+The PNG Reference Library is supplied "AS IS". The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose. The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
Permission is hereby granted to use, copy, modify, and distribute this
source code, or portions hereof, for any purpose, without fee, subject
to the following restrictions:
- 1. The origin of this source code must not be misrepresented.
-
- 2. Altered versions must be plainly marked as such and must not
- be misrepresented as being the original source.
-
- 3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
+ 1. The origin of this source code must not be misrepresented.
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products. If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
-
-TRADEMARK:
+ 2. Altered versions must be plainly marked as such and must not
+ be misrepresented as being the original source.
-The name "libpng" has not been registered by the Copyright owner
-as a trademark in any jurisdiction. However, because libpng has
-been distributed and maintained world-wide, continually since 1995,
-the Copyright owner claims "common-law trademark protection" in any
-jurisdiction where common-law trademark is recognized.
-
-OSI CERTIFICATION:
-
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
-a certification mark of the Open Source Initiative. OSI has not addressed
-the additional disclaimers inserted at version 1.0.7.
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
-EXPORT CONTROL:
-
-The Copyright owner believes that the Export Control Classification
-Number (ECCN) for libpng is EAR99, which means not subject to export
-controls or International Traffic in Arms Regulations (ITAR) because
-it is open source, publicly available software, that does not contain
-any encryption software. See the EAR, paragraphs 734.3(b)(3) and
-734.7(b).
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-July 15, 2018
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products. If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README Thu Aug 08 17:27:17 2019 -0400
@@ -1,15 +1,16 @@
-README for libpng version 1.6.35 - July 15, 2018 (shared library 16.0)
-See the note about version numbers near the top of png.h
+README for libpng version 1.6.37 - April 14, 2019
+=================================================
+See the note about version numbers near the top of png.h.
See INSTALL for instructions on how to install libpng.
Libpng comes in several distribution formats. Get libpng-*.tar.gz or
-libpng-*.tar.xz or if you want UNIX-style line endings in the text files,
-or lpng*.7z or lpng*.zip if you want DOS-style line endings.
+libpng-*.tar.xz or if you want UNIX-style line endings in the text
+files, or lpng*.7z or lpng*.zip if you want DOS-style line endings.
Version 0.89 was the first official release of libpng. Don't let the
-fact that it's the first release fool you. The libpng library has been in
-extensive use and testing since mid-1995. By late 1997 it had
+fact that it's the first release fool you. The libpng library has been
+in extensive use and testing since mid-1995. By late 1997 it had
finally gotten to the stage where there hadn't been significant
changes to the API in some time, and people have a bad feeling about
libraries with versions < 1.0. Version 1.0.0 was released in
@@ -60,59 +61,37 @@
to set different actions based on whether the CRC error occurred in a
critical or an ancillary chunk.
-The changes made to the library, and bugs fixed are based on discussions
-on the PNG-implement mailing list and not on material submitted
-privately to Guy, Andreas, or Glenn. They will forward any good
-suggestions to the list.
-
-For a detailed description on using libpng, read libpng-manual.txt. For
-examples of libpng in a program, see example.c and pngtest.c. For usage
-information and restrictions (what little they are) on libpng, see
-png.h. For a description on using zlib (the compression library used by
-libpng) and zlib's restrictions, see zlib.h
+For a detailed description on using libpng, read libpng-manual.txt.
+For examples of libpng in a program, see example.c and pngtest.c. For
+usage information and restrictions (what little they are) on libpng,
+see png.h. For a description on using zlib (the compression library
+used by libpng) and zlib's restrictions, see zlib.h
I have included a general makefile, as well as several machine and
-compiler specific ones, but you may have to modify one for your own needs.
+compiler specific ones, but you may have to modify one for your own
+needs.
You should use zlib 1.0.4 or later to run this, but it MAY work with
versions as old as zlib 0.95. Even so, there are bugs in older zlib
versions which can cause the output of invalid compression streams for
-some images. You will definitely need zlib 1.0.4 or later if you are
-taking advantage of the MS-DOS "far" structure allocation for the small
-and medium memory models. You should also note that zlib is a
-compression library that is useful for more things than just PNG files.
-You can use zlib as a drop-in replacement for fread() and fwrite() if
-you are so inclined.
+some images.
-zlib should be available at the same place that libpng is, or at zlib.net.
+You should also note that zlib is a compression library that is useful
+for more things than just PNG files. You can use zlib as a drop-in
+replacement for fread() and fwrite(), if you are so inclined.
+
+zlib should be available at the same place that libpng is, or at
+https://zlib.net.
You may also want a copy of the PNG specification. It is available
as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find
these at http://www.libpng.org/pub/png/pngdocs.html .
This code is currently being archived at libpng.sourceforge.io in the
-[DOWNLOAD] area, and at http://libpng.download/src . If you
-can't find it in any of those places, e-mail me, and I'll help you find it.
-
-I am not a lawyer, but I believe that the Export Control Classification
-Number (ECCN) for libpng is EAR99, which means not subject to export
-controls or International Traffic in Arms Regulations (ITAR) because it
-is open source, publicly available software, that does not contain any
-encryption software. See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
+[DOWNLOAD] area, and at http://libpng.download/src .
-If you have any code changes, requests, problems, etc., please e-mail
-them to me. Also, I'd appreciate any make files or project files,
-and any modifications you needed to make to get libpng to compile,
-along with a #define variable to tell what compiler/system you are on.
-If you needed to add transformations to libpng, or wish libpng would
-provide the image in a different way, drop me a note (and code, if
-possible), so I can consider supporting the transformation.
-Finally, if you get any warning messages when compiling libpng
-(note: not zlib), and they are easy to fix, I'd appreciate the
-fix. Please mention "libpng" somewhere in the subject line. Thanks.
-
-This release was created and will be supported by myself (of course
-based in a large way on Guy's and Andreas' earlier work), and the PNG
+This release, based in a large way on Glenn's, Guy's and Andreas'
+earlier work, was created and will be supported by myself and the PNG
development group.
Send comments/corrections/commendations to png-mng-implement at
@@ -120,34 +99,21 @@
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe).
-You can't reach Guy, the original libpng author, at the addresses
-given in previous versions of this document. He and Andreas will
-read mail addressed to the png-implement list, however.
-
-Please do not send general questions about PNG. Send them to
-png-mng-misc at lists.sf.net (subscription required; visit
+Send general questions about the PNG specification to png-mng-misc
+at lists.sourceforge.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-misc to
-subscribe). If you have a question about something
-in the PNG specification that is related to using libpng, send it
-to me. Send me any questions that start with "I was using libpng,
-and ...". If in doubt, send questions to me. I'll bounce them
-to others, if necessary.
-
-Please do not send suggestions on how to change PNG. We have
-been discussing PNG for twenty years now, and it is official and
-finished. If you have suggestions for libpng, however, I'll
-gladly listen. Even if your suggestion is not used immediately,
-it may be used later.
+subscribe).
Files in this distribution:
ANNOUNCE => Announcement of this version, with recent changes
+ AUTHORS => List of contributing authors
CHANGES => Description of changes between libpng versions
KNOWNBUG => List of known bugs and deficiencies
LICENSE => License to use and redistribute libpng
README => This file
TODO => Things not implemented in the current library
- Y2KINFO => Statement of Y2K compliance
+ TRADEMARK => Trademark information
example.c => Example code for using libpng functions
libpng.3 => manual page for libpng (includes libpng-manual.txt)
libpng-manual.txt => Description of libpng and its functions
@@ -208,15 +174,10 @@
scripts => Directory containing scripts for building libpng:
(see scripts/README.txt for the list of scripts)
-Good luck, and happy coding.
-
--Glenn Randers-Pehrson (current maintainer, since 1998)
- Internet: glennrp at users.sourceforge.net
+Good luck, and happy coding!
--Andreas Eric Dilger (former maintainer, 1996-1997)
- Internet: adilger at enel.ucalgary.ca
- Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/
-
--Guy Eric Schalnat (original author and former maintainer, 1995-1996)
- (formerly of Group 42, Inc)
- Internet: gschal at infinet.com
+ * Cosmin Truta (current maintainer, since 2018)
+ * Glenn Randers-Pehrson (former maintainer, 1998-2018)
+ * Andreas Eric Dilger (former maintainer, 1996-1997)
+ * Guy Eric Schalnat (original author and former maintainer, 1995-1996)
+ (formerly of Group 42, Inc.)
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -42,7 +42,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_35 Your_png_h_is_not_version_1_6_35;
+typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37;
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
@@ -764,7 +764,7 @@
int PNGAPI
png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
{
- static PNG_CONST char short_months[12][4] =
+ static const char short_months[12][4] =
{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
@@ -842,20 +842,14 @@
#ifdef PNG_STRING_COPYRIGHT
return PNG_STRING_COPYRIGHT
#else
-# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.35 - July 15, 2018" PNG_STRING_NEWLINE \
+ "libpng version 1.6.37" PNG_STRING_NEWLINE \
+ "Copyright (c) 2018-2019 Cosmin Truta" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
-# else
- return "libpng version 1.6.35 - July 15, 2018\
- Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson\
- Copyright (c) 1996-1997 Andreas Dilger\
- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-# endif
#endif
}
@@ -1149,7 +1143,7 @@
png_colorspacerp colorspace, png_fixed_point gAMA)
{
/* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
- * occur. Since the fixed point representation is asymetrical it is
+ * occur. Since the fixed point representation is asymmetrical it is
* possible for 1/gamma to overflow the limit of 21474 and this means the
* gamma value must be at least 5/100000 and hence at most 20000.0. For
* safety the limits here are a little narrower. The values are 0.00016 to
@@ -3162,11 +3156,11 @@
/* The total output count (max) is now 4+precision */
/* Check for an exponent, if we don't need one we are
- * done and just need to terminate the string. At
- * this point exp_b10==(-1) is effectively a flag - it got
- * to '-1' because of the decrement after outputting
- * the decimal point above (the exponent required is
- * *not* -1!)
+ * done and just need to terminate the string. At this
+ * point, exp_b10==(-1) is effectively a flag: it got
+ * to '-1' because of the decrement, after outputting
+ * the decimal point above. (The exponent required is
+ * *not* -1.)
*/
if (exp_b10 >= (-1) && exp_b10 <= 2)
{
@@ -4004,18 +3998,18 @@
*/
static void
png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
+ unsigned int shift, png_fixed_point gamma_val)
{
/* Various values derived from 'shift': */
- PNG_CONST unsigned int num = 1U << (8U - shift);
+ unsigned int num = 1U << (8U - shift);
#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
/* CSE the division and work round wacky GCC warnings (see the comments
* in png_gamma_8bit_correct for where these come from.)
*/
- PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);
+ double fmax = 1.0 / (((png_int_32)1 << (16U - shift)) - 1);
#endif
- PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
- PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
+ unsigned int max = (1U << (16U - shift)) - 1U;
+ unsigned int max_by_2 = 1U << (15U - shift);
unsigned int i;
png_uint_16pp table = *ptable =
@@ -4081,10 +4075,10 @@
*/
static void
png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
- PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
+ unsigned int shift, png_fixed_point gamma_val)
{
- PNG_CONST unsigned int num = 1U << (8U - shift);
- PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
+ unsigned int num = 1U << (8U - shift);
+ unsigned int max = (1U << (16U - shift))-1U;
unsigned int i;
png_uint_32 last;
@@ -4149,7 +4143,7 @@
*/
static void
png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
- PNG_CONST png_fixed_point gamma_val)
+ png_fixed_point gamma_val)
{
unsigned int i;
png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,68 +29,105 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * libpng version 1.6.35, July 15, 2018
+ * libpng version 1.6.37 - April 14, 2019
*
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
- * This code is released under the libpng license (See LICENSE, below)
+ * This code is released under the libpng license. (See LICENSE, below.)
*
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.35, July 15, 2018:
- * Glenn Randers-Pehrson.
+ * libpng versions 0.97, January 1998, through 1.6.35, July 2018:
+ * Glenn Randers-Pehrson
+ * libpng versions 1.6.36, December 2018, through 1.6.37, April 2019:
+ * Cosmin Truta
* See also "Contributing Authors", below.
*/
/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+ * =========================================
+ *
+ * PNG Reference Library License version 2
+ * ---------------------------------------
+ *
+ * * Copyright (c) 1995-2019 The PNG Reference Library Authors.
+ * * Copyright (c) 2018-2019 Cosmin Truta.
+ * * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * * Copyright (c) 1996-1997 Andreas Dilger.
+ * * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
+ * The software is supplied "as is", without warranty of any kind,
+ * express or implied, including, without limitation, the warranties
+ * of merchantability, fitness for a particular purpose, title, and
+ * non-infringement. In no event shall the Copyright owners, or
+ * anyone distributing the software, be liable for any damages or
+ * other liability, whether in contract, tort or otherwise, arising
+ * from, out of, or in connection with the software, or the use or
+ * other dealings in the software, even if advised of the possibility
+ * of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute
+ * this software, or portions hereof, for any purpose, without fee,
+ * subject to the following restrictions:
*
- * This code is released under the libpng license.
+ * 1. The origin of this software must not be misrepresented; you
+ * must not claim that you wrote the original software. If you
+ * use this software in a product, an acknowledgment in the product
+ * documentation would be appreciated, but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and must
+ * not be misrepresented as being the original software.
*
- * libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+ * 3. This Copyright notice may not be removed or altered from any
+ * source or altered source distribution.
+ *
+ *
+ * PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+ * -----------------------------------------------------------------------
+ *
+ * libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
* added to the list of Contributing Authors:
*
- * Simon-Pierre Cadieux
- * Eric S. Raymond
- * Mans Rullgard
- * Cosmin Truta
- * Gilles Vollant
- * James Yu
- * Mandar Sahastrabuddhe
- * Google Inc.
- * Vadim Barkov
+ * Simon-Pierre Cadieux
+ * Eric S. Raymond
+ * Mans Rullgard
+ * Cosmin Truta
+ * Gilles Vollant
+ * James Yu
+ * Mandar Sahastrabuddhe
+ * Google Inc.
+ * Vadim Barkov
*
* and with the following additions to the disclaimer:
*
- * There is no warranty against interference with your enjoyment of the
- * library or against infringement. There is no warranty that our
- * efforts or the library will fulfill any of your particular purposes
- * or needs. This library is provided with all faults, and the entire
- * risk of satisfactory quality, performance, accuracy, and effort is with
- * the user.
+ * There is no warranty against interference with your enjoyment of
+ * the library or against infringement. There is no warranty that our
+ * efforts or the library will fulfill any of your particular purposes
+ * or needs. This library is provided with all faults, and the entire
+ * risk of satisfactory quality, performance, accuracy, and effort is
+ * with the user.
*
* Some files in the "contrib" directory and some configure-generated
- * files that are distributed with libpng have other copyright owners and
+ * files that are distributed with libpng have other copyright owners, and
* are released under other open source licenses.
*
* libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
* Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
* libpng-0.96, and are distributed according to the same disclaimer and
- * license as libpng-0.96, with the following individuals added to the list
- * of Contributing Authors:
+ * license as libpng-0.96, with the following individuals added to the
+ * list of Contributing Authors:
*
- * Tom Lane
- * Glenn Randers-Pehrson
- * Willem van Schaik
+ * Tom Lane
+ * Glenn Randers-Pehrson
+ * Willem van Schaik
*
* libpng versions 0.89, June 1996, through 0.96, May 1997, are
* Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
@@ -98,14 +135,14 @@
* libpng-0.88, with the following individuals added to the list of
* Contributing Authors:
*
- * John Bowler
- * Kevin Bracey
- * Sam Bushell
- * Magnus Holmgren
- * Greg Roelofs
- * Tom Tanner
+ * John Bowler
+ * Kevin Bracey
+ * Sam Bushell
+ * Magnus Holmgren
+ * Greg Roelofs
+ * Tom Tanner
*
- * Some files in the "scripts" directory have other copyright owners
+ * Some files in the "scripts" directory have other copyright owners,
* but are released under this license.
*
* libpng versions 0.5, May 1995, through 0.88, January 1996, are
@@ -114,62 +151,49 @@
* For the purposes of this copyright and license, "Contributing Authors"
* is defined as the following set of individuals:
*
- * Andreas Dilger
- * Dave Martindale
- * Guy Eric Schalnat
- * Paul Schmidt
- * Tim Wegner
+ * Andreas Dilger
+ * Dave Martindale
+ * Guy Eric Schalnat
+ * Paul Schmidt
+ * Tim Wegner
*
- * The PNG Reference Library is supplied "AS IS". The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose. The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
+ * The PNG Reference Library is supplied "AS IS". The Contributing
+ * Authors and Group 42, Inc. disclaim all warranties, expressed or
+ * implied, including, without limitation, the warranties of
+ * merchantability and of fitness for any purpose. The Contributing
+ * Authors and Group 42, Inc. assume no liability for direct, indirect,
+ * incidental, special, exemplary, or consequential damages, which may
+ * result from the use of the PNG Reference Library, even if advised of
+ * the possibility of such damage.
*
* Permission is hereby granted to use, copy, modify, and distribute this
* source code, or portions hereof, for any purpose, without fee, subject
* to the following restrictions:
*
- * 1. The origin of this source code must not be misrepresented.
+ * 1. The origin of this source code must not be misrepresented.
*
- * 2. Altered versions must be plainly marked as such and must not
- * be misrepresented as being the original source.
+ * 2. Altered versions must be plainly marked as such and must not
+ * be misrepresented as being the original source.
*
- * 3. This Copyright notice may not be removed or altered from any
- * source or altered source distribution.
+ * 3. This Copyright notice may not be removed or altered from any
+ * source or altered source distribution.
*
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products. If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
+ * The Contributing Authors and Group 42, Inc. specifically permit,
+ * without fee, and encourage the use of this source code as a component
+ * to supporting the PNG file format in commercial products. If you use
+ * this source code in a product, acknowledgment is not required but would
+ * be appreciated.
*
* END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
*
- * TRADEMARK:
+ * TRADEMARK
+ * =========
*
- * The name "libpng" has not been registered by the Copyright owner
+ * The name "libpng" has not been registered by the Copyright owners
* as a trademark in any jurisdiction. However, because libpng has
* been distributed and maintained world-wide, continually since 1995,
- * the Copyright owner claims "common-law trademark protection" in any
+ * the Copyright owners claim "common-law trademark protection" in any
* jurisdiction where common-law trademark is recognized.
- *
- * OSI CERTIFICATION:
- *
- * Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
- * a certification mark of the Open Source Initiative. OSI has not addressed
- * the additional disclaimers inserted at version 1.0.7.
- *
- * EXPORT CONTROL:
- *
- * The Copyright owner believes that the Export Control Classification
- * Number (ECCN) for libpng is EAR99, which means not subject to export
- * controls or International Traffic in Arms Regulations (ITAR) because
- * it is open source, publicly available software, that does not contain
- * any encryption software. See the EAR, paragraphs 734.3(b)(3) and
- * 734.7(b).
*/
/*
@@ -235,23 +259,25 @@
* 1.0.7rc1-2 1 10007 2.1.0.7rc1-2 (binary compatible)
* 1.0.7 1 10007 (still compatible)
* ...
- * 1.0.19 10 10019 10.so.0.19[.0]
+ * 1.0.69 10 10069 10.so.0.69[.0]
* ...
- * 1.2.59 13 10257 12.so.0.59[.0]
+ * 1.2.59 13 10259 12.so.0.59[.0]
* ...
- * 1.5.30 15 10527 15.so.15.30[.0]
+ * 1.4.20 14 10420 14.so.0.20[.0]
* ...
- * 1.6.35 16 10635 16.so.16.35[.0]
+ * 1.5.30 15 10530 15.so.15.30[.0]
+ * ...
+ * 1.6.37 16 10637 16.so.16.37[.0]
*
- * Henceforth the source version will match the shared-library major
- * and minor numbers; the shared-library major version number will be
- * used for changes in backward compatibility, as it is intended. The
- * PNG_LIBPNG_VER macro, which is not used within libpng but is available
- * for applications, is an unsigned integer of the form xyyzz corresponding
- * to the source version x.y.z (leading zeros in y and z). Beta versions
- * were given the previous public release number plus a letter, until
- * version 1.0.6j; from then on they were given the upcoming public
- * release number plus "betaNN" or "rcNN".
+ * Henceforth the source version will match the shared-library major and
+ * minor numbers; the shared-library major version number will be used for
+ * changes in backward compatibility, as it is intended.
+ * The PNG_LIBPNG_VER macro, which is not used within libpng but is
+ * available for applications, is an unsigned integer of the form XYYZZ
+ * corresponding to the source version X.Y.Z (leading zeros in Y and Z).
+ * Beta versions were given the previous public release number plus a
+ * letter, until version 1.0.6j; from then on they were given the upcoming
+ * public release number plus "betaNN" or "rcNN".
*
* Binary incompatibility exists only when applications make direct access
* to the info_ptr or png_ptr members through png.h, and the compiled
@@ -261,65 +287,8 @@
* in binary compatibility (e.g., when a new feature is added).
*
* See libpng.txt or libpng.3 for more information. The PNG specification
- * is available as a W3C Recommendation and as an ISO Specification,
- * <https://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- * July 15, 2018
- *
- * Since the PNG Development group is an ad-hoc body, we can't make
- * an official declaration.
- *
- * This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.6.35 are Y2K compliant. It is my belief that
- * earlier versions were also Y2K compliant.
- *
- * Libpng only has two year fields. One is a 2-byte unsigned integer
- * that will hold years up to 65535. The other, which is deprecated,
- * holds the date in text format, and will hold years up to 9999.
- *
- * The integer is
- * "png_uint_16 year" in png_time_struct.
- *
- * The string is
- * "char time_buffer[29]" in png_struct. This is no longer used
- * in libpng-1.6.x and will be removed from libpng-1.7.0.
- *
- * There are seven time-related functions:
- * png.c: png_convert_to_rfc_1123_buffer() in png.c
- * (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
- * png_convert_to_rfc_1152() in error prior to libpng-0.98)
- * png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- * png_convert_from_time_t() in pngwrite.c
- * png_get_tIME() in pngget.c
- * png_handle_tIME() in pngrutil.c, called in pngread.c
- * png_set_tIME() in pngset.c
- * png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- * All handle dates properly in a Y2K environment. The
- * png_convert_from_time_t() function calls gmtime() to convert from system
- * clock time, which returns (year - 1900), which we properly convert to
- * the full 4-digit year. There is a possibility that libpng applications
- * are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
- * function, or that they are incorrectly passing only a 2-digit year
- * instead of "year - 1900" into the png_convert_from_struct_tm() function,
- * but this is not under our control. The libpng documentation has always
- * stated that it works with 4-digit years, and the APIs have been
- * documented as such.
- *
- * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned
- * integer to hold the year, and can hold years as large as 65535.
- *
- * zlib, upon which libpng depends, is also Y2K compliant. It contains
- * no date-related code.
- *
- * Glenn Randers-Pehrson
- * libpng maintainer
- * PNG Development Group
+ * is available as a W3C Recommendation and as an ISO/IEC Standard; see
+ * <https://www.w3.org/TR/2003/REC-PNG-20031110/>
*/
#ifndef PNG_H
@@ -337,8 +306,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.35"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35 - July 15, 2018\n"
+#define PNG_LIBPNG_VER_STRING "1.6.37"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.37 - April 14, 2019\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -346,13 +315,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 35
-
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
+#define PNG_LIBPNG_VER_RELEASE 37
+
+/* This should be zero for a public release, or non-zero for a
+ * development version. [Deprecated]
*/
-
-#define PNG_LIBPNG_VER_BUILD 02
+#define PNG_LIBPNG_VER_BUILD 0
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -369,15 +337,16 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
-
-/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000). From
- * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+
+/* Careful here. At one time, Guy wanted to use 082, but that
+ * would be octal. We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here
+ * (only version 1.0.0 was mis-numbered 100 instead of 10000).
+ * From version 1.0.1 it is:
+ * XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
-#define PNG_LIBPNG_VER 10635 /* 1.6.35 */
+#define PNG_LIBPNG_VER 10637 /* 1.6.37 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -487,7 +456,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_35;
+typedef char* png_libpng_version_1_6_37;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
@@ -2041,12 +2010,12 @@
PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
png_inforp info_ptr, png_bytep *exif));
PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr,
- png_inforp info_ptr, const png_bytep exif));
+ png_inforp info_ptr, png_bytep exif));
PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,
png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));
PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr,
- png_inforp info_ptr, const png_uint_32 num_exif, const png_bytep exif));
+ png_inforp info_ptr, png_uint_32 num_exif, png_bytep exif));
#endif
#ifdef PNG_gAMA_SUPPORTED
@@ -2792,7 +2761,7 @@
*
* When the simplified API needs to convert between sRGB and linear colorspaces,
* the actual sRGB transfer curve defined in the sRGB specification (see the
- * article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
+ * article at <https://en.wikipedia.org/wiki/SRGB>) is used, not the gamma=1/2.2
* approximation used elsewhere in libpng.
*
* When an alpha channel is present it is expected to denote pixel coverage
@@ -2995,7 +2964,7 @@
* 'flags' field of png_image.
*/
#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
- /* This indicates the the RGB values of the in-memory bitmap do not
+ /* This indicates that the RGB values of the in-memory bitmap do not
* correspond to the red, green and blue end-points defined by sRGB.
*/
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h Thu Aug 08 17:27:17 2019 -0400
@@ -22,18 +22,19 @@
* questions.
*/
-/* pngconf.h - machine configurable file for libpng
+/* pngconf.h - machine-configurable file for libpng
*
* This file is available under and governed by the GNU General Public
* License version 2 only, as published by the Free Software Foundation.
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * libpng version 1.6.35, July 15, 2018
+ * libpng version 1.6.37
*
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -85,14 +86,13 @@
#endif /* PNG_BUILDING_SYMBOL_TABLE */
-/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
- * PNG_NO_CONST; this is no longer supported except for data declarations which
- * apparently still cause problems in 2011 on some compilers.
+/* Prior to 1.6.0, it was possible to turn off 'const' in declarations,
+ * using PNG_NO_CONST. This is no longer supported.
*/
#define PNG_CONST const /* backward compatibility only */
-/* This controls optimization of the reading of 16-bit and 32-bit values
- * from PNG files. It can be set on a per-app-file basis - it
+/* This controls optimization of the reading of 16-bit and 32-bit
+ * values from PNG files. It can be set on a per-app-file basis: it
* just changes whether a macro is used when the function is called.
* The library builder sets the default; if read functions are not
* built into the library the macro implementation is forced on.
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngdebug.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.8 [December 19, 2013]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.31 [July 27, 2017]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -453,7 +453,7 @@
* if the character is invalid.
*/
#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-static PNG_CONST char png_digit[16] = {
+static const char png_digit[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'A', 'B', 'C', 'D', 'E', 'F'
};
@@ -913,7 +913,7 @@
png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
PNG_NORETURN)
{
- const png_const_structrp png_ptr = png_nonconst_ptr;
+ png_const_structrp png_ptr = png_nonconst_ptr;
png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
/* An error is always logged here, overwriting anything (typically a warning)
@@ -948,7 +948,7 @@
void /* PRIVATE */ PNGCBAPI
png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
{
- const png_const_structrp png_ptr = png_nonconst_ptr;
+ png_const_structrp png_ptr = png_nonconst_ptr;
png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
/* A warning is only logged if there is no prior warning or error. */
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2013,2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,18 +29,16 @@
* THIS FILE WAS MODIFIED BY ORACLE, INC.
*/
-/* libpng STANDARD API DEFINITION */
-
/* pnglibconf.h - library build configuration */
/* This file is available under and governed by the GNU General Public
* License version 2 only, as published by the Free Software Foundation.
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*/
+/* libpng version 1.6.37 */
-/* libpng version 1.6.35, July 15, 2018 */
-
-/* Copyright (c) 1998-2018 Glenn Randers-Pehrson */
+/* Copyright (c) 2018-2019 Cosmin Truta */
+/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
/* For conditions of distribution and use, see the disclaimer */
@@ -80,6 +78,8 @@
#define PNG_IO_STATE_SUPPORTED
#define PNG_MNG_FEATURES_SUPPORTED
#define PNG_POINTER_INDEXING_SUPPORTED
+/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
+/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
#define PNG_PROGRESSIVE_READ_SUPPORTED
#define PNG_READ_16BIT_SUPPORTED
#define PNG_READ_ALPHA_MODE_SUPPORTED
@@ -118,6 +118,7 @@
#define PNG_READ_USER_TRANSFORM_SUPPORTED
#define PNG_READ_bKGD_SUPPORTED
#define PNG_READ_cHRM_SUPPORTED
+/*#undef PNG_READ_eXIf_SUPPORTED*/
#define PNG_READ_gAMA_SUPPORTED
#define PNG_READ_hIST_SUPPORTED
/*#undef PNG_READ_iCCP_SUPPORTED*/
@@ -187,6 +188,7 @@
/*#undef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED*/
/*#undef PNG_WRITE_bKGD_SUPPORTED*/
/*#undef PNG_WRITE_cHRM_SUPPORTED*/
+/*#undef PNG_WRITE_eXIf_SUPPORTED*/
/*#undef PNG_WRITE_gAMA_SUPPORTED*/
/*#undef PNG_WRITE_hIST_SUPPORTED*/
/*#undef PNG_WRITE_iCCP_SUPPORTED*/
@@ -204,6 +206,7 @@
/*#undef PNG_WRITE_zTXt_SUPPORTED*/
#define PNG_bKGD_SUPPORTED
#define PNG_cHRM_SUPPORTED
+/*#undef PNG_eXIf_SUPPORTED*/
#define PNG_gAMA_SUPPORTED
#define PNG_hIST_SUPPORTED
#define PNG_iCCP_SUPPORTED
@@ -241,7 +244,7 @@
#define PNG_USER_HEIGHT_MAX 8000
#define PNG_USER_WIDTH_MAX 8000
#define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0
+#define PNG_ZLIB_VERNUM 0 /* unknown */
#define PNG_Z_DEFAULT_COMPRESSION (-1)
#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
#define PNG_Z_DEFAULT_STRATEGY 1
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -1000,20 +1000,20 @@
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* Start of interlace block */
- static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+ static const png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
/* Offset to next interlace block */
- static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+ static const png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
/* Start of interlace block in the y direction */
- static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+ static const png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
/* Offset to next interlace block in the y direction */
- static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+ static const png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
/* Height of interlace block. This is not currently used - if you need
* it, uncomment it here and in png.h
- static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+ static const png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
*/
#endif
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -202,7 +202,10 @@
# else /* !defined __ARM_NEON__ */
/* The 'intrinsics' code simply won't compile without this -mfpu=neon:
*/
-# define PNG_ARM_NEON_IMPLEMENTATION 2
+# if !defined(__aarch64__)
+ /* The assembler code currently does not work on ARM64 */
+# define PNG_ARM_NEON_IMPLEMENTATION 2
+# endif /* __aarch64__ */
# endif /* __ARM_NEON__ */
# endif /* !PNG_ARM_NEON_IMPLEMENTATION */
@@ -295,6 +298,7 @@
# define PNG_POWERPC_VSX_IMPLEMENTATION 1
#endif
+
/* Is this a build of a DLL where compilation of the object modules requires
* different preprocessor settings to those required for a simple library? If
* so PNG_BUILD_DLL must be set.
@@ -1561,10 +1565,10 @@
#endif
PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
- const png_uint_32 chunk_name),PNG_EMPTY);
+ png_uint_32 chunk_name),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
- const png_uint_32 chunk_length),PNG_EMPTY);
+ png_uint_32 chunk_length),PNG_EMPTY);
PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
@@ -2141,6 +2145,29 @@
PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
png_const_charp key, png_bytep new_key), PNG_EMPTY);
+#if PNG_ARM_NEON_IMPLEMENTATION == 1
+PNG_INTERNAL_FUNCTION(void,
+ png_riffle_palette_neon,
+ (png_structrp),
+ PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int,
+ png_do_expand_palette_rgba8_neon,
+ (png_structrp,
+ png_row_infop,
+ png_const_bytep,
+ const png_bytepp,
+ const png_bytepp),
+ PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int,
+ png_do_expand_palette_rgb8_neon,
+ (png_structrp,
+ png_row_infop,
+ png_const_bytep,
+ const png_bytepp,
+ const png_bytepp),
+ PNG_EMPTY);
+#endif
+
/* Maintainer: Put new private prototypes here ^ */
#include "pngdebug.h"
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -1022,6 +1022,12 @@
png_ptr->chunk_list = NULL;
#endif
+#if defined(PNG_READ_EXPAND_SUPPORTED) && \
+ defined(PNG_ARM_NEON_IMPLEMENTATION)
+ png_free(png_ptr, png_ptr->riffled_palette);
+ png_ptr->riffled_palette = NULL;
+#endif
+
/* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
* callbacks are still set at this point. They are required to complete the
* destruction of the png_struct itself.
@@ -1649,7 +1655,7 @@
* errors (which are unfortunately quite common.)
*/
{
- static PNG_CONST png_byte chunks_to_process[] = {
+ static const png_byte chunks_to_process[] = {
98, 75, 71, 68, '\0', /* bKGD */
99, 72, 82, 77, '\0', /* cHRM */
103, 65, 77, 65, '\0', /* gAMA */
@@ -1786,9 +1792,9 @@
png_uint_32 alpha, int encoding)
{
png_imagep image = display->image;
- const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
+ int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
P_LINEAR : P_sRGB;
- const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
+ int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
(red != green || green != blue);
if (ip > 255)
@@ -1897,13 +1903,13 @@
/* Store the value. */
{
# ifdef PNG_FORMAT_AFIRST_SUPPORTED
- const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
+ int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
(image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
# else
# define afirst 0
# endif
# ifdef PNG_FORMAT_BGR_SUPPORTED
- const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
+ int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
# else
# define bgr 0
# endif
@@ -2113,11 +2119,11 @@
{
png_image_read_control *display =
png_voidcast(png_image_read_control*, argument);
- const png_imagep image = display->image;
-
- const png_structrp png_ptr = image->opaque->png_ptr;
- const png_uint_32 output_format = image->format;
- const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
+ png_imagep image = display->image;
+
+ png_structrp png_ptr = image->opaque->png_ptr;
+ png_uint_32 output_format = image->format;
+ int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
P_LINEAR : P_sRGB;
unsigned int cmap_entries;
@@ -2830,7 +2836,7 @@
unsigned int num_trans = png_ptr->num_trans;
png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL;
png_const_colorp colormap = png_ptr->palette;
- const int do_background = trans != NULL &&
+ int do_background = trans != NULL &&
(output_format & PNG_FORMAT_FLAG_ALPHA) == 0;
unsigned int i;
@@ -3974,7 +3980,7 @@
*/
if (linear != 0)
{
- PNG_CONST png_uint_16 le = 0x0001;
+ png_uint_16 le = 0x0001;
if ((*(png_const_bytep) & le) != 0)
png_set_swap(png_ptr);
@@ -4136,7 +4142,7 @@
* original PNG format because it may not occur in the output PNG format
* and libpng deals with the issues of reading the original.
*/
- const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
+ unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
/* The following checks just the 'row_stride' calculation to ensure it
* fits in a signed 32-bit value. Because channels/components can be
@@ -4147,7 +4153,7 @@
if (image->width <= 0x7fffffffU/channels) /* no overflow */
{
png_uint_32 check;
- const png_uint_32 png_row_stride = image->width * channels;
+ png_uint_32 png_row_stride = image->width * channels;
if (row_stride == 0)
row_stride = (png_int_32)/*SAFE*/png_row_stride;
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrio.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -46,6 +46,17 @@
#include "pngpriv.h"
+#ifdef PNG_ARM_NEON_IMPLEMENTATION
+# if PNG_ARM_NEON_IMPLEMENTATION == 1
+# define PNG_ARM_NEON_INTRINSICS_AVAILABLE
+# if defined(_MSC_VER) && defined(_M_ARM64)
+# include <arm64_neon.h>
+# else
+# include <arm_neon.h>
+# endif
+# endif
+#endif
+
#ifdef PNG_READ_SUPPORTED
/* Set the action on getting a CRC error for an ancillary or critical chunk. */
@@ -1199,20 +1210,20 @@
png_ptr->palette[png_ptr->background.index].blue;
#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
- if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
- {
- if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
- {
- /* Invert the alpha channel (in tRNS) unless the pixels are
- * going to be expanded, in which case leave it for later
- */
- int i, istop = png_ptr->num_trans;
-
- for (i=0; i<istop; i++)
- png_ptr->trans_alpha[i] = (png_byte)(255 -
- png_ptr->trans_alpha[i]);
- }
- }
+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
+ {
+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
+ {
+ /* Invert the alpha channel (in tRNS) unless the pixels are
+ * going to be expanded, in which case leave it for later
+ */
+ int i, istop = png_ptr->num_trans;
+
+ for (i = 0; i < istop; i++)
+ png_ptr->trans_alpha[i] =
+ (png_byte)(255 - png_ptr->trans_alpha[i]);
+ }
+ }
#endif /* READ_INVERT_ALPHA */
}
} /* background expand and (therefore) no alpha association. */
@@ -3014,7 +3025,6 @@
*/
static int
png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
-
{
int rgb_error = 0;
@@ -3023,12 +3033,11 @@
if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&
(row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
- PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
- PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
- PNG_CONST png_uint_32 bc = 32768 - rc - gc;
- PNG_CONST png_uint_32 row_width = row_info->width;
- PNG_CONST int have_alpha =
- (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;
+ png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
+ png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
+ png_uint_32 bc = 32768 - rc - gc;
+ png_uint_32 row_width = row_info->width;
+ int have_alpha = (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;
if (row_info->bit_depth == 8)
{
@@ -4171,12 +4180,11 @@
{
if (row_info->bit_depth == 8)
{
- PNG_CONST png_bytep table = png_ptr->gamma_from_1;
+ png_bytep table = png_ptr->gamma_from_1;
if (table != NULL)
{
- PNG_CONST int step =
- (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2;
+ int step = (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2;
/* The alpha channel is the last component: */
row += step - 1;
@@ -4190,13 +4198,12 @@
else if (row_info->bit_depth == 16)
{
- PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1;
- PNG_CONST int gamma_shift = png_ptr->gamma_shift;
+ png_uint_16pp table = png_ptr->gamma_16_from_1;
+ int gamma_shift = png_ptr->gamma_shift;
if (table != NULL)
{
- PNG_CONST int step =
- (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4;
+ int step = (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4;
/* The alpha channel is the last component: */
row += step - 2;
@@ -4227,8 +4234,9 @@
* upon whether you supply trans and num_trans.
*/
static void
-png_do_expand_palette(png_row_infop row_info, png_bytep row,
- png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
+png_do_expand_palette(png_structrp png_ptr, png_row_infop row_info,
+ png_bytep row, png_const_colorp palette, png_const_bytep trans_alpha,
+ int num_trans)
{
int shift, value;
png_bytep sp, dp;
@@ -4332,14 +4340,27 @@
sp = row + (size_t)row_width - 1;
dp = row + ((size_t)row_width << 2) - 1;
- for (i = 0; i < row_width; i++)
+ i = 0;
+#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE
+ if (png_ptr->riffled_palette != NULL)
+ {
+ /* The RGBA optimization works with png_ptr->bit_depth == 8
+ * but sometimes row_info->bit_depth has been changed to 8.
+ * In these cases, the palette hasn't been riffled.
+ */
+ i = png_do_expand_palette_rgba8_neon(png_ptr, row_info, row,
+ &sp, &dp);
+ }
+#else
+ PNG_UNUSED(png_ptr)
+#endif
+
+ for (; i < row_width; i++)
{
if ((int)(*sp) >= num_trans)
*dp-- = 0xff;
-
else
*dp-- = trans_alpha[*sp];
-
*dp-- = palette[*sp].blue;
*dp-- = palette[*sp].green;
*dp-- = palette[*sp].red;
@@ -4356,8 +4377,15 @@
{
sp = row + (size_t)row_width - 1;
dp = row + (size_t)(row_width * 3) - 1;
-
- for (i = 0; i < row_width; i++)
+ i = 0;
+#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE
+ i = png_do_expand_palette_rgb8_neon(png_ptr, row_info, row,
+ &sp, &dp);
+#else
+ PNG_UNUSED(png_ptr)
+#endif
+
+ for (; i < row_width; i++)
{
*dp-- = palette[*sp].blue;
*dp-- = palette[*sp].green;
@@ -4771,7 +4799,19 @@
{
if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
{
- png_do_expand_palette(row_info, png_ptr->row_buf + 1,
+#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE
+ if ((png_ptr->num_trans > 0) && (png_ptr->bit_depth == 8))
+ {
+ if (png_ptr->riffled_palette == NULL)
+ {
+ /* Initialize the accelerated palette expansion. */
+ png_ptr->riffled_palette =
+ (png_bytep)png_malloc(png_ptr, 256 * 4);
+ png_riffle_palette_neon(png_ptr);
+ }
+ }
+#endif
+ png_do_expand_palette(png_ptr, row_info, png_ptr->row_buf + 1,
png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
}
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -1489,8 +1489,7 @@
{
/* We have the ICC profile header; do the basic header checks.
*/
- const png_uint_32 profile_length =
- png_get_uint_32(profile_header);
+ png_uint_32 profile_length = png_get_uint_32(profile_header);
if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
keyword, profile_length) != 0)
@@ -1507,8 +1506,8 @@
* profile. The header check has already validated
* that none of this stuff will overflow.
*/
- const png_uint_32 tag_count = png_get_uint_32(
- profile_header+128);
+ png_uint_32 tag_count =
+ png_get_uint_32(profile_header + 128);
png_bytep profile = png_read_buffer(png_ptr,
profile_length, 2/*silent*/);
@@ -3160,7 +3159,7 @@
*/
void /* PRIVATE */
-png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name)
+png_check_chunk_name(png_const_structrp png_ptr, png_uint_32 chunk_name)
{
int i;
png_uint_32 cn=chunk_name;
@@ -3179,7 +3178,7 @@
}
void /* PRIVATE */
-png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length)
+png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
{
png_alloc_size_t limit = PNG_UINT_31_MAX;
@@ -3391,7 +3390,7 @@
/* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
* then pass:
*/
- static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
+ static const png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
{
/* Little-endian byte masks for PACKSWAP */
{ S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
@@ -3402,7 +3401,7 @@
/* display_mask has only three entries for the odd passes, so index by
* pass>>1.
*/
- static PNG_CONST png_uint_32 display_mask[2][3][3] =
+ static const png_uint_32 display_mask[2][3][3] =
{
/* Little-endian byte masks for PACKSWAP */
{ B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
@@ -3715,7 +3714,7 @@
{
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* Offset to next interlace block */
- static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+ static const unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
png_debug(1, "in png_do_read_interlace");
if (row != NULL && row_info != NULL)
@@ -4357,16 +4356,16 @@
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* Start of interlace block */
- static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+ static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
/* Offset to next interlace block */
- static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+ static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
/* Start of interlace block in the y direction */
- static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+ static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
/* Offset to next interlace block in the y direction */
- static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+ static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
png_debug(1, "in png_read_finish_row");
png_ptr->row_number++;
@@ -4422,16 +4421,16 @@
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
/* Start of interlace block */
- static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+ static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
/* Offset to next interlace block */
- static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+ static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
/* Start of interlace block in the y direction */
- static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+ static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
/* Offset to next interlace block in the y direction */
- static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+ static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
unsigned int max_pixel_depth;
size_t row_bytes;
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -165,7 +165,7 @@
#ifdef PNG_eXIf_SUPPORTED
void PNGAPI
png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
- const png_bytep eXIf_buf)
+ png_bytep eXIf_buf)
{
png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");
PNG_UNUSED(info_ptr)
@@ -174,7 +174,7 @@
void PNGAPI
png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,
- const png_uint_32 num_exif, const png_bytep eXIf_buf)
+ png_uint_32 num_exif, png_bytep eXIf_buf)
{
int i;
@@ -1427,7 +1427,7 @@
/* Ignore all unknown chunks and all chunks recognized by
* libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
*/
- static PNG_CONST png_byte chunks_to_ignore[] = {
+ static const png_byte chunks_to_ignore[] = {
98, 75, 71, 68, '\0', /* bKGD */
99, 72, 82, 77, '\0', /* cHRM */
101, 88, 73, 102, '\0', /* eXIf */
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -420,6 +420,12 @@
/* deleted in 1.5.5: rgb_to_gray_blue_coeff; */
#endif
+/* New member added in libpng-1.6.36 */
+#if defined(PNG_READ_EXPAND_SUPPORTED) && \
+ defined(PNG_ARM_NEON_IMPLEMENTATION)
+ png_bytep riffled_palette; /* buffer for accelerated palette expansion */
+#endif
+
/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
#if defined(PNG_MNG_FEATURES_SUPPORTED)
/* Changed from png_byte to png_uint_32 at version 1.2.0 */
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c Thu Aug 08 17:27:17 2019 -0400
@@ -29,10 +29,10 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * Last changed in libpng 1.6.35 [July 15, 2018]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -373,7 +373,7 @@
#endif
#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-static PNG_CONST png_byte onebppswaptable[256] = {
+static const png_byte onebppswaptable[256] = {
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
@@ -408,7 +408,7 @@
0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
};
-static PNG_CONST png_byte twobppswaptable[256] = {
+static const png_byte twobppswaptable[256] = {
0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
@@ -443,7 +443,7 @@
0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
};
-static PNG_CONST png_byte fourbppswaptable[256] = {
+static const png_byte fourbppswaptable[256] = {
0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Thu Aug 08 17:27:17 2019 -0400
@@ -1679,7 +1679,7 @@
{
X11InputMethodData *pX11IMData = NULL;
char * ret = NULL;
-#if defined(_LP64) && !defined(_LITTLE_ENDIAN)
+#if defined(__linux__) && defined(_LP64) && !defined(_LITTLE_ENDIAN)
// XIMPreeditState value which is used for XGetICValues must be 32bit on BigEndian XOrg's xlib
unsigned int state = XIMPreeditUnKnown;
#else
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java Thu Aug 08 17:27:17 2019 -0400
@@ -438,6 +438,10 @@
@Override
public int read(byte[] bytes, int off, int len) throws IOException {
+ Objects.checkFromIndexSize(off, len, bytes.length);
+ if (len == 0) {
+ return 0;
+ }
// get the buffer to read from, possibly blocking if
// none is available
ByteBuffer buffer;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/ct.properties Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -500,7 +500,6 @@
java.rmi.registry.*: compact2
java.rmi.server.*: compact2
java.security.*: compact1
-java.security.acl.*: compact1
java.security.cert.*: compact1
java.security.interfaces.*: compact1
java.security.spec.*: compact1
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Thu Aug 08 17:27:17 2019 -0400
@@ -51,14 +51,12 @@
private static final int INTERPRETER_FRAME_MDX_OFFSET = INTERPRETER_FRAME_LAST_SP_OFFSET -1;
private static final int INTERPRETER_FRAME_ESP_OFFSET = INTERPRETER_FRAME_MDX_OFFSET - 1;
private static final int INTERPRETER_FRAME_BCX_OFFSET = INTERPRETER_FRAME_ESP_OFFSET - 1;
- private static final int INTERPRETER_FRAME_CACHE_OFFSET =INTERPRETER_FRAME_BCX_OFFSET - 1;
+ private static final int INTERPRETER_FRAME_CACHE_OFFSET = INTERPRETER_FRAME_BCX_OFFSET - 1;
private static final int INTERPRETER_FRAME_MONITORS_OFFSET = INTERPRETER_FRAME_CACHE_OFFSET - 1;
private static final int INTERPRETER_FRAME_LOCALS_OFFSET = INTERPRETER_FRAME_MONITORS_OFFSET - 1;
private static final int INTERPRETER_FRAME_MIRROR_OFFSET = INTERPRETER_FRAME_LOCALS_OFFSET - 1;
private static final int INTERPRETER_FRAME_METHOD_OFFSET = INTERPRETER_FRAME_MIRROR_OFFSET - 1;
- private static final int INTERPRETER_FRAME_INITIAL_SP_OFFSET = INTERPRETER_FRAME_BCX_OFFSET - 1; // FIXME: probably wrong, but unused anyway
- private static final int INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
- private static final int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
+ private static final int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET = INTERPRETER_FRAME_METHOD_OFFSET - 1;
// Entry frames
private static int ENTRY_FRAME_CALL_WRAPPER_OFFSET;
@@ -444,7 +442,7 @@
}
public BasicObjectLock interpreterFrameMonitorEnd() {
- Address result = addressOfStackSlot(INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET).getAddressAt(0);
+ Address result = addressOfStackSlot(INTERPRETER_FRAME_MONITORS_OFFSET).getAddressAt(0);
if (Assert.ASSERTS_ENABLED) {
// make sure the pointer points inside the frame
Assert.that(AddressOps.gt(getFP(), result), "result must < than frame pointer");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/external-link.svg Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2019, 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
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!--
+ A minified version of this file is used as inline SVG icon in the stylesheet.
+ This file serves only for future editing and is not used by javadoc.
+
+ Note that the '#' character in the value of the fill attribute needs to be
+ URL-encoded when inlined in the CSS file.
+-->
+
+<svg version="1.1" viewBox="0 0 768 768" xmlns="http://www.w3.org/2000/svg">
+<path
+ d="M 584,664 H 104 V 184 H 320 V 80 H 0 V 768 H 688 V 448 H 584 Z M 384,0 516,132 276,372 396,492 636,252 768,384 V 0 Z"
+ fill="#4a6782"/>
+</svg>
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Aug 08 17:27:17 2019 -0400
@@ -680,6 +680,32 @@
}
/*
+ * Indicator icon for external links.
+ */
+main a[href*="://"]::after {
+ content:"";
+ display:inline-block;
+ background-image:url('data:image/svg+xml; utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="768" height="768">\
+ <path d="M584 664H104V184h216V80H0v688h688V448H584zM384 0l132 \
+ 132-240 240 120 120 240-240 132 132V0z" fill="%234a6782"/>\
+ </svg>');
+ background-size:100% 100%;
+ width:7px;
+ height:7px;
+ margin-left:2px;
+ margin-bottom:4px;
+}
+main a[href*="://"]:hover::after,
+main a[href*="://"]:focus::after {
+ background-image:url('data:image/svg+xml; utf8, \
+ <svg xmlns="http://www.w3.org/2000/svg" width="768" height="768">\
+ <path d="M584 664H104V184h216V80H0v688h688V448H584zM384 0l132 \
+ 132-240 240 120 120 240-240 132 132V0z" fill="%23bb7a2a"/>\
+ </svg>');
+}
+
+/*
* Styles for user-provided tables.
*
* borderless:
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -65,6 +65,16 @@
static final int ENDHDR = 22; // END header size
/*
+ * File attribute compatibility types of CEN field "version made by"
+ */
+ static final int FILE_ATTRIBUTES_UNIX = 3; // Unix
+
+ /*
+ * Base values for CEN field "version made by"
+ */
+ static final int VERSION_MADE_BY_BASE_UNIX = FILE_ATTRIBUTES_UNIX << 8; // Unix
+
+ /*
* Local file (LOC) header field offsets
*/
static final int LOCVER = 4; // version needed to extract
@@ -228,22 +238,24 @@
static final long ZIP64_LOCOFF(byte[] b) { return LL(b, 8);} // zip64 end offset
// central directory header (CEN) fields
- static final long CENSIG(byte[] b, int pos) { return LG(b, pos + 0); }
- static final int CENVEM(byte[] b, int pos) { return SH(b, pos + 4); }
- static final int CENVER(byte[] b, int pos) { return SH(b, pos + 6); }
- static final int CENFLG(byte[] b, int pos) { return SH(b, pos + 8); }
- static final int CENHOW(byte[] b, int pos) { return SH(b, pos + 10);}
- static final long CENTIM(byte[] b, int pos) { return LG(b, pos + 12);}
- static final long CENCRC(byte[] b, int pos) { return LG(b, pos + 16);}
- static final long CENSIZ(byte[] b, int pos) { return LG(b, pos + 20);}
- static final long CENLEN(byte[] b, int pos) { return LG(b, pos + 24);}
- static final int CENNAM(byte[] b, int pos) { return SH(b, pos + 28);}
- static final int CENEXT(byte[] b, int pos) { return SH(b, pos + 30);}
- static final int CENCOM(byte[] b, int pos) { return SH(b, pos + 32);}
- static final int CENDSK(byte[] b, int pos) { return SH(b, pos + 34);}
- static final int CENATT(byte[] b, int pos) { return SH(b, pos + 36);}
- static final long CENATX(byte[] b, int pos) { return LG(b, pos + 38);}
- static final long CENOFF(byte[] b, int pos) { return LG(b, pos + 42);}
+ static final long CENSIG(byte[] b, int pos) { return LG(b, pos + 0); } // signature
+ static final int CENVEM(byte[] b, int pos) { return SH(b, pos + 4); } // version made by
+ static final int CENVEM_FA(byte[] b, int pos) { return CH(b, pos + 5); } // file attribute compatibility
+ static final int CENVER(byte[] b, int pos) { return SH(b, pos + 6); } // version needed to extract
+ static final int CENFLG(byte[] b, int pos) { return SH(b, pos + 8); } // encrypt, decrypt flags
+ static final int CENHOW(byte[] b, int pos) { return SH(b, pos + 10);} // compression method
+ static final long CENTIM(byte[] b, int pos) { return LG(b, pos + 12);} // modification time
+ static final long CENCRC(byte[] b, int pos) { return LG(b, pos + 16);} // uncompressed file crc-32 value
+ static final long CENSIZ(byte[] b, int pos) { return LG(b, pos + 20);} // compressed size
+ static final long CENLEN(byte[] b, int pos) { return LG(b, pos + 24);} // uncompressed size
+ static final int CENNAM(byte[] b, int pos) { return SH(b, pos + 28);} // filename length
+ static final int CENEXT(byte[] b, int pos) { return SH(b, pos + 30);} // extra field length
+ static final int CENCOM(byte[] b, int pos) { return SH(b, pos + 32);} // comment length
+ static final int CENDSK(byte[] b, int pos) { return SH(b, pos + 34);} // disk number start
+ static final int CENATT(byte[] b, int pos) { return SH(b, pos + 36);} // internal file attributes
+ static final long CENATX(byte[] b, int pos) { return LG(b, pos + 38);} // external file attributes
+ static final int CENATX_PERMS(byte[] b, int pos) { return SH(b, pos + 40);} // posix permission data
+ static final long CENOFF(byte[] b, int pos) { return LG(b, pos + 42);} // LOC header offset
/* The END header is followed by a variable length comment of size < 64k. */
static final long END_MAXLEN = 0xFFFF + ENDHDR;
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributeView.java Thu Aug 08 17:27:17 2019 -0400
@@ -27,15 +27,18 @@
import java.io.IOException;
import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.FileTime;
+import java.nio.file.attribute.PosixFilePermission;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Set;
/**
* @author Xueming Shen, Rajendra Gutupalli, Jaya Hangal
*/
class ZipFileAttributeView implements BasicFileAttributeView {
- private enum AttrID {
+ static enum AttrID {
size,
creationTime,
lastAccessTime,
@@ -47,10 +50,13 @@
fileKey,
compressedSize,
crc,
- method
+ method,
+ owner,
+ group,
+ permissions
}
- private final ZipPath path;
+ final ZipPath path;
private final boolean isZipView;
ZipFileAttributeView(ZipPath path, boolean isZipView) {
@@ -64,7 +70,7 @@
}
@Override
- public ZipFileAttributes readAttributes() throws IOException {
+ public BasicFileAttributes readAttributes() throws IOException {
return path.readAttributes();
}
@@ -77,6 +83,11 @@
path.setTimes(lastModifiedTime, lastAccessTime, createTime);
}
+ public void setPermissions(Set<PosixFilePermission> perms) throws IOException {
+ path.setPermissions(perms);
+ }
+
+ @SuppressWarnings("unchecked")
void setAttribute(String attribute, Object value)
throws IOException
{
@@ -87,6 +98,8 @@
setTimes(null, (FileTime)value, null);
if (AttrID.valueOf(attribute) == AttrID.creationTime)
setTimes(null, null, (FileTime)value);
+ if (AttrID.valueOf(attribute) == AttrID.permissions)
+ setPermissions((Set<PosixFilePermission>)value);
} catch (IllegalArgumentException x) {
throw new UnsupportedOperationException("'" + attribute +
"' is unknown or read-only attribute");
@@ -96,7 +109,7 @@
Map<String, Object> readAttributes(String attributes)
throws IOException
{
- ZipFileAttributes zfas = readAttributes();
+ ZipFileAttributes zfas = (ZipFileAttributes)readAttributes();
LinkedHashMap<String, Object> map = new LinkedHashMap<>();
if ("*".equals(attributes)) {
for (AttrID id : AttrID.values()) {
@@ -115,7 +128,7 @@
return map;
}
- private Object attribute(AttrID id, ZipFileAttributes zfas) {
+ Object attribute(AttrID id, ZipFileAttributes zfas) {
switch (id) {
case size:
return zfas.size();
@@ -147,6 +160,11 @@
if (isZipView)
return zfas.method();
break;
+ case permissions:
+ if (isZipView) {
+ return zfas.storedPermissions().orElse(null);
+ }
+ break;
default:
break;
}
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileAttributes.java Thu Aug 08 17:27:17 2019 -0400
@@ -26,6 +26,9 @@
package jdk.nio.zipfs;
import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Optional;
+import java.util.Set;
/**
* The attributes of a file stored in a zip file.
@@ -38,4 +41,5 @@
int method();
byte[] extra();
byte[] comment();
+ Optional<Set<PosixFilePermission>> storedPermissions();
}
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileStore.java Thu Aug 08 17:27:17 2019 -0400
@@ -32,7 +32,9 @@
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.FileAttributeView;
+import java.nio.file.attribute.FileOwnerAttributeView;
import java.nio.file.attribute.FileStoreAttributeView;
+import java.nio.file.attribute.PosixFileAttributeView;
/**
* @author Xueming Shen, Rajendra Gutupalli, Jaya Hangal
@@ -63,12 +65,15 @@
@Override
public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type) {
return (type == BasicFileAttributeView.class ||
- type == ZipFileAttributeView.class);
+ type == ZipFileAttributeView.class ||
+ ((type == FileOwnerAttributeView.class ||
+ type == PosixFileAttributeView.class) && zfs.supportPosix));
}
@Override
public boolean supportsFileAttributeView(String name) {
- return "basic".equals(name) || "zip".equals(name);
+ return "basic".equals(name) || "zip".equals(name) ||
+ (("owner".equals(name) || "posix".equals(name)) && zfs.supportPosix);
}
@Override
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java Thu Aug 08 17:27:17 2019 -0400
@@ -41,9 +41,7 @@
import java.nio.channels.SeekableByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.file.*;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.FileTime;
-import java.nio.file.attribute.UserPrincipalLookupService;
+import java.nio.file.attribute.*;
import java.nio.file.spi.FileSystemProvider;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -82,9 +80,14 @@
private static final boolean isWindows = AccessController.doPrivileged(
(PrivilegedAction<Boolean>)()->System.getProperty("os.name")
.startsWith("Windows"));
- private static final Set<String> supportedFileAttributeViews =
- Set.of("basic", "zip");
private static final byte[] ROOTPATH = new byte[] { '/' };
+ private static final String OPT_POSIX = "enablePosixFileAttributes";
+ private static final String OPT_DEFAULT_OWNER = "defaultOwner";
+ private static final String OPT_DEFAULT_GROUP = "defaultGroup";
+ private static final String OPT_DEFAULT_PERMISSIONS = "defaultPermissions";
+
+ private static final Set<PosixFilePermission> DEFAULT_PERMISSIONS =
+ PosixFilePermissions.fromString("rwxrwxrwx");
private final ZipFileSystemProvider provider;
private final Path zfpath;
@@ -103,6 +106,14 @@
private final int defaultCompressionMethod; // METHOD_STORED if "noCompression=true"
// METHOD_DEFLATED otherwise
+ // POSIX support
+ final boolean supportPosix;
+ private final UserPrincipal defaultOwner;
+ private final GroupPrincipal defaultGroup;
+ private final Set<PosixFilePermission> defaultPermissions;
+
+ private final Set<String> supportedFileAttributeViews;
+
ZipFileSystem(ZipFileSystemProvider provider,
Path zfpath,
Map<String, ?> env) throws IOException
@@ -114,6 +125,12 @@
this.useTempFile = isTrue(env, "useTempFile");
this.forceEnd64 = isTrue(env, "forceZIP64End");
this.defaultCompressionMethod = isTrue(env, "noCompression") ? METHOD_STORED : METHOD_DEFLATED;
+ this.supportPosix = isTrue(env, OPT_POSIX);
+ this.defaultOwner = initOwner(zfpath, env);
+ this.defaultGroup = initGroup(zfpath, env);
+ this.defaultPermissions = initPermissions(env);
+ this.supportedFileAttributeViews = supportPosix ?
+ Set.of("basic", "posix", "zip") : Set.of("basic", "zip");
if (Files.notExists(zfpath)) {
// create a new zip if it doesn't exist
if (isTrue(env, "create")) {
@@ -151,6 +168,109 @@
return "true".equals(env.get(name)) || TRUE.equals(env.get(name));
}
+ // Initialize the default owner for files inside the zip archive.
+ // If not specified in env, it is the owner of the archive. If no owner can
+ // be determined, we try to go with system property "user.name". If that's not
+ // accessible, we return "<zipfs_default>".
+ private UserPrincipal initOwner(Path zfpath, Map<String, ?> env) throws IOException {
+ Object o = env.get(OPT_DEFAULT_OWNER);
+ if (o == null) {
+ try {
+ PrivilegedExceptionAction<UserPrincipal> pa = ()->Files.getOwner(zfpath);
+ return AccessController.doPrivileged(pa);
+ } catch (UnsupportedOperationException | PrivilegedActionException e) {
+ if (e instanceof UnsupportedOperationException ||
+ e.getCause() instanceof NoSuchFileException)
+ {
+ PrivilegedAction<String> pa = ()->System.getProperty("user.name");
+ String userName = AccessController.doPrivileged(pa);
+ return ()->userName;
+ } else {
+ throw new IOException(e);
+ }
+ }
+ }
+ if (o instanceof String) {
+ if (((String)o).isEmpty()) {
+ throw new IllegalArgumentException("Value for property " +
+ OPT_DEFAULT_OWNER + " must not be empty.");
+ }
+ return ()->(String)o;
+ }
+ if (o instanceof UserPrincipal) {
+ return (UserPrincipal)o;
+ }
+ throw new IllegalArgumentException("Value for property " +
+ OPT_DEFAULT_OWNER + " must be of type " + String.class +
+ " or " + UserPrincipal.class);
+ }
+
+ // Initialize the default group for files inside the zip archive.
+ // If not specified in env, we try to determine the group of the zip archive itself.
+ // If this is not possible/unsupported, we will return a group principal going by
+ // the same name as the default owner.
+ private GroupPrincipal initGroup(Path zfpath, Map<String, ?> env) throws IOException {
+ Object o = env.get(OPT_DEFAULT_GROUP);
+ if (o == null) {
+ try {
+ PosixFileAttributeView zfpv = Files.getFileAttributeView(zfpath, PosixFileAttributeView.class);
+ if (zfpv == null) {
+ return defaultOwner::getName;
+ }
+ PrivilegedExceptionAction<GroupPrincipal> pa = ()->zfpv.readAttributes().group();
+ return AccessController.doPrivileged(pa);
+ } catch (UnsupportedOperationException | PrivilegedActionException e) {
+ if (e instanceof UnsupportedOperationException ||
+ e.getCause() instanceof NoSuchFileException)
+ {
+ return defaultOwner::getName;
+ } else {
+ throw new IOException(e);
+ }
+ }
+ }
+ if (o instanceof String) {
+ if (((String)o).isEmpty()) {
+ throw new IllegalArgumentException("Value for property " +
+ OPT_DEFAULT_GROUP + " must not be empty.");
+ }
+ return ()->(String)o;
+ }
+ if (o instanceof GroupPrincipal) {
+ return (GroupPrincipal)o;
+ }
+ throw new IllegalArgumentException("Value for property " +
+ OPT_DEFAULT_GROUP + " must be of type " + String.class +
+ " or " + GroupPrincipal.class);
+ }
+
+ // Initialize the default permissions for files inside the zip archive.
+ // If not specified in env, it will return 777.
+ private Set<PosixFilePermission> initPermissions(Map<String, ?> env) {
+ Object o = env.get(OPT_DEFAULT_PERMISSIONS);
+ if (o == null) {
+ return DEFAULT_PERMISSIONS;
+ }
+ if (o instanceof String) {
+ return PosixFilePermissions.fromString((String)o);
+ }
+ if (!(o instanceof Set)) {
+ throw new IllegalArgumentException("Value for property " +
+ OPT_DEFAULT_PERMISSIONS + " must be of type " + String.class +
+ " or " + Set.class);
+ }
+ Set<PosixFilePermission> perms = new HashSet<>();
+ for (Object o2 : (Set<?>)o) {
+ if (o2 instanceof PosixFilePermission) {
+ perms.add((PosixFilePermission)o2);
+ } else {
+ throw new IllegalArgumentException(OPT_DEFAULT_PERMISSIONS +
+ " must only contain objects of type " + PosixFilePermission.class);
+ }
+ }
+ return perms;
+ }
+
@Override
public FileSystemProvider provider() {
return provider;
@@ -338,11 +458,13 @@
return (Entry)inode;
} else if (inode.pos == -1) {
// pseudo directory, uses METHOD_STORED
- Entry e = new Entry(inode.name, inode.isdir, METHOD_STORED);
+ Entry e = supportPosix ?
+ new PosixEntry(inode.name, inode.isdir, METHOD_STORED) :
+ new Entry(inode.name, inode.isdir, METHOD_STORED);
e.mtime = e.atime = e.ctime = zfsDefaultTimeStamp;
return e;
} else {
- return new Entry(this, inode);
+ return supportPosix ? new PosixEntry(this, inode) : new Entry(this, inode);
}
} finally {
endRead();
@@ -387,6 +509,65 @@
}
}
+ void setOwner(byte[] path, UserPrincipal owner) throws IOException {
+ checkWritable();
+ beginWrite();
+ try {
+ ensureOpen();
+ Entry e = getEntry(path); // ensureOpen checked
+ if (e == null) {
+ throw new NoSuchFileException(getString(path));
+ }
+ // as the owner information is not persistent, we don't need to
+ // change e.type to Entry.COPY
+ if (e instanceof PosixEntry) {
+ ((PosixEntry)e).owner = owner;
+ update(e);
+ }
+ } finally {
+ endWrite();
+ }
+ }
+
+ void setGroup(byte[] path, GroupPrincipal group) throws IOException {
+ checkWritable();
+ beginWrite();
+ try {
+ ensureOpen();
+ Entry e = getEntry(path); // ensureOpen checked
+ if (e == null) {
+ throw new NoSuchFileException(getString(path));
+ }
+ // as the group information is not persistent, we don't need to
+ // change e.type to Entry.COPY
+ if (e instanceof PosixEntry) {
+ ((PosixEntry)e).group = group;
+ update(e);
+ }
+ } finally {
+ endWrite();
+ }
+ }
+
+ void setPermissions(byte[] path, Set<PosixFilePermission> perms) throws IOException {
+ checkWritable();
+ beginWrite();
+ try {
+ ensureOpen();
+ Entry e = getEntry(path); // ensureOpen checked
+ if (e == null) {
+ throw new NoSuchFileException(getString(path));
+ }
+ if (e.type == Entry.CEN) {
+ e.type = Entry.COPY; // copy e
+ }
+ e.posixPerms = perms == null ? -1 : ZipUtils.permsToFlags(perms);
+ update(e);
+ } finally {
+ endWrite();
+ }
+ }
+
boolean exists(byte[] path) {
beginRead();
try {
@@ -448,7 +629,9 @@
if (dir.length == 0 || exists(dir)) // root dir, or existing dir
throw new FileAlreadyExistsException(getString(dir));
checkParents(dir);
- Entry e = new Entry(dir, Entry.NEW, true, METHOD_STORED);
+ Entry e = supportPosix ?
+ new PosixEntry(dir, Entry.NEW, true, METHOD_STORED, attrs) :
+ new Entry(dir, Entry.NEW, true, METHOD_STORED, attrs);
update(e);
} finally {
endWrite();
@@ -489,7 +672,9 @@
checkParents(dst);
}
// copy eSrc entry and change name
- Entry u = new Entry(eSrc, Entry.COPY);
+ Entry u = supportPosix ?
+ new PosixEntry((PosixEntry)eSrc, Entry.COPY) :
+ new Entry(eSrc, Entry.COPY);
u.name(dst);
if (eSrc.type == Entry.NEW || eSrc.type == Entry.FILECH) {
u.type = eSrc.type; // make it the same type
@@ -553,12 +738,15 @@
}
return os;
}
- return getOutputStream(new Entry(e, Entry.NEW));
+ return getOutputStream(supportPosix ?
+ new PosixEntry((PosixEntry)e, Entry.NEW) : new Entry(e, Entry.NEW));
} else {
if (!hasCreate && !hasCreateNew)
throw new NoSuchFileException(getString(path));
checkParents(path);
- return getOutputStream(new Entry(path, Entry.NEW, false, defaultCompressionMethod));
+ return getOutputStream(supportPosix ?
+ new PosixEntry(path, Entry.NEW, false, defaultCompressionMethod) :
+ new Entry(path, Entry.NEW, false, defaultCompressionMethod));
}
} finally {
endRead();
@@ -645,7 +833,9 @@
if (e.isDir() || options.contains(CREATE_NEW))
throw new FileAlreadyExistsException(getString(path));
SeekableByteChannel sbc =
- new EntryOutputChannel(new Entry(e, Entry.NEW));
+ new EntryOutputChannel(supportPosix ?
+ new PosixEntry((PosixEntry)e, Entry.NEW) :
+ new Entry(e, Entry.NEW));
if (options.contains(APPEND)) {
try (InputStream is = getInputStream(e)) { // copyover
byte[] buf = new byte[8192];
@@ -664,7 +854,9 @@
throw new NoSuchFileException(getString(path));
checkParents(path);
return new EntryOutputChannel(
- new Entry(path, Entry.NEW, false, defaultCompressionMethod));
+ supportPosix ?
+ new PosixEntry(path, Entry.NEW, false, defaultCompressionMethod, attrs) :
+ new Entry(path, Entry.NEW, false, defaultCompressionMethod, attrs));
} finally {
endRead();
}
@@ -728,7 +920,10 @@
final FileChannel fch = tmpfile.getFileSystem()
.provider()
.newFileChannel(tmpfile, options, attrs);
- final Entry u = isFCH ? e : new Entry(path, tmpfile, Entry.FILECH);
+ final Entry u = isFCH ? e : (
+ supportPosix ?
+ new PosixEntry(path, tmpfile, Entry.FILECH, attrs) :
+ new Entry(path, tmpfile, Entry.FILECH, attrs));
if (forWrite) {
u.flag = FLAG_DATADESCR;
u.method = defaultCompressionMethod;
@@ -1343,7 +1538,7 @@
continue; // no root '/' directory even if it
// exists in original zip/jar file.
}
- e = new Entry(this, inode);
+ e = supportPosix ? new PosixEntry(this, inode) : new Entry(this, inode);
try {
if (buf == null)
buf = new byte[8192];
@@ -1417,7 +1612,7 @@
return (Entry)inode;
if (inode == null || inode.pos == -1)
return null;
- return new Entry(this, inode);
+ return supportPosix ? new PosixEntry(this, inode): new Entry(this, inode);
}
public void deleteFile(byte[] path, boolean failIfNotExists)
@@ -2053,6 +2248,7 @@
// entry attributes
int version;
int flag;
+ int posixPerms = -1; // posix permissions
int method = -1; // compression method
long mtime = -1; // last modification time (in DOS time)
long atime = -1; // last access time
@@ -2081,13 +2277,20 @@
this.method = method;
}
- Entry(byte[] name, int type, boolean isdir, int method) {
+ @SuppressWarnings("unchecked")
+ Entry(byte[] name, int type, boolean isdir, int method, FileAttribute<?>... attrs) {
this(name, isdir, method);
this.type = type;
+ for (FileAttribute<?> attr : attrs) {
+ String attrName = attr.name();
+ if (attrName.equals("posix:permissions")) {
+ posixPerms = ZipUtils.permsToFlags((Set<PosixFilePermission>)attr.value());
+ }
+ }
}
- Entry(byte[] name, Path file, int type) {
- this(name, type, false, METHOD_STORED);
+ Entry(byte[] name, Path file, int type, FileAttribute<?>... attrs) {
+ this(name, type, false, METHOD_STORED, attrs);
this.file = file;
}
@@ -2111,6 +2314,7 @@
*/
this.locoff = e.locoff;
this.comment = e.comment;
+ this.posixPerms = e.posixPerms;
this.type = type;
}
@@ -2135,6 +2339,15 @@
throw new ZipException("unsupported compression method");
}
+ /**
+ * Adds information about compatibility of file attribute information
+ * to a version value.
+ */
+ private int versionMadeBy(int version) {
+ return (posixPerms < 0) ? version :
+ VERSION_MADE_BY_BASE_UNIX | (version & 0xff);
+ }
+
///////////////////// CEN //////////////////////
private void readCEN(ZipFileSystem zipfs, IndexNode inode) throws IOException {
byte[] cen = zipfs.cen;
@@ -2157,6 +2370,9 @@
attrs = CENATT(cen, pos);
attrsEx = CENATX(cen, pos);
*/
+ if (CENVEM_FA(cen, pos) == FILE_ATTRIBUTES_UNIX) {
+ posixPerms = CENATX_PERMS(cen, pos) & 0xFFF; // 12 bits for setuid, setgid, sticky + perms
+ }
locoff = CENOFF(cen, pos);
pos += CENHDR;
this.name = inode.name;
@@ -2223,7 +2439,7 @@
}
}
writeInt(os, CENSIG); // CEN header signature
- writeShort(os, version0); // version made by
+ writeShort(os, versionMadeBy(version0)); // version made by
writeShort(os, version0); // version needed to extract
writeShort(os, flag); // general purpose bit flag
writeShort(os, method); // compression method
@@ -2242,7 +2458,9 @@
}
writeShort(os, 0); // starting disk number
writeShort(os, 0); // internal file attributes (unused)
- writeInt(os, 0); // external file attributes (unused)
+ writeInt(os, posixPerms > 0 ? posixPerms << 16 : 0); // external file
+ // attributes, used for storing posix
+ // permissions
writeInt(os, locoff0); // relative offset of local header
writeBytes(os, zname, 1, nlen);
if (zip64) {
@@ -2527,6 +2745,10 @@
fm.format(" compressedSize : %d%n", compressedSize());
fm.format(" crc : %x%n", crc());
fm.format(" method : %d%n", method());
+ Set<PosixFilePermission> permissions = storedPermissions().orElse(null);
+ if (permissions != null) {
+ fm.format(" permissions : %s%n", permissions);
+ }
fm.close();
return sb.toString();
}
@@ -2607,6 +2829,62 @@
return Arrays.copyOf(comment, comment.length);
return null;
}
+
+ @Override
+ public Optional<Set<PosixFilePermission>> storedPermissions() {
+ Set<PosixFilePermission> perms = null;
+ if (posixPerms != -1) {
+ perms = new HashSet<>(PosixFilePermission.values().length);
+ for (PosixFilePermission perm : PosixFilePermission.values()) {
+ if ((posixPerms & ZipUtils.permToFlag(perm)) != 0) {
+ perms.add(perm);
+ }
+ }
+ }
+ return Optional.ofNullable(perms);
+ }
+ }
+
+ final class PosixEntry extends Entry implements PosixFileAttributes {
+ private UserPrincipal owner = defaultOwner;
+ private GroupPrincipal group = defaultGroup;
+
+ PosixEntry(byte[] name, boolean isdir, int method) {
+ super(name, isdir, method);
+ }
+
+ PosixEntry(byte[] name, int type, boolean isdir, int method, FileAttribute<?>... attrs) {
+ super(name, type, isdir, method, attrs);
+ }
+
+ PosixEntry(byte[] name, Path file, int type, FileAttribute<?>... attrs) {
+ super(name, file, type, attrs);
+ }
+
+ PosixEntry(PosixEntry e, int type) {
+ super(e, type);
+ this.owner = e.owner;
+ this.group = e.group;
+ }
+
+ PosixEntry(ZipFileSystem zipfs, IndexNode inode) throws IOException {
+ super(zipfs, inode);
+ }
+
+ @Override
+ public UserPrincipal owner() {
+ return owner;
+ }
+
+ @Override
+ public GroupPrincipal group() {
+ return group;
+ }
+
+ @Override
+ public Set<PosixFilePermission> permissions() {
+ return storedPermissions().orElse(Set.copyOf(defaultPermissions));
+ }
}
private static class ExistingChannelCloser {
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java Thu Aug 08 17:27:17 2019 -0400
@@ -34,11 +34,7 @@
import java.nio.channels.SeekableByteChannel;
import java.nio.file.*;
import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.attribute.BasicFileAttributeView;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.FileAttributeView;
-import java.nio.file.attribute.FileTime;
+import java.nio.file.attribute.*;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
@@ -711,6 +707,12 @@
return (V)new ZipFileAttributeView(this, false);
if (type == ZipFileAttributeView.class)
return (V)new ZipFileAttributeView(this, true);
+ if (zfs.supportPosix) {
+ if (type == PosixFileAttributeView.class)
+ return (V)new ZipPosixFileAttributeView(this, false);
+ if (type == FileOwnerAttributeView.class)
+ return (V)new ZipPosixFileAttributeView(this,true);
+ }
throw new UnsupportedOperationException("view <" + type + "> is not supported");
}
@@ -721,6 +723,12 @@
return new ZipFileAttributeView(this, false);
if ("zip".equals(type))
return new ZipFileAttributeView(this, true);
+ if (zfs.supportPosix) {
+ if ("posix".equals(type))
+ return new ZipPosixFileAttributeView(this, false);
+ if ("owner".equals(type))
+ return new ZipPosixFileAttributeView(this, true);
+ }
throw new UnsupportedOperationException("view <" + type + "> is not supported");
}
@@ -764,10 +772,16 @@
@SuppressWarnings("unchecked") // Cast to A
<A extends BasicFileAttributes> A readAttributes(Class<A> type) throws IOException {
+ // unconditionally support BasicFileAttributes and ZipFileAttributes
if (type == BasicFileAttributes.class || type == ZipFileAttributes.class) {
return (A)readAttributes();
}
+ // support PosixFileAttributes when activated
+ if (type == PosixFileAttributes.class && zfs.supportPosix) {
+ return (A)readAttributes();
+ }
+
throw new UnsupportedOperationException("Attributes of type " +
type.getName() + " not supported");
}
@@ -794,9 +808,22 @@
zfs.setTimes(getResolvedPath(), mtime, atime, ctime);
}
+ void setOwner(UserPrincipal owner) throws IOException {
+ zfs.setOwner(getResolvedPath(), owner);
+ }
+
+ void setPermissions(Set<PosixFilePermission> perms)
+ throws IOException
+ {
+ zfs.setPermissions(getResolvedPath(), perms);
+ }
+
+ void setGroup(GroupPrincipal group) throws IOException {
+ zfs.setGroup(getResolvedPath(), group);
+ }
+
Map<String, Object> readAttributes(String attributes, LinkOption... options)
throws IOException
-
{
String view;
String attrs;
@@ -948,12 +975,14 @@
}
}
if (copyAttrs) {
- BasicFileAttributeView view =
- target.getFileAttributeView(BasicFileAttributeView.class);
+ ZipFileAttributeView view =
+ target.getFileAttributeView(ZipFileAttributeView.class);
try {
view.setTimes(zfas.lastModifiedTime(),
zfas.lastAccessTime(),
zfas.creationTime());
+ // copy permissions
+ view.setPermissions(zfas.storedPermissions().orElse(null));
} catch (IOException x) {
// rollback?
try {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPosixFileAttributeView.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nio.zipfs;
+
+import java.io.IOException;
+import java.nio.file.attribute.GroupPrincipal;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.attribute.UserPrincipal;
+
+/**
+ * The zip file system attribute view with POSIX support.
+ */
+class ZipPosixFileAttributeView extends ZipFileAttributeView implements PosixFileAttributeView {
+ private final boolean isOwnerView;
+
+ ZipPosixFileAttributeView(ZipPath path, boolean owner) {
+ super(path, true);
+ this.isOwnerView = owner;
+ }
+
+ @Override
+ public String name() {
+ return isOwnerView ? "owner" : "posix";
+ }
+
+ @Override
+ public PosixFileAttributes readAttributes() throws IOException {
+ return (PosixFileAttributes)path.readAttributes();
+ }
+
+ @Override
+ public UserPrincipal getOwner() throws IOException {
+ return readAttributes().owner();
+ }
+
+ @Override
+ public void setOwner(UserPrincipal owner) throws IOException {
+ path.setOwner(owner);
+ }
+
+ @Override
+ public void setGroup(GroupPrincipal group) throws IOException {
+ path.setGroup(group);
+ }
+
+ @Override
+ Object attribute(AttrID id, ZipFileAttributes zfas) {
+ PosixFileAttributes pzfas = (PosixFileAttributes)zfas;
+ switch (id) {
+ case owner:
+ return pzfas.owner();
+ case group:
+ return pzfas.group();
+ case permissions:
+ if (!isOwnerView) {
+ return pzfas.permissions();
+ } else {
+ return super.attribute(id, zfas);
+ }
+ default:
+ return super.attribute(id, zfas);
+ }
+ }
+}
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipUtils.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -27,12 +27,14 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.file.attribute.PosixFilePermission;
import java.time.DateTimeException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.Date;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.PatternSyntaxException;
@@ -41,6 +43,102 @@
*/
class ZipUtils {
+ /**
+ * The bit flag used to specify read permission by the owner.
+ */
+ static final int POSIX_USER_READ = 0400;
+
+ /**
+ * The bit flag used to specify write permission by the owner.
+ */
+ static final int POSIX_USER_WRITE = 0200;
+
+ /**
+ * The bit flag used to specify execute permission by the owner.
+ */
+ static final int POSIX_USER_EXECUTE = 0100;
+
+ /**
+ * The bit flag used to specify read permission by the group.
+ */
+ static final int POSIX_GROUP_READ = 040;
+
+ /**
+ * The bit flag used to specify write permission by the group.
+ */
+ static final int POSIX_GROUP_WRITE = 020;
+
+ /**
+ * The bit flag used to specify execute permission by the group.
+ */
+ static final int POSIX_GROUP_EXECUTE = 010;
+
+ /**
+ * The bit flag used to specify read permission by others.
+ */
+ static final int POSIX_OTHER_READ = 04;
+
+ /**
+ * The bit flag used to specify write permission by others.
+ */
+ static final int POSIX_OTHER_WRITE = 02;
+
+ /**
+ * The bit flag used to specify execute permission by others.
+ */
+ static final int POSIX_OTHER_EXECUTE = 01;
+
+ /**
+ * Convert a {@link PosixFilePermission} object into the appropriate bit
+ * flag.
+ *
+ * @param perm The {@link PosixFilePermission} object.
+ * @return The bit flag as int.
+ */
+ static int permToFlag(PosixFilePermission perm) {
+ switch(perm) {
+ case OWNER_READ:
+ return POSIX_USER_READ;
+ case OWNER_WRITE:
+ return POSIX_USER_WRITE;
+ case OWNER_EXECUTE:
+ return POSIX_USER_EXECUTE;
+ case GROUP_READ:
+ return POSIX_GROUP_READ;
+ case GROUP_WRITE:
+ return POSIX_GROUP_WRITE;
+ case GROUP_EXECUTE:
+ return POSIX_GROUP_EXECUTE;
+ case OTHERS_READ:
+ return POSIX_OTHER_READ;
+ case OTHERS_WRITE:
+ return POSIX_OTHER_WRITE;
+ case OTHERS_EXECUTE:
+ return POSIX_OTHER_EXECUTE;
+ default:
+ return 0;
+ }
+ }
+
+ /**
+ * Converts a set of {@link PosixFilePermission}s into an int value where
+ * the according bits are set.
+ *
+ * @param perms A Set of {@link PosixFilePermission} objects.
+ *
+ * @return A bit mask representing the input Set.
+ */
+ static int permsToFlags(Set<PosixFilePermission> perms) {
+ if (perms == null) {
+ return -1;
+ }
+ int flags = 0;
+ for (PosixFilePermission perm : perms) {
+ flags |= permToFlag(perm);
+ }
+ return flags;
+ }
+
/*
* Writes a 16-bit short to the output stream in little-endian byte order.
*/
--- a/src/jdk.zipfs/share/classes/module-info.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/jdk.zipfs/share/classes/module-info.java Thu Aug 08 17:27:17 2019 -0400
@@ -23,6 +23,15 @@
* questions.
*/
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileAttributeView;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.util.Set;
+
/**
* Provides the implementation of the Zip file system provider.
* The Zip file system provider treats the contents of a Zip or JAR file as a file system.
@@ -32,14 +41,91 @@
* The {@linkplain java.nio.file.FileSystems FileSystems} {@code newFileSystem}
* static factory methods can be used to:
* <ul>
- * <li>Create a Zip file system</li>
- * <li>Open an existing file as a Zip file system</li>
+ * <li>Create a Zip file system</li>
+ * <li>Open an existing file as a Zip file system</li>
* </ul>
*
- * <h3>URI Scheme Used to Identify the Zip File System</h3>
+ * <h2>URI Scheme Used to Identify the Zip File System</h2>
*
* The URI {@link java.net.URI#getScheme scheme} that identifies the ZIP file system is {@code jar}.
*
+ * <h2>POSIX file attributes</h2>
+ *
+ * A Zip file system supports a file attribute {@link FileAttributeView view}
+ * named "{@code zip}" that defines the following file attribute:
+ *
+ * <blockquote>
+ * <table class="striped">
+ * <caption style="display:none">Supported attributes</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Name</th>
+ * <th scope="col">Type</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <th scope="row">permissions</th>
+ * <td>{@link Set}<{@link PosixFilePermission}></td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * </blockquote>
+ *
+ * The "permissions" attribute is the set of access permissions that are optionally
+ * stored for entries in a Zip file. The value of the attribute is {@code null}
+ * for entries that do not have access permissions. Zip file systems do not
+ * enforce access permissions.
+ *
+ * <p> The "permissions" attribute may be read and set using the
+ * {@linkplain Files#getAttribute(Path, String, LinkOption...) Files.getAttribute} and
+ * {@linkplain Files#setAttribute(Path, String, Object, LinkOption...) Files.setAttribute}
+ * methods. The following example uses these methods to read and set the attribute:
+ * <pre> {@code
+ * Set<PosixFilePermission> perms = Files.getAttribute(entry, "zip:permissions");
+ * if (perms == null) {
+ * perms = PosixFilePermissions.fromString("rw-rw-rw-");
+ * Files.setAttribute(entry, "zip:permissions", perms);
+ * }
+ * } </pre>
+ *
+ * <p> In addition to the "{@code zip}" view, a Zip file system optionally supports
+ * the {@link PosixFileAttributeView} ("{@code posix}").
+ * This view extends the "{@code basic}" view with type safe access to the
+ * {@link PosixFileAttributes#owner() owner}, {@link PosixFileAttributes#group() group-owner},
+ * and {@link PosixFileAttributes#permissions() permissions} attributes. The
+ * "{@code posix}" view is only supported when the Zip file system is created with
+ * the provider property "{@code enablePosixFileAttributes}" set to "{@code true}".
+ * The following creates a file system with this property and reads the access
+ * permissions of a file:
+ * <pre> {@code
+ * var env = Map.of("enablePosixFileAttributes", "true");
+ * try (FileSystem fs = FileSystems.newFileSystem(file, env) {
+ * Path entry = fs.getPath("entry");
+ * Set<PosixFilePermission> perms = Files.getPosixFilePermissions(entry);
+ * }
+ * } </pre>
+ *
+ * <p> The file owner and group owner attributes are not persisted, meaning they are
+ * not stored in the zip file. The "{@code defaultOwner}" and "{@code defaultGroup}"
+ * provider properties (listed below) can be used to configure the default values
+ * for these attributes. If these properties are not set then the file owner
+ * defaults to the owner of the zip file, and the group owner defaults to the
+ * zip file's group owner (or the file owner on platforms that don't support a
+ * group owner).
+ *
+ * <p> The "{@code permissions}" attribute is not optional in the "{@code posix}"
+ * view so a default set of permissions are used for entries that do not have
+ * access permissions stored in the Zip file. The default set of permissions
+ * are
+ * <ul>
+ * <li>{@link PosixFilePermission#OWNER_READ OWNER_READ}</li>
+ * <li>{@link PosixFilePermission#OWNER_WRITE OWNER_WRITE}</li>
+ * <li>{@link PosixFilePermission#GROUP_READ GROUP_READ}</li>
+ * </ul>
+ * The default permissions can be configured with the "{@code defaultPermissions}"
+ * property described below.
+ *
* <h2>Zip File System Properties</h2>
*
* The following properties may be specified when creating a Zip
@@ -50,12 +136,12 @@
* a new Zip file system
* </caption>
* <thead>
- * <tr>
- * <th scope="col">Property Name</th>
- * <th scope="col">Data Type</th>
- * <th scope="col">Default Value</th>
- * <th scope="col">Description</th>
- * </tr>
+ * <tr>
+ * <th scope="col">Property Name</th>
+ * <th scope="col">Data Type</th>
+ * <th scope="col">Default Value</th>
+ * <th scope="col">Description</th>
+ * </tr>
* </thead>
*
* <tbody>
@@ -77,6 +163,44 @@
* names of the entries in the Zip or JAR file.
* </td>
* </tr>
+ * <tr>
+ * <td scope="row">enablePosixFileAttributes</td>
+ * <td>java.lang.String</td>
+ * <td>false</td>
+ * <td>
+ * If the value is {@code true}, the Zip file system will support
+ * the {@link java.nio.file.attribute.PosixFileAttributeView PosixFileAttributeView}.
+ * </td>
+ * </tr>
+ * <tr>
+ * <td scope="row">defaultOwner</td>
+ * <td>{@link java.nio.file.attribute.UserPrincipal UserPrincipal}<br> or java.lang.String</td>
+ * <td>null/unset</td>
+ * <td>
+ * Override the default owner for entries in the Zip file system.<br>
+ * The value can be a UserPrincipal or a String value that is used as the UserPrincipal's name.
+ * </td>
+ * </tr>
+ * <tr>
+ * <td scope="row">defaultGroup</td>
+ * <td>{@link java.nio.file.attribute.GroupPrincipal GroupPrincipal}<br> or java.lang.String</td>
+ * <td>null/unset</td>
+ * <td>
+ * Override the the default group for entries in the Zip file system.<br>
+ * The value can be a GroupPrincipal or a String value that is used as the GroupPrincipal's name.
+ * </td>
+ * </tr>
+ * <tr>
+ * <td scope="row">defaultPermissions</td>
+ * <td>{@link java.util.Set Set}<{@link java.nio.file.attribute.PosixFilePermission PosixFilePermission}><br>
+ * or java.lang.String</td>
+ * <td>null/unset</td>
+ * <td>
+ * Override the default Set of permissions for entries in the Zip file system.<br>
+ * The value can be a {@link java.util.Set Set}<{@link java.nio.file.attribute.PosixFilePermission PosixFilePermission}> or<br>
+ * a String that is parsed by {@link java.nio.file.attribute.PosixFilePermissions#fromString PosixFilePermissions::fromString}
+ * </td>
+ * </tr>
* </tbody>
* </table>
*
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/CallSite.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/CallSite.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -185,7 +185,10 @@
stream.print(" @ " + getBci() + " " + m + " " + getReason());
}
stream.print(getIntrinsicOrEmptyString());
- stream.printf(" (end time: %6.4f", getTimeStamp());
+ if (LogCompilation.compare == false) {
+ // The timestamp is not useful for log comparison
+ stream.printf(" (end time: %6.4f", getTimeStamp());
+ }
if (getEndNodes() > 0) {
stream.printf(" nodes: %d live: %d", getEndNodes(), getEndLiveNodes());
}
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/Compilation.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/Compilation.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -83,9 +83,9 @@
private String special;
/**
- * The name of the compiler performing this compilation.
+ * The compilation level for this task.
*/
- private String compiler;
+ private long level;
/**
* Start time stamp.
@@ -152,12 +152,12 @@
return start;
}
- public void setCompiler(String compiler) {
- this.compiler = compiler;
- }
-
public String getCompiler() {
- return compiler;
+ assert getNMethod() != null || getFailureReason() != null : "Null nmethod for Compilation:" + getId() + " " + getMethod();
+ if (getNMethod() != null) {
+ getNMethod().getCompiler();
+ }
+ return "";
}
@Override
@@ -194,7 +194,7 @@
stream.println(getSpecial());
} else {
int bc = isOsr() ? getBCI() : -1;
- stream.print(getId() + getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc));
+ stream.print(getId() + getMethod().decodeFlags(bc) + " " + getCompiler() + " " + getMethod().format(bc));
}
}
@@ -222,7 +222,7 @@
}
}
int bc = isOsr() ? getBCI() : -1;
- stream.print(getMethod().decodeFlags(bc) + " " + compiler + " " + getMethod().format(bc));
+ stream.print(getMethod().decodeFlags(bc) + " " + getCompiler() + " " + getMethod().format(bc));
stream.println();
if (getFailureReason() != null) {
stream.println("COMPILE SKIPPED: " + getFailureReason() + " (not retryable)");
@@ -365,4 +365,21 @@
public Compilation getCompilation() {
return this;
}
+
+ /**
+ * @return the level
+ */
+ public long getLevel() {
+ return level;
+ }
+
+ /**
+ * @param level the level to set
+ */
+ public void setLevel(long level) {
+ this.level = level;
+ if (getMethod() != null) {
+ getMethod().setLevel(level);
+ }
+ }
}
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogCompilation.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -66,6 +66,11 @@
}
/**
+ * compare controls how some output is formatted
+ */
+ public static boolean compare = false;
+
+ /**
* Process command line arguments, parse log files and trigger desired
* functionality.
*/
@@ -76,7 +81,6 @@
boolean cleanup = false;
boolean trapHistory = false;
boolean printTimeStamps = false;
- boolean compare = false;
boolean printID = true;
int index = 0;
@@ -254,24 +258,29 @@
* {@linkplain #compareLogs() comparing logs}.
*/
static class MethodBCIPair {
- public MethodBCIPair(Method m, int b, String c) {
+ public MethodBCIPair(Method m, int b, String c, long l) {
method = m;
bci = b;
compiler = c;
+ level = l;
}
Method method;
int bci;
String compiler;
+ long level;
public boolean equals(Object other) {
if (!(other instanceof MethodBCIPair)) {
return false;
}
MethodBCIPair otherp = (MethodBCIPair)other;
+ assert otherp.compiler != null : "otherp null compiler: " + otherp;
+ assert method.getCompiler() != compiler : "Compiler doesnt match";
return (otherp.bci == bci &&
otherp.method.equals(method) &&
- otherp.compiler.equals(compiler));
+ otherp.compiler.equals(compiler) &&
+ otherp.level == level);
}
public int hashCode() {
@@ -282,7 +291,7 @@
if (bci != -1) {
return method + "@" + bci + " (" + compiler + ")";
} else {
- return method + " (" + compiler + ")";
+ return method + " (" + compiler + "(" + level + "))";
}
}
}
@@ -322,8 +331,23 @@
for (LogEvent c : events) {
if (c instanceof Compilation) {
Compilation comp = (Compilation) c;
- MethodBCIPair key = new MethodBCIPair(comp.getMethod(), comp.getBCI(),
- comp.getCompiler());
+ assert (comp.getNMethod() != null || comp.getFailureReason() != null ): "NMethod is null in compare: " + comp;
+ String compiler = comp.getNMethod() != null ? comp.getNMethod().getCompiler() :
+ (comp.getCompiler() != null ? comp.getCompiler() : "");
+ assert compiler != null : "Compiler is null in compare: " + comp;
+ long level = -99;
+ if (comp.getLevel() == 0) {
+ if (comp.getNMethod() != null) {
+ level = comp.getNMethod().getLevel();
+ }
+ if (level == 0) {
+ level = comp.getMethod().getLevel();
+ }
+ } else {
+ level = comp.getLevel();
+ }
+ assert level != -99 || comp.getFailureReason() != null : "Failed Compile";
+ MethodBCIPair key = new MethodBCIPair(comp.getMethod(), comp.getBCI(), compiler, level);
MethodBCIPair e = methods.get(key);
if (e == null) {
methods.put(key, key);
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java Thu Aug 08 17:27:17 2019 -0400
@@ -866,11 +866,11 @@
compile.setBCount(search(atts, "backedge_count", "0"));
compile.setBCI(Integer.parseInt(search(atts, "osr_bci", "-1")));
String compiler = atts.getValue("compiler");
- if (compiler == null) {
- compiler = "";
+ assert compiler == null : "Compiler is not specified in task";
+ long level = parseLong(search(atts, "level", "0"));
+ if (level != 0) {
+ compile.setLevel(level);
}
- compile.setCompiler(compiler);
-
// Extract the name of the compiled method.
String[] parts = spacePattern.split(atts.getValue("method"));
String methodName = parts[0] + "::" + parts[1];
@@ -896,6 +896,7 @@
m.setSignature(parts[2]);
m.setFlags("0");
m.setBytes(search(atts, "bytes", "unknown"));
+ m.setLevel(compile.getLevel());
compile.setMethod(m);
events.add(compile);
compiles.put(id, compile);
@@ -932,6 +933,12 @@
m.setIICount(search(atts, "iicount"));
m.setFlags(search(atts, "flags"));
}
+ String compiler = search(atts, "compiler", "");
+ m.setCompiler(compiler);
+ long level = parseLong(search(atts, "level", "0"));
+ if (level != 0) {
+ m.setLevel(level);
+ }
methods.put(id, m);
} else if (qname.equals("call")) {
if (methodHandleSite != null) {
@@ -1100,6 +1107,8 @@
if (level != null) {
nm.setLevel(parseLong(level));
}
+ String compiler = search(atts, "compiler", "");
+ nm.setCompiler(compiler);
nmethods.put(id, nm);
events.add(nm);
} else if (qname.equals("parse")) {
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/Method.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/Method.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -71,6 +71,16 @@
private String flags;
/**
+ * The name of the compiler performing this compilation.
+ */
+ private String compiler;
+
+ /**
+ * The nmethod's compilation level.
+ */
+ private long level;
+
+ /**
* Decode the {@link flags} numerical string to a format for console
* output. The result does not honour all possible flags but includes
* information about OSR compilation.
@@ -186,4 +196,33 @@
public int hashCode() {
return holder.hashCode() ^ name.hashCode();
}
+
+ /**
+ * @return the compiler
+ */
+ public String getCompiler() {
+ return compiler;
+ }
+
+ /**
+ * @param compiler the compiler to set
+ */
+ public void setCompiler(String compiler) {
+ this.compiler = compiler;
+ }
+
+ /**
+ * @return the level
+ */
+ public long getLevel() {
+ return level;
+ }
+
+ /**
+ * @param level the level to set
+ */
+ public void setLevel(long level) {
+ assert this.level == 0 || this.level == level;
+ this.level = level;
+ }
}
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/NMethod.java Thu Aug 08 17:23:13 2019 -0400
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/NMethod.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -47,6 +47,11 @@
*/
private long level;
+ /**
+ * The name of the compiler performing this compilation.
+ */
+ private String compiler;
+
NMethod(double s, String i, long a, long sz) {
super(s, i);
address = a;
@@ -85,6 +90,21 @@
* @param level the level to set
*/
public void setLevel(long level) {
+ assert this.level == 0 || this.level == level;
this.level = level;
}
+
+ /**
+ * @return the compiler
+ */
+ public String getCompiler() {
+ return compiler;
+ }
+
+ /**
+ * @param compiler the compiler to set
+ */
+ public void setCompiler(String compiler) {
+ this.compiler = compiler;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/utils/LogCompilation/src/test/java/com/sun/hotspot/tools/compiler/TestCompare.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package com.sun.hotspot.tools.compiler;
+
+import java.util.Arrays;
+import java.util.Collection;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(value = Parameterized.class)
+public class TestCompare {
+
+ String logFile;
+
+ static final String setupArgsTieredVersion[] = {
+ "java",
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+LogCompilation",
+ "-XX:LogFile=target/tiered_version.log",
+ "-version"
+ };
+
+ static final String setupArgsTieredVersion2[] = {
+ "java",
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+LogCompilation",
+ "-XX:LogFile=target/tiered_version.log.2",
+ "-version"
+ };
+
+ static final String setupArgsNoTiered[] = {
+ "java",
+ "-XX:-TieredCompilation",
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+LogCompilation",
+ "-XX:LogFile=target/no_tiered_short.log"
+ };
+
+ static final String setupArgsNoTiered2[] = {
+ "java",
+ "-XX:-TieredCompilation",
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+LogCompilation",
+ "-XX:LogFile=target/no_tiered_short.log.2"
+ };
+
+ static final String allSetupArgs[][] = {
+ setupArgsTieredVersion,
+ setupArgsTieredVersion2,
+ setupArgsNoTiered,
+ setupArgsNoTiered2
+ };
+
+ @Parameters
+ public static Collection data() {
+ Object[][] data = new Object[][]{
+ // Take care these match whats created in the setup method
+ {"./target/tiered_version.log"},
+ {"./target/no_tiered_short.log"}
+ };
+ assert data.length == (allSetupArgs.length/2) : "Files dont match args. Need 2 inputs per test case.";
+ return Arrays.asList(data);
+ }
+
+ @BeforeClass
+ public static void setup() {
+ try {
+ for (String[] setupArgs : allSetupArgs) {
+ Process p = Runtime.getRuntime().exec(setupArgs);
+ p.waitFor();
+ }
+ } catch (Exception e) {
+ System.out.println(e + ": exec failed:" + setupArgsNoTiered[0]);
+ }
+ }
+
+ public TestCompare(String logFile) {
+ this.logFile = logFile;
+ }
+
+ @Test
+ public void testDashC() throws Exception {
+ String[] args = {"-C",
+ logFile,
+ logFile + ".2"
+ };
+
+ LogCompilation.main(args);
+ }
+
+}
--- a/test/hotspot/jtreg/ProblemList.txt Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/ProblemList.txt Thu Aug 08 17:27:17 2019 -0400
@@ -59,6 +59,16 @@
compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+compiler/rtm/locking/TestRTMAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMAbortThreshold.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMLockingCalculationDelay.java 8183263 generic-x64
+compiler/rtm/locking/TestRTMLockingThreshold.java 8183263 generic-x64
+compiler/rtm/locking/TestUseRTMDeopt.java 8183263 generic-x64
+compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
+
#############################################################################
# :hotspot_gc
@@ -67,6 +77,7 @@
gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java 8156755 generic-all
gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
+gc/stress/gclocker/TestExcessGCLockerCollections.java 8229120 generic-all
gc/stress/gclocker/TestGCLockerWithParallel.java 8180622 generic-all
gc/stress/gclocker/TestGCLockerWithG1.java 8180622 generic-all
gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java 8192647 generic-all
@@ -84,32 +95,32 @@
serviceability/sa/ClhsdbAttach.java 8193639 solaris-all
serviceability/sa/ClhsdbCDSCore.java 8193639 solaris-all
-serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639 solaris-all
serviceability/sa/CDSJMapClstats.java 8193639 solaris-all
serviceability/sa/ClhsdbField.java 8193639 solaris-all
-serviceability/sa/ClhsdbFindPC.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbFindPC.java 8193639 solaris-all
serviceability/sa/ClhsdbFlags.java 8193639 solaris-all
-serviceability/sa/ClhsdbInspect.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
-serviceability/sa/ClhsdbJdis.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbInspect.java 8193639 solaris-all
+serviceability/sa/ClhsdbJdis.java 8193639 solaris-all
serviceability/sa/ClhsdbJhisto.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
-serviceability/sa/ClhsdbJstack.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbJstack.java 8193639 solaris-all
serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all
serviceability/sa/ClhsdbPmap.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all
-serviceability/sa/ClhsdbPrintAs.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbPrintAs.java 8193639 solaris-all
serviceability/sa/ClhsdbPrintStatics.java 8193639 solaris-all
serviceability/sa/ClhsdbPstack.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java 8193639 solaris-all
serviceability/sa/ClhsdbScanOops.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
-serviceability/sa/ClhsdbSource.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbSource.java 8193639 solaris-all
serviceability/sa/ClhsdbThread.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
serviceability/sa/ClhsdbVmStructsDump.java 8193639 solaris-all
-serviceability/sa/ClhsdbWhere.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/ClhsdbWhere.java 8193639 solaris-all
serviceability/sa/DeadlockDetectionTest.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
-serviceability/sa/JhsdbThreadInfoTest.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/JhsdbThreadInfoTest.java 8193639 solaris-all
serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java 8193639 solaris-all
serviceability/sa/TestClassDump.java 8193639 solaris-all
-serviceability/sa/TestClhsdbJstackLock.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/TestClhsdbJstackLock.java 8193639 solaris-all
serviceability/sa/TestCpoolForInvokeDynamic.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
serviceability/sa/TestDefaultMethods.java 8193639 solaris-all
serviceability/sa/TestG1HeapRegion.java 8193639 solaris-all
@@ -118,7 +129,7 @@
serviceability/sa/TestInstanceKlassSize.java 8193639 solaris-all
serviceability/sa/TestInstanceKlassSizeForInterface.java 8193639 solaris-all
serviceability/sa/TestIntConstant.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
-serviceability/sa/TestJhsdbJstackLock.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
+serviceability/sa/TestJhsdbJstackLock.java 8193639 solaris-all
serviceability/sa/TestJmapCore.java 8193639 solaris-all
serviceability/sa/TestJmapCoreMetaspace.java 8193639 solaris-all
serviceability/sa/TestPrintMdo.java 8193639 solaris-all
@@ -135,6 +146,16 @@
#############################################################################
+
+#############################################################################
+
+# :hotspot_containers
+
+containers/docker/TestJcmdWithSideCar.java 8228850,8228960 generic-all
+
+#############################################################################
+
+
#############################################################################
# :vmTestbase_*
@@ -167,6 +188,7 @@
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
+vmTestbase/nsk/jvmti/GetThreadState/thrstat001/TestDescription.java 8221372 windows-x64
vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8208243,8192647 generic-all
--- a/test/hotspot/jtreg/TEST.groups Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/TEST.groups Thu Aug 08 17:27:17 2019 -0400
@@ -61,7 +61,8 @@
-:hotspot_gc \
-:hotspot_runtime \
-:hotspot_serviceability \
- -gc/nvdimm
+ -gc/nvdimm \
+ -:hotspot_containers
hotspot_native_sanity = \
native_sanity
--- a/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/DeoptimizationTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -class compiler.aot.DeoptimizationTest
* -compile compiler.aot.DeoptimizationTest.testMethod()D
* -extraopt -XX:-UseCompressedOops
- * @run main/othervm -Xmixed -XX:+UseAOT -XX:+TieredCompilation
+ * @run main/othervm -Xmixed -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+TieredCompilation
* -XX:-UseCompressedOops
* -XX:CompileCommand=dontinline,compiler.aot.DeoptimizationTest::*
* -XX:AOTLibrary=./libDeoptimizationTest.so -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/RecompilationTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/RecompilationTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -43,7 +43,7 @@
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
* -extraopt -XX:-UseCompressedOops
* -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::*
- * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:-TieredCompilation
+ * @run main/othervm -Xmixed -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:-TieredCompilation
* -XX:-UseCounterDecay -XX:-UseCompressedOops
* -XX:-Inline
* -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/SharedUsageTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/SharedUsageTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -31,7 +31,8 @@
* @run driver compiler.aot.AotCompiler -libname libSharedUsageTest.so
* -class compiler.aot.SharedUsageTest
* -extraopt -XX:-UseCompressedOops
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./libSharedUsageTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./libSharedUsageTest.so
* -XX:-UseCompressedOops
* -Dcompiler.aot.SharedUsageTest.parent=true
* compiler.aot.SharedUsageTest
@@ -62,7 +63,7 @@
new String[]{"libSharedUsageTest.so aot library",
HELLO_MSG}, null, "Unexpected exit code",
"Unexpected output", ExitCode.OK, ADD_TEST_VM_OPTION,
- "-XX:+UseAOT", "-XX:+PrintAOT",
+ "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT", "-XX:+PrintAOT",
"-Dtest.jdk=" + Utils.TEST_JDK,
"-XX:AOTLibrary=./libSharedUsageTest.so",
SharedUsageTest.class.getName());
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -36,7 +36,8 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeDynamic2AotTest.so
* -class compiler.calls.common.InvokeDynamic
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeDynamic2AotTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./AotInvokeDynamic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic
* -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -36,12 +36,12 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeDynamic2CompiledTest.so
* -class compiler.calls.common.InvokeDynamic
* -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic -compileCallee 1
* -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeDynamic2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic -compileCallee 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -37,7 +37,8 @@
* -libname AotInvokeDynamic2InterpretedTest.so
* -class compiler.calls.common.InvokeDynamic
* -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm -XX:AOTLibrary=./AotInvokeDynamic2InterpretedTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions
+ * -XX:AOTLibrary=./AotInvokeDynamic2InterpretedTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeDynamic::callee
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* -XX:+UseAOT compiler.calls.common.InvokeDynamic -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -36,7 +36,7 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeDynamic2NativeTest.so
* -class compiler.calls.common.InvokeDynamic
* -compile compiler.calls.common.InvokeDynamic.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeDynamic2NativeTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic -nativeCallee -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,8 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeInterface2AotTest.so
* -class compiler.calls.common.InvokeInterface
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeInterface2AotTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./AotInvokeInterface2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface
* -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,12 +34,12 @@
* -libname AotInvokeInterface2CompiledTest.so
* -class compiler.calls.common.InvokeInterface
* -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface -compileCallee 1
* -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeInterface2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface -compileCallee 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname AotInvokeInterface2InterpretedTest.so
* -class compiler.calls.common.InvokeInterface
* -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeInterface2InterpretedTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeInterface::callee
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeInterface2NativeTest.so
* -class compiler.calls.common.InvokeInterface
* -compile compiler.calls.common.InvokeInterface.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeInterface2NativeTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface -nativeCallee -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,8 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2AotTest.so
* -class compiler.calls.common.InvokeSpecial
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeSpecial2AotTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./AotInvokeSpecial2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial
* -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2CompiledTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -compileCallee 1
* -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeSpecial2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -compileCallee 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname AotInvokeSpecial2InterpretedTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeSpecial2InterpretedTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeSpecial::callee
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeSpecial2NativeTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeSpecial2NativeTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -nativeCallee -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,8 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2AotTest.so
* -class compiler.calls.common.InvokeStatic
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeStatic2AotTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./AotInvokeStatic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic
* -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2CompiledTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -compileCallee 1
* -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeStatic2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -compileCallee 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname AotInvokeStatic2InterpretedTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeStatic2InterpretedTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeStatic::callee
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeStatic2NativeTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeStatic2NativeTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -nativeCallee -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,8 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2AotTest.so
* -class compiler.calls.common.InvokeVirtual
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -XX:+UseAOT -XX:AOTLibrary=./AotInvokeVirtual2AotTest.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
+ * -XX:AOTLibrary=./AotInvokeVirtual2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual
* -checkCallerCompileLevel -1 -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2CompiledTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -compileCallee 1
* -checkCalleeCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeVirtual2CompiledTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -compileCallee 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname AotInvokeVirtual2InterpretedTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeVirtual2InterpretedTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeVirtual::callee
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname AotInvokeVirtual2NativeTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.caller()V
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./AotInvokeVirtual2NativeTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -nativeCallee -checkCallerCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -36,12 +36,12 @@
* @run driver compiler.aot.AotCompiler -libname CompiledInvokeDynamic2AotTest.so
* -class compiler.calls.common.InvokeDynamic
* -compile compiler.calls.common.InvokeDynamic.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic -compileCaller 1
* -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeDynamic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeDynamic -compileCaller 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,12 +34,12 @@
* -libname CompiledInvokeInterface2AotTest.so
* -class compiler.calls.common.InvokeInterface
* -compile compiler.calls.common.InvokeInterface.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface -compileCaller 1
* -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeInterface2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeInterface -compileCaller 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname CompiledInvokeSpecial2AotTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -compileCaller 1
* -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeSpecial2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -compileCaller 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname CompiledInvokeStatic2AotTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -compileCaller 1
* -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeStatic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -compileCaller 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,12 +33,12 @@
* @run driver compiler.aot.AotCompiler -libname CompiledInvokeVirtual2AotTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -compileCaller 1
* -checkCalleeCompileLevel -1 -checkCallerCompileLevel 1
- * @run main/othervm -Xbatch -XX:+UseAOT
+ * @run main/othervm -Xbatch -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./CompiledInvokeVirtual2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -compileCaller 4
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -37,7 +37,7 @@
* -libname InterpretedInvokeDynamic2AotTest.so
* -class compiler.calls.common.InvokeDynamic
* -compile compiler.calls.common.InvokeDynamic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./InterpretedInvokeDynamic2AotTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeDynamic::caller
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname InterpretedInvokeInterface2AotTest.so
* -class compiler.calls.common.InvokeInterface
* -compile compiler.calls.common.InvokeInterface.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./InterpretedInvokeInterface2AotTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeInterface::caller
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname InterpretedInvokeSpecial2AotTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./InterpretedInvokeSpecial2AotTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeSpecial::caller
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname InterpretedInvokeStatic2AotTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./InterpretedInvokeStatic2AotTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeStatic::caller
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* -libname InterpretedInvokeVirtual2AotTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm -XX:+UseAOT
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./InterpretedInvokeVirtual2AotTest.so
* -XX:CompileCommand=exclude,compiler.calls.common.InvokeVirtual::caller
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname NativeInvokeSpecial2AotTest.so
* -class compiler.calls.common.InvokeSpecial
* -compile compiler.calls.common.InvokeSpecial.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./NativeInvokeSpecial2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeSpecial -nativeCaller -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname NativeInvokeStatic2AotTest.so
* -class compiler.calls.common.InvokeStatic
* -compile compiler.calls.common.InvokeStatic.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./NativeInvokeStatic2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeStatic -nativeCaller -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* @run driver compiler.aot.AotCompiler -libname NativeInvokeVirtual2AotTest.so
* -class compiler.calls.common.InvokeVirtual
* -compile compiler.calls.common.InvokeVirtual.callee.*
- * @run main/othervm/native -XX:+UseAOT
+ * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* -XX:AOTLibrary=./NativeInvokeVirtual2AotTest.so
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* compiler.calls.common.InvokeVirtual -nativeCaller -checkCalleeCompileLevel -1
--- a/test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/AotLibraryNegativeBase.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -39,8 +39,8 @@
UNEXPECTED_MESSAGES,
"Unexpected exit code using " + option,
"Unexpected output using " + option, ExitCode.FAIL,
- addTestVMOptions, "-XX:+UseAOT", "-XX:+PrintAOT",
- option, HelloWorldPrinter.class.getName());
+ addTestVMOptions, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+ "-XX:+PrintAOT", option, HelloWorldPrinter.class.getName());
} catch (Throwable t) {
throw new Error("Problems executing test using " + option
+ ": " + t, t);
--- a/test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/DisabledAOTWithLibraryTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -56,7 +56,7 @@
CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
UNEXPECTED_MESSAGES, "Unexpected exit code",
"Unexpected output", ExitCode.OK, addTestVMOptions,
- "-XX:-UseAOT", "-XX:+PrintAOT",
+ "-XX:+UnlockExperimentalVMOptions", "-XX:-UseAOT", "-XX:+PrintAOT",
"-XX:AOTLibrary=./" + LIB_NAME,
HelloWorldPrinter.class.getName());
} catch (Throwable t) {
--- a/test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/MultipleAOTLibraryTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -74,16 +74,17 @@
private void runTest(String args[]) {
try {
boolean addTestVMOptions = true;
- String[] allArgs = Arrays.copyOf(args, args.length + 4);
- allArgs[args.length] = "-XX:AOTLibrary="
+ String[] allArgs = Arrays.copyOf(args, args.length + 5);
+ allArgs[args.length] = "-XX:+UnlockExperimentalVMOptions";
+ allArgs[args.length + 1] = "-XX:AOTLibrary="
+ "." + File.separator
+ "libMultipleAOTLibraryTest1.so"
+ File.pathSeparator
+ "." + File.separator
+ "libMultipleAOTLibraryTest2.so";
- allArgs[args.length + 1] = "-XX:+PrintAOT";
- allArgs[args.length + 2] = "-XX:+UseAOT";
- allArgs[args.length + 3] = HelloWorldPrinter.class.getName();
+ allArgs[args.length + 2] = "-XX:+PrintAOT";
+ allArgs[args.length + 3] = "-XX:+UseAOT";
+ allArgs[args.length + 4] = HelloWorldPrinter.class.getName();
CommandLineOptionTest.verifyJVMStartup(EXPECTED_OUTPUT,
UNEXPECTED_OUTPUT, "Unexpected exit code",
"Unexpected output", ExitCode.OK, addTestVMOptions,
--- a/test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTLibraryTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -67,8 +67,8 @@
CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
UNEXPECTED_MESSAGES, "Unexpected exit code using " + arg,
"Unexpected output using " + arg, ExitCode.OK,
- addTestVMOptions, "-XX:+UseAOT", "-XX:+PrintAOT", arg,
- "-XX:AOTLibrary=./libSingleAOTLibraryTest.so",
+ addTestVMOptions, "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+ "-XX:+PrintAOT", arg, "-XX:AOTLibrary=./libSingleAOTLibraryTest.so",
HelloWorldPrinter.class.getName());
} catch (Throwable t) {
throw new Error("Problems executing test: " + t, t);
--- a/test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/SingleAOTOptionTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,17 +33,17 @@
* -compile compiler.aot.HelloWorldPrinter.print()V
* -extraopt -XX:+UseCompressedOops
* @run driver compiler.aot.cli.SingleAOTOptionTest -XX:+UseCompressedOops
- * -XX:AOTLibrary=./libSingleAOTOptionTest.so
+ * -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libSingleAOTOptionTest.so
* @run main compiler.aot.cli.SingleAOTOptionTest
- * -XX:+UseCompressedOops -XX:+UseAOT
+ * -XX:+UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* @run driver compiler.aot.AotCompiler -libname libSingleAOTOptionTest.so
* -class compiler.aot.HelloWorldPrinter
* -compile compiler.aot.HelloWorldPrinter.print()V
* -extraopt -XX:-UseCompressedOops
* @run driver compiler.aot.cli.SingleAOTOptionTest -XX:-UseCompressedOops
- * -XX:AOTLibrary=./libSingleAOTOptionTest.so
+ * -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libSingleAOTOptionTest.so
* @run driver compiler.aot.cli.SingleAOTOptionTest
- * -XX:-UseCompressedOops -XX:+UseAOT
+ * -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:+UseAOT
* @summary check if specifying only one aot option handled properly
*/
@@ -60,24 +60,24 @@
private static final String[] UNEXPECTED_MESSAGES = null;
public static void main(String args[]) {
- if (args.length == 2) {
- new SingleAOTOptionTest().runTest(args[0], args[1]);
+ if (args.length == 3) {
+ new SingleAOTOptionTest().runTest(args[0], args[1], args[2]);
} else {
throw new Error("Test expects 2 parameters");
}
}
- private void runTest(String arg1, String arg2) {
+ private void runTest(String arg1, String arg2, String arg3) {
try {
String exitCodeErrorMessage = String.format("Unexpected exit code "
- + "using %s and %s", arg1, arg2);
+ + "using %s %s %s", arg1, arg2, arg3);
String outputErrorMessage = String.format("Unexpected output using"
- + " %s and %s", arg1, arg2);
+ + " %s %s", arg1, arg2, arg3);
boolean addTestVMOptions = true;
CommandLineOptionTest.verifyJVMStartup(EXPECTED_MESSAGES,
UNEXPECTED_MESSAGES, exitCodeErrorMessage,
outputErrorMessage, ExitCode.OK, addTestVMOptions, arg1,
- arg2, HelloWorldPrinter.class.getName());
+ arg2, arg3, HelloWorldPrinter.class.getName());
} catch (Throwable t) {
throw new Error("Problems executing test: " + t, t);
}
--- a/test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/JaotcTestHelper.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -40,6 +40,7 @@
public static final String DEFAULT_LIB_PATH = "./unnamed." + Platform.sharedLibraryExt();
public static final String DEFAULT_LIBRARY_LOAD_MESSAGE = "loaded " + DEFAULT_LIB_PATH
+ " aot library";
+ private static final String UNLOCK_EXPERIMENTAL_VM_OPTIONS = "-XX:+UnlockExperimentalVMOptions";
private static final String ENABLE_AOT = "-XX:+UseAOT";
private static final String AOT_LIBRARY = "-XX:AOTLibrary=" + DEFAULT_LIB_PATH;
private static final String PRINT_AOT = "-XX:+PrintAOT";
@@ -75,7 +76,8 @@
try {
CommandLineOptionTest.verifyJVMStartup(expectedOutput, unexpectedOutput,
"Unexpected exit code", "Unexpected output", ExitCode.OK,
- /* addTestVMOpts */ true, ENABLE_AOT, AOT_LIBRARY, PRINT_AOT, classToRun);
+ /* addTestVMOpts */ true, UNLOCK_EXPERIMENTAL_VM_OPTIONS,
+ ENABLE_AOT, AOT_LIBRARY, PRINT_AOT, classToRun);
} catch (Throwable t) {
throw new Error("Library usage verification failed: " + t, t);
}
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChanged.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChanged.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -38,7 +38,8 @@
*
* @run main/othervm
* compiler.aot.fingerprint.SelfChanged TEST-UNMODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSelfChanged.so
* -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
* compiler.aot.fingerprint.SelfChanged TEST-UNMODIFIED
*
@@ -46,7 +47,8 @@
* compiler.aot.fingerprint.SelfChanged WRITE-MODIFIED-CLASS
* @run main
* compiler.aot.fingerprint.SelfChanged TEST-MODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSelfChanged.so
* -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
* compiler.aot.fingerprint.SelfChanged TEST-MODIFIED
*/
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -42,7 +42,8 @@
* @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
* compiler.aot.fingerprint.Blah TEST-UNMODIFIED
* @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
- * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSelfChanged.so
* -XX:SharedArchiveFile=SelfChangedCDS.jsa
* -XX:+IgnoreUnrecognizedVMOptions
* -Xshare:auto -showversion
@@ -58,7 +59,8 @@
* @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
* compiler.aot.fingerprint.Blah TEST-MODIFIED
* @run main compiler.aot.fingerprint.CDSRunner -cp SelfChangedCDS.jar
- * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSelfChanged.so
* -XX:SharedArchiveFile=SelfChangedCDS.jsa
* -XX:+IgnoreUnrecognizedVMOptions
* -Xshare:auto -showversion
@@ -77,7 +79,8 @@
* @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
* compiler.aot.fingerprint.Blah TEST-UNMODIFIED
* @run main compiler.aot.fingerprint.CDSRunner -Xmx512m -cp SelfChangedCDS.jar
- * -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSelfChanged.so
+ * -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSelfChanged.so
* -XX:SharedArchiveFile=SelfChangedCDS.jsa
* -XX:+IgnoreUnrecognizedVMOptions
* -Xshare:auto -showversion
--- a/test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SuperChanged.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -38,7 +38,8 @@
*
* @run main
* compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSuperChanged.so
* -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
* compiler.aot.fingerprint.SuperChanged TEST-UNMODIFIED
*
@@ -46,7 +47,8 @@
* compiler.aot.fingerprint.SuperChanged WRITE-MODIFIED-CLASS
* @run main
* compiler.aot.fingerprint.SuperChanged TEST-MODIFIED
- * @run main/othervm -XX:+UseAOT -XX:+PrintAOT -XX:AOTLibrary=./libSuperChanged.so
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+PrintAOT
+ * -XX:AOTLibrary=./libSuperChanged.so
* -Xlog:aot+class+fingerprint=trace -Xlog:aot+class+load=trace
* compiler.aot.fingerprint.SuperChanged TEST-MODIFIED
*/
--- a/test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/scripts/build-bootmodules.sh Thu Aug 08 17:27:17 2019 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -37,7 +37,7 @@
$JAVA_HOME/bin/javac -d . $DIR/$TEST.java
JAOTC_OPTS="-J-ea -J-Xmx4g --compile-for-tiered --info"
-JAVA_OPTS="-Xmx4g -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
+JAVA_OPTS="-Xmx4g -XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
# Compile with: +UseCompressedOops +UseG1GC
LIBRARIES=""
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-helloworld.sh Thu Aug 08 17:27:17 2019 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -34,7 +34,7 @@
OPTS="-J-Xmx4g -J-XX:-UseCompressedOops --info --verbose"
$JAVA_HOME/bin/jaotc $OPTS --output libHelloWorld.$SO_TYPE HelloWorld.class || exit 1
-JAVA_OPTS="-Xmx4g -XX:-UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./libHelloWorld.$SO_TYPE"
+JAVA_OPTS="-Xmx4g -XX:-UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./libHelloWorld.$SO_TYPE"
$JAVA_HOME/bin/java $JAVA_OPTS -XX:+PrintAOT -version | grep "aot library" || exit 1
$JAVA_HOME/bin/java $JAVA_OPTS HelloWorld || exit 1
@@ -50,13 +50,13 @@
$JAVA_HOME/bin/jaotc $OPTS --output $LIBRARY HelloWorld.class
# Dump CDS archive.
- $JAVA_HOME/bin/java -Xshare:dump -XX:-UseAOT -XX:+$gc || exit 1
+ $JAVA_HOME/bin/java -Xshare:dump -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:+$gc || exit 1
JAVA_OPTS="-Xmx256m"
echo "Tiered C1 $gc:"
for i in `seq 1 $N`; do
- OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:-UseAOT -XX:TieredStopAtLevel=1 $JAVA_OPTS HelloWorld`
+ OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:TieredStopAtLevel=1 $JAVA_OPTS HelloWorld`
if [ "$OUT" != "Hello, world!" ]; then
echo $OUT
exit 1
@@ -65,14 +65,14 @@
echo "Tiered C1/C2 $gc:"
for i in `seq 1 $N`; do
- OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:-UseAOT $JAVA_OPTS HelloWorld`
+ OUT=`time $JAVA_HOME/bin/java -XX:+$gc -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:-UseAOT $JAVA_OPTS HelloWorld`
if [ "$OUT" != "Hello, world!" ]; then
echo $OUT
exit 1
fi
done
- JAVA_OPTS="-Xmx256m -XX:+UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./$LIBRARY"
+ JAVA_OPTS="-Xmx256m -XX:+UseCompressedOops -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:AOTLibrary=./$LIBRARY"
echo "AOT $gc:"
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-jaotc.sh Thu Aug 08 17:27:17 2019 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -38,6 +38,6 @@
$JAVA_HOME/bin/javac -d . $DIR/HelloWorld.java
-$JAVA_HOME/bin/java -XX:-UseCompressedOops -XX:AOTLibrary=./libjava.base-aot.$SO_TYPE HelloWorld
+$JAVA_HOME/bin/java -XX:-UseCompressedOops -XX:+UnlockExperimentalVMOptions -XX:AOTLibrary=./libjava.base-aot.$SO_TYPE HelloWorld
rm -f HelloWorld.class libjdk.aot.$SO_TYPE libjava.base-aot.$SO_TYPE
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh Thu Aug 08 17:27:17 2019 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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,7 +23,7 @@
DIR=`pwd`
popd > /dev/null
-AOT_OPTS="-XX:+UseAOT"
+AOT_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseAOT"
$JAVA_HOME/bin/java $AOT_OPTS -XX:+PrintAOT -version | grep "aot library" || exit 1
@@ -64,7 +64,7 @@
echo "Tiered C1:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT -XX:TieredStopAtLevel=1 $APP $FILE.java
+ time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -XX:TieredStopAtLevel=1 $APP $FILE.java
if [ $? -ne 0 ]; then
exit 1
fi
@@ -73,7 +73,7 @@
echo "Tiered C1/C2:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT $APP $FILE.java
+ time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT $APP $FILE.java
if [ $? -ne 0 ]; then
exit 1
fi
@@ -82,7 +82,7 @@
echo "Tiered C1/C2 -Xshare:on:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/java $JAVA_OPTS -XX:-UseAOT -Xshare:on $APP $FILE.java
+ time $JAVA_HOME/bin/java $JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:-UseAOT -Xshare:on $APP $FILE.java
if [ $? -ne 0 ]; then
exit 1
fi
@@ -117,7 +117,7 @@
echo "Tiered C1 (compiling $NAME: $COUNT classes):"
for i in `seq 1 $N`; do
mkdir tmp
- time $JAVA_HOME/bin/javac -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 -XDignore.symbol.file -d tmp $FILES
+ time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 -XDignore.symbol.file -d tmp $FILES
if [ $? -ne 0 ]; then
exit 1
fi
@@ -127,7 +127,7 @@
echo "Tiered C1/C2 (compiling $NAME: $COUNT classes):"
for i in `seq 1 $N`; do
mkdir tmp
- time $JAVA_HOME/bin/javac -J-XX:-UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+ time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
if [ $? -ne 0 ]; then
exit 1
fi
@@ -137,7 +137,7 @@
echo "Tiered AOT (compiling $NAME: $COUNT classes):"
for i in `seq 1 $N`; do
mkdir tmp
- time $JAVA_HOME/bin/javac -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+ time $JAVA_HOME/bin/javac -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
if [ $? -ne 0 ]; then
exit 1
fi
@@ -147,7 +147,7 @@
echo "Tiered AOT -Xshare:on (compiling $NAME: $COUNT classes):"
for i in `seq 1 $N`; do
mkdir tmp
- time $JAVA_HOME/bin/javac -J-Xshare:on -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
+ time $JAVA_HOME/bin/javac -J-Xshare:on -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOT -XDignore.symbol.file -cp /java/devtools/share/junit/latest/junit.jar -d tmp $FILES
if [ $? -ne 0 ]; then
exit 1
fi
--- a/test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-nashorn.sh Thu Aug 08 17:27:17 2019 -0400
@@ -1,4 +1,4 @@
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -26,7 +26,7 @@
# set env variables
. $DIR/test-env.sh
-$JAVA_HOME/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading -XX:+PrintAOT -version | grep "aot library" || exit 1
+$JAVA_HOME/bin/java -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseAOTStrictLoading -XX:+PrintAOT -version | grep "aot library" || exit 1
# Dump CDS archive.
$JAVA_HOME/bin/java -Xshare:dump || exit 1
@@ -41,7 +41,7 @@
echo "Tiered C1:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 $FILE
+ time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT -J-XX:TieredStopAtLevel=1 $FILE
if [ $? -ne 0 ]; then
exit 1
fi
@@ -49,7 +49,7 @@
echo "Tiered C1/C2:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:-UseAOT $FILE
+ time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockExperimentalVMOptions -J-XX:-UseAOT $FILE
if [ $? -ne 0 ]; then
exit 1
fi
@@ -57,7 +57,7 @@
echo "Tiered AOT:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
+ time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
if [ $? -ne 0 ]; then
exit 1
fi
@@ -65,7 +65,7 @@
echo "Tiered AOT -Xshare:on:"
for i in `seq 1 $N`; do
- time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-Xshare:on -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
+ time $JAVA_HOME/bin/jjs $JAVA_OPTS -J-Xshare:on -J-XX:+UnlockDiagnosticVMOptions -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseAOTStrictLoading -J-XX:AOTLibrary=./libjdk.nashorn.$SO_TYPE $FILE
if [ $? -ne 0 ]; then
exit 1
fi
--- a/test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/verification/ClassAndLibraryNotMatchTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -93,8 +93,8 @@
ProcessBuilder pb;
try {
pb = ProcessTools.createJavaProcessBuilder(true, "-cp", ".",
- "-XX:+UseAOT", "-XX:AOTLibrary=./" + LIB_NAME,
- HELLO_WORLD_CLASS_NAME);
+ "-XX:+UnlockExperimentalVMOptions", "-XX:+UseAOT",
+ "-XX:AOTLibrary=./" + LIB_NAME, HELLO_WORLD_CLASS_NAME);
} catch (Exception e) {
throw new Error("Can't create ProcessBuilder to run "
+ HELLO_WORLD_CLASS_NAME + " " + e, e);
--- a/test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/compiler/aot/verification/vmflags/BasicFlagsChange.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -87,8 +87,8 @@
so, a message like "skipped $pathTolibrary aot library" or
"loaded $pathToLibrary aot library" is present for cases of
incompatible or compatible flags respectively */
- pb = ProcessTools.createJavaProcessBuilder(true, "-XX:+UseAOT",
- "-XX:+PrintAOT", "-XX:AOTLibrary=./" + libName, option,
+ pb = ProcessTools.createJavaProcessBuilder(true, "-XX:+UnlockExperimentalVMOptions",
+ "-XX:+UseAOT", "-XX:+PrintAOT", "-XX:AOTLibrary=./" + libName, option,
HelloWorldPrinter.class.getName());
} catch (Exception ex) {
throw new Error("Problems creating ProcessBuilder using " + option
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestSelfArrayCopy.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8229016
+ * @summary Test correct elimination of array allocation with arraycopy to itself.
+ * @library /test/lib
+ * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,compiler.escapeAnalysis.TestSelfArrayCopy::test
+ * compiler.escapeAnalysis.TestSelfArrayCopy
+ */
+
+package compiler.escapeAnalysis;
+
+import jdk.test.lib.Utils;
+
+public class TestSelfArrayCopy {
+ private static boolean b = false;
+ private static final int rI1 = Utils.getRandomInstance().nextInt();
+ private static final int rI2 = Utils.getRandomInstance().nextInt();
+
+ private static int test() {
+ // Non-escaping allocation
+ Integer[] array = {rI1, rI2};
+ // Arraycopy with src == dst
+ System.arraycopy(array, 0, array, 0, array.length - 1);
+ if (b) {
+ // Uncommon trap
+ System.out.println(array[0]);
+ }
+ return array[0] + array[1];
+ }
+
+ public static void main(String[] args) {
+ int expected = rI1 + rI2;
+ // Trigger compilation
+ for (int i = 0; i < 20_000; ++i) {
+ int result = test();
+ if (result != expected) {
+ throw new RuntimeException("Incorrect result: " + result + " != " + expected);
+ }
+ }
+ }
+}
--- a/test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/gc/arguments/TestSurvivorAlignmentInBytesOption.java Thu Aug 08 17:27:17 2019 -0400
@@ -23,6 +23,7 @@
package gc.arguments;
+import jdk.test.lib.Platform;
import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
@@ -86,15 +87,18 @@
// Verify that if specified SurvivorAlignmentInBytes is lower than
// ObjectAlignmentInBytes, then the JVM startup will fail with
// appropriate error message.
- shouldFailMessage = String.format("JVM startup should fail with "
- + "'%s' option value lower than ObjectAlignmentInBytes", optionName);
- CommandLineOptionTest.verifyJVMStartup(
- new String[]{valueIsTooSmall}, null,
- shouldFailMessage, shouldFailMessage,
- ExitCode.FAIL, false,
- CommandLineOptionTest.prepareBooleanFlag(
- unlockExperimentalVMOpts, true),
- CommandLineOptionTest.prepareNumericFlag(optionName, 2));
+ if (Platform.is64bit()) {
+ shouldFailMessage = String.format("JVM startup should fail with "
+ + "'%s' option value lower than ObjectAlignmentInBytes", optionName);
+ CommandLineOptionTest.verifyJVMStartup(
+ new String[]{valueIsTooSmall}, null,
+ shouldFailMessage, shouldFailMessage,
+ ExitCode.FAIL, false,
+ CommandLineOptionTest.prepareBooleanFlag(
+ unlockExperimentalVMOpts, true),
+ CommandLineOptionTest.prepareNumericFlag(optionName, 8),
+ CommandLineOptionTest.prepareNumericFlag("ObjectAlignmentInBytes", 16));
+ }
// Verify that if specified SurvivorAlignmentInBytes value is not
// a power of 2 then the JVM startup will fail with appropriate error
--- a/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/gc/metaspace/TestSizeTransitions.java Thu Aug 08 17:27:17 2019 -0400
@@ -25,8 +25,11 @@
package gc.metaspace;
+import jdk.test.lib.Platform;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
+import java.util.ArrayList;
+import java.util.List;
/* @test TestSizeTransitionsSerial
* @key gc
@@ -104,22 +107,31 @@
throw new RuntimeException("wrong number of args: " + args.length);
}
+ final boolean hasCoops = Platform.is64bit();
final boolean useCoops = Boolean.parseBoolean(args[0]);
final String gcArg = args[1];
- final String[] jvmArgs = {
- useCoops ? "-XX:+UseCompressedOops" : "-XX:-UseCompressedOops",
- gcArg,
- "-Xmx256m",
- "-Xlog:gc,gc+metaspace=info",
- TestSizeTransitions.Run.class.getName()
- };
+
+ if (!hasCoops && useCoops) {
+ // No need to run this configuration.
+ System.out.println("Skipping test.");
+ return;
+ }
+
+ List<String> jvmArgs = new ArrayList<>();
+ if (hasCoops) {
+ jvmArgs.add(useCoops ? "-XX:+UseCompressedOops" : "-XX:-UseCompressedOops");
+ }
+ jvmArgs.add(gcArg);
+ jvmArgs.add("-Xmx256m");
+ jvmArgs.add("-Xlog:gc,gc+metaspace=info");
+ jvmArgs.add(TestSizeTransitions.Run.class.getName());
System.out.println("JVM args:");
for (String a : jvmArgs) {
System.out.println(" " + a);
}
- final ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(jvmArgs);
+ final ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(jvmArgs.toArray(new String[0]));
final OutputAnalyzer output = new OutputAnalyzer(pb.start());
System.out.println(output.getStdout());
output.shouldHaveExitValue(0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package gc.stress.gclocker;
+
+/*
+ * @test TestExcessGCLockerCollections
+ * @key gc
+ * @bug 8048556
+ * @summary Check for GC Locker initiated GCs that immediately follow another
+ * GC and so have very little needing to be collected.
+ * @requires vm.gc != "Z"
+ * @requires vm.gc != "Epsilon"
+ * @requires vm.gc != "Shenandoah"
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @run driver/timeout=1000 gc.stress.gclocker.TestExcessGCLockerCollections 300 4 2
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+
+import java.util.zip.Deflater;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+class TestExcessGCLockerCollectionsAux {
+ static private final int LARGE_MAP_SIZE = 64 * 1024;
+
+ static private final int MAP_ARRAY_LENGTH = 4;
+ static private final int MAP_SIZE = 1024;
+
+ static private final int BYTE_ARRAY_LENGTH = 128 * 1024;
+
+ static private void println(String str) { System.out.println(str); }
+
+ static private volatile boolean keepRunning = true;
+
+ static Map<Integer,String> populateMap(int size) {
+ Map<Integer,String> map = new HashMap<Integer,String>();
+ for (int i = 0; i < size; i += 1) {
+ Integer keyInt = Integer.valueOf(i);
+ String valStr = "value is [" + i + "]";
+ map.put(keyInt,valStr);
+ }
+ return map;
+ }
+
+ static private class AllocatingWorker implements Runnable {
+ private final Object[] array = new Object[MAP_ARRAY_LENGTH];
+ private int arrayIndex = 0;
+
+ private void doStep() {
+ Map<Integer,String> map = populateMap(MAP_SIZE);
+ array[arrayIndex] = map;
+ arrayIndex = (arrayIndex + 1) % MAP_ARRAY_LENGTH;
+ }
+
+ public void run() {
+ while (keepRunning) {
+ doStep();
+ }
+ }
+ }
+
+ static private class JNICriticalWorker implements Runnable {
+ private int count;
+
+ private void doStep() {
+ byte[] inputArray = new byte[BYTE_ARRAY_LENGTH];
+ for (int i = 0; i < inputArray.length; i += 1) {
+ inputArray[i] = (byte) (count + i);
+ }
+
+ Deflater deflater = new Deflater();
+ deflater.setInput(inputArray);
+ deflater.finish();
+
+ byte[] outputArray = new byte[2 * inputArray.length];
+ deflater.deflate(outputArray);
+
+ count += 1;
+ }
+
+ public void run() {
+ while (keepRunning) {
+ doStep();
+ }
+ }
+ }
+
+ static public Map<Integer,String> largeMap;
+
+ static public void main(String args[]) {
+ long durationSec = Long.parseLong(args[0]);
+ int allocThreadNum = Integer.parseInt(args[1]);
+ int jniCriticalThreadNum = Integer.parseInt(args[2]);
+
+ println("Running for " + durationSec + " secs");
+
+ largeMap = populateMap(LARGE_MAP_SIZE);
+
+ println("Starting " + allocThreadNum + " allocating threads");
+ for (int i = 0; i < allocThreadNum; i += 1) {
+ new Thread(new AllocatingWorker()).start();
+ }
+
+ println("Starting " + jniCriticalThreadNum + " jni critical threads");
+ for (int i = 0; i < jniCriticalThreadNum; i += 1) {
+ new Thread(new JNICriticalWorker()).start();
+ }
+
+ long durationMS = (long) (1000 * durationSec);
+ long start = System.currentTimeMillis();
+ long now = start;
+ long soFar = now - start;
+ while (soFar < durationMS) {
+ try {
+ Thread.sleep(durationMS - soFar);
+ } catch (Exception e) {
+ }
+ now = System.currentTimeMillis();
+ soFar = now - start;
+ }
+ println("Done.");
+ keepRunning = false;
+ }
+}
+
+public class TestExcessGCLockerCollections {
+ private static final String locker =
+ "\\[gc\\s*\\] .* \\(GCLocker Initiated GC\\)";
+ private static final String ANY_LOCKER = locker + " [1-9][0-9]*M";
+ private static final String BAD_LOCKER = locker + " [1-9][0-9]?M";
+
+ private static final String[] COMMON_OPTIONS = new String[] {
+ "-Xmx1G", "-Xms1G", "-Xmn256M", "-Xlog:gc" };
+
+ public static void main(String args[]) throws Exception {
+ if (args.length < 3) {
+ System.out.println("usage: TestExcessGCLockerCollectionsAux" +
+ " <duration sec> <alloc threads>" +
+ " <jni critical threads>");
+ throw new RuntimeException("Invalid arguments");
+ }
+
+ ArrayList<String> finalArgs = new ArrayList<String>();
+ finalArgs.addAll(Arrays.asList(COMMON_OPTIONS));
+ finalArgs.add(TestExcessGCLockerCollectionsAux.class.getName());
+ finalArgs.addAll(Arrays.asList(args));
+
+ // GC and other options obtained from test framework.
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ true, finalArgs.toArray(new String[0]));
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldHaveExitValue(0);
+ //System.out.println("------------- begin stdout ----------------");
+ //System.out.println(output.getStdout());
+ //System.out.println("------------- end stdout ----------------");
+ output.stdoutShouldMatch(ANY_LOCKER);
+ output.stdoutShouldNotMatch(BAD_LOCKER);
+ }
+}
--- a/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/gc/survivorAlignment/TestPromotionLABLargeSurvivorAlignment.java Thu Aug 08 17:27:17 2019 -0400
@@ -41,22 +41,7 @@
* gc.survivorAlignment.TestPromotionLABLargeSurvivorAlignment
* @run main/othervm -Xmx128m
* -XX:+UnlockExperimentalVMOptions
- * -XX:SurvivorAlignmentInBytes=512 -XX:SurvivorRatio=1
- * -XX:-ExplicitGCInvokesConcurrent -XX:-ResizePLAB
- * gc.survivorAlignment.TestPromotionLABLargeSurvivorAlignment
- * @run main/othervm -Xmx128m
- * -XX:+UnlockExperimentalVMOptions
- * -XX:SurvivorAlignmentInBytes=1k -XX:SurvivorRatio=1
- * -XX:-ExplicitGCInvokesConcurrent -XX:-ResizePLAB
- * gc.survivorAlignment.TestPromotionLABLargeSurvivorAlignment
- * @run main/othervm -Xmx128m
- * -XX:+UnlockExperimentalVMOptions
- * -XX:SurvivorAlignmentInBytes=4k -XX:SurvivorRatio=1
- * -XX:-ExplicitGCInvokesConcurrent -XX:-ResizePLAB
- * gc.survivorAlignment.TestPromotionLABLargeSurvivorAlignment
- * @run main/othervm -Xmx128m
- * -XX:+UnlockExperimentalVMOptions
- * -XX:SurvivorAlignmentInBytes=16k -XX:SurvivorRatio=1
+ * -XX:SurvivorAlignmentInBytes=256 -XX:SurvivorRatio=1
* -XX:-ExplicitGCInvokesConcurrent -XX:-ResizePLAB
* gc.survivorAlignment.TestPromotionLABLargeSurvivorAlignment
*/
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Thu Aug 08 17:27:17 2019 -0400
@@ -44,6 +44,9 @@
public abstract class JVMOption {
+ private static final String UNLOCK_FLAG1 = "-XX:+UnlockDiagnosticVMOptions";
+ private static final String UNLOCK_FLAG2 = "-XX:+UnlockExperimentalVMOptions";
+
/**
* Executor for JCMD
*/
@@ -408,6 +411,9 @@
runJava.add(explicitGC);
}
+ runJava.add(UNLOCK_FLAG1);
+ runJava.add(UNLOCK_FLAG2);
+
runJava.addAll(prepend);
runJava.add(optionValue);
runJava.add(JVMStartup.class.getName());
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -46,6 +46,9 @@
/* Java option which print options with ranges */
private static final String PRINT_FLAGS_RANGES = "-XX:+PrintFlagsRanges";
+ private static final String UNLOCK_FLAG1 = "-XX:+UnlockDiagnosticVMOptions";
+ private static final String UNLOCK_FLAG2 = "-XX:+UnlockExperimentalVMOptions";
+
/* StringBuilder to accumulate failed message */
private static final StringBuilder finalFailedMessage = new StringBuilder();
@@ -458,7 +461,7 @@
* @throws Exception if a new process can not be created or an error
* occurred while reading the data
*/
- public static Map<String, JVMOption> getOptionsAsMap(boolean withRanges, Predicate<String> acceptOrigin,
+ private static Map<String, JVMOption> getOptionsAsMap(boolean withRanges, Predicate<String> acceptOrigin,
String... additionalArgs) throws Exception {
Map<String, JVMOption> result;
Process p;
@@ -475,6 +478,8 @@
if (GCType != null) {
runJava.add(GCType);
}
+ runJava.add(UNLOCK_FLAG1);
+ runJava.add(UNLOCK_FLAG2);
runJava.add(PRINT_FLAGS_RANGES);
runJava.add("-version");
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Thu Aug 08 17:27:17 2019 -0400
@@ -46,6 +46,8 @@
{"InitialRAMFraction", "64"},
{"TLABStats", "false"},
{"AllowRedefinitionToAddDeleteMethods", "true"},
+ {"CompactFields", "true"},
+ {"FieldsAllocationStyle", "1"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -70,6 +70,7 @@
public static void largeHeapTest() throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+UnlockExperimentalVMOptions",
"-Xmx30g",
"-XX:-UseAOT", // AOT explicitly set klass shift to 3.
"-Xlog:gc+metaspace=trace",
--- a/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java Thu Aug 08 17:27:17 2019 -0400
@@ -27,7 +27,7 @@
/*
* @test TestAbortVMOnSafepointTimeout
* @summary Check if VM can kill thread which doesn't reach safepoint.
- * @bug 8219584
+ * @bug 8219584 8227528
* @requires vm.compiler2.enabled
* @library /test/lib
* @modules java.base/jdk.internal.misc
@@ -58,8 +58,16 @@
}
public static void testWith(int sfpt_interval, int timeout_delay) throws Exception {
+ // -XX:-UseCountedLoopSafepoints - is used to prevent the loop
+ // in test_loop() to poll for safepoints.
+ // -XX:LoopStripMiningIter=0 and -XX:LoopUnrollLimit=0 - are
+ // used to prevent optimizations over the loop in test_loop()
+ // since we actually want it to provoke a safepoint timeout.
+ // -XX:-UseBiasedLocking - is used to prevent biased locking
+ // handshakes from changing the timing of this test.
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:+UnlockDiagnosticVMOptions",
+ "-XX:-UseBiasedLocking",
"-XX:+SafepointTimeout",
"-XX:+SafepointALot",
"-XX:+AbortVMOnSafepointTimeout",
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/AotTestGeneratorsFactory.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -28,7 +28,8 @@
import java.util.function.Function;
public class AotTestGeneratorsFactory implements Function<String[], List<TestsGenerator>> {
- private static final String AOT_OPTIONS = "-XX:+UseAOT -XX:AOTLibrary=./aottest.so";
+ private static final String AOT_OPTIONS
+ = "-XX:+UnlockExperimentalVMOptions -XX:+UseAOT -XX:AOTLibrary=./aottest.so";
private static final String AOT_COMPILER_BUILD_ACTION
= "@build compiler.aot.AotCompiler";
private static final String AOT_COMPILER_RUN_ACTION_PREFIX
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -49,18 +49,18 @@
/**
* Get time and optionally compare it with previous one.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkTime(jvmtiEnv* jvmti, julong* time,
- julong* prevTime, const char where[]) {
+static bool checkTime(jvmtiEnv* jvmti, julong* time,
+ julong* prevTime, const char where[]) {
char buf[32], buf2[32], buf3[32];
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0("GetTime() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(
jvmti->GetTime((jlong *)time))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY1(" ... got time: %s\n", julong_to_string(*time, buf));
@@ -81,7 +81,7 @@
julong_to_string(*time, buf),
julong_to_string(*prevTime, buf2),
julong_to_string(diff, buf3));
- success = NSK_FALSE;
+ success = false;
}
*prevTime = *time;
}
@@ -132,7 +132,7 @@
*/
JNIEXPORT void JNICALL
callbackVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0(">>> Testcase #4: Check time in VM_DEATH callback\n");
{
@@ -142,12 +142,12 @@
NSK_DISPLAY1("Disable events: %d events\n", EVENTS_COUNT);
if (!nsk_jvmti_enableEvents(JVMTI_DISABLE, EVENTS_COUNT, events, NULL)) {
- success = NSK_FALSE;
+ success = false;
} else {
NSK_DISPLAY0(" ... disabled\n");
}
- if (success != NSK_TRUE) {
+ if (!success) {
NSK_DISPLAY1("Exit with FAIL exit status: %d\n", STATUS_FAIL);
NSK_BEFORE_TRACE(exit(STATUS_FAIL));
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -49,18 +49,18 @@
/**
* Get timer info and optionally compares it with initial one.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info,
- jvmtiTimerInfo* initInfo, const char where[]) {
+static bool checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info,
+ jvmtiTimerInfo* initInfo, const char where[]) {
char buf[32], buf2[32];
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0("GetTimerInfo() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(
jvmti->GetTimerInfo(info))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0("Got timer info:\n");
@@ -79,7 +79,7 @@
where, "max_value",
julong_to_string((julong)info->max_value, buf),
julong_to_string((julong)initInfo->max_value, buf2));
- success = NSK_FALSE;
+ success = false;
}
if (info->may_skip_forward != initInfo->may_skip_forward) {
NSK_COMPLAIN4("In %s GetTimerInfo() returned different info:\n"
@@ -89,7 +89,7 @@
where, "may_skip_forward",
(int)info->may_skip_forward,
(int)initInfo->may_skip_forward);
- success = NSK_FALSE;
+ success = false;
}
if (info->may_skip_backward != initInfo->may_skip_backward) {
NSK_COMPLAIN4("In %s GetTimerInfo() returned different info:\n"
@@ -99,7 +99,7 @@
where, "may_skip_backward",
(int)info->may_skip_backward,
(int)initInfo->may_skip_backward);
- success = NSK_FALSE;
+ success = false;
}
}
@@ -149,7 +149,7 @@
*/
JNIEXPORT void JNICALL
callbackVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0(">>> Testcase #4: Check timer info in VM_DEATH callback\n");
{
@@ -159,12 +159,12 @@
NSK_DISPLAY1("Disable events: %d events\n", EVENTS_COUNT);
if (!nsk_jvmti_enableEvents(JVMTI_DISABLE, EVENTS_COUNT, events, NULL)) {
- success = NSK_FALSE;
+ success = false;
} else {
NSK_DISPLAY0(" ... disabled\n");
}
- if (success != NSK_TRUE) {
+ if (!success) {
NSK_DISPLAY1("Exit with FAIL exit status: %d\n", STATUS_FAIL);
NSK_BEFORE_TRACE(exit(STATUS_FAIL));
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -124,7 +124,7 @@
#define CHECK_CAP(initCaps, caps, name) \
if (caps->name != 0) { \
- success = NSK_FALSE; \
+ success = false; \
NSK_COMPLAIN4("GetCapabilities() in %s returned capability after add and relinguish all potential capabilities:\n" \
"# capability: %s\n" \
"# got value: %d\n" \
@@ -134,10 +134,10 @@
/**
* Check value of known capabilities.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkCapabilitiesValue(jvmtiCapabilities* caps, jvmtiCapabilities* initCaps, const char where[]) {
- int success = NSK_TRUE;
+static bool checkCapabilitiesValue(jvmtiCapabilities* caps, jvmtiCapabilities* initCaps, const char where[]) {
+ bool success = true;
CHECK_CAP(initCaps, caps, can_tag_objects);
CHECK_CAP(initCaps, caps, can_generate_field_modification_events);
@@ -184,17 +184,17 @@
/**
* Get and check current capabilities.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const char where[]) {
- int success = NSK_TRUE;
+static bool checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const char where[]) {
+ bool success = true;
jvmtiCapabilities caps;
memset(&caps, 0, sizeof(jvmtiCapabilities));
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0("Got raw capabilities:\n");
@@ -212,40 +212,40 @@
/**
* Add given capabilities list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
+static bool addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0(" ... set\n");
- return NSK_TRUE;
+ return true;
}
/**
* Remove given capabilities list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
+static bool removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
NSK_DISPLAY0("RelinquishCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0(" ... relinguished\n");
- return NSK_TRUE;
+ return true;
}
/**
* Get potential capabilities to the given list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
+static bool getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0("Got raw capabilities:\n");
@@ -254,7 +254,7 @@
NSK_DISPLAY0("Known capabilities:\n");
printKnownCapabilities(caps);
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
@@ -296,19 +296,19 @@
*/
JNIEXPORT void JNICALL
callbackVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0(">>> Testcase #4: Check capabilities in VM_DEATH callback\n");
success = checkCapabilities(jvmti, &initCaps, "VM_DEATH callback");
NSK_DISPLAY1("Disable events: %d events\n", EVENTS_COUNT);
if (!nsk_jvmti_enableEvents(JVMTI_DISABLE, EVENTS_COUNT, events, NULL)) {
- success = NSK_FALSE;
+ success = false;
} else {
NSK_DISPLAY0(" ... disabled\n");
}
- if (success != NSK_TRUE) {
+ if (!success) {
NSK_DISPLAY1("Exit with FAIL exit status: %d\n", STATUS_FAIL);
NSK_BEFORE_TRACE(exit(STATUS_FAIL));
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -124,7 +124,7 @@
#define CHECK_CAP(initCaps, caps, name) \
if (caps->name != 0) { \
- success = NSK_FALSE; \
+ success = false; \
NSK_COMPLAIN4("GetCapabilities() in %s returned capability after add and relinguish all potential capabilities:\n" \
"# capability: %s\n" \
"# got value: %d\n" \
@@ -134,10 +134,10 @@
/**
* Check value of known capabilities.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkCapabilitiesValue(jvmtiCapabilities* caps, jvmtiCapabilities* initCaps, const char where[]) {
- int success = NSK_TRUE;
+static bool checkCapabilitiesValue(jvmtiCapabilities* caps, jvmtiCapabilities* initCaps, const char where[]) {
+ bool success = true;
CHECK_CAP(initCaps, caps, can_tag_objects);
CHECK_CAP(initCaps, caps, can_generate_field_modification_events);
@@ -184,17 +184,17 @@
/**
* Get and check current capabilities.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const char where[]) {
- int success = NSK_TRUE;
+static bool checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const char where[]) {
+ bool success = true;
jvmtiCapabilities caps;
memset(&caps, 0, sizeof(jvmtiCapabilities));
NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0("Got raw capabilities:\n");
@@ -212,40 +212,40 @@
/**
* Add given capabilities list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
+static bool addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0(" ... set\n");
- return NSK_TRUE;
+ return true;
}
/**
* Remove given capabilities list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
+static bool removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) {
NSK_DISPLAY0("RelinquishCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0(" ... relinguished\n");
- return NSK_TRUE;
+ return true;
}
/**
* Get potential capabilities to the given list.
- * @returns NSK_FALSE if any error occured.
+ * @returns false if any error occured.
*/
-static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
+static bool getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) {
NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n");
if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) {
- return NSK_FALSE;
+ return false;
}
NSK_DISPLAY0("Got raw capabilities:\n");
@@ -254,7 +254,7 @@
NSK_DISPLAY0("Known capabilities:\n");
printKnownCapabilities(caps);
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
@@ -295,19 +295,19 @@
*/
JNIEXPORT void JNICALL
callbackVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) {
- int success = NSK_TRUE;
+ bool success = true;
NSK_DISPLAY0(">>> Testcase #4: Check capabilities in VM_DEATH callback\n");
success = checkCapabilities(jvmti, &initCaps, "VM_DEATH callback");
NSK_DISPLAY1("Disable events: %d events\n", EVENTS_COUNT);
if (!nsk_jvmti_enableEvents(JVMTI_DISABLE, EVENTS_COUNT, events, NULL)) {
- success = NSK_FALSE;
+ success = false;
} else {
NSK_DISPLAY0(" ... disabled\n");
}
- if (success != NSK_TRUE) {
+ if (success != true) {
NSK_DISPLAY1("Exit with FAIL exit status: %d\n", STATUS_FAIL);
NSK_BEFORE_TRACE(exit(STATUS_FAIL));
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -114,27 +114,27 @@
/* ============================================================================= */
-static int prepare() {
+static bool prepare() {
ExceptionCheckingJniEnvPtr ec_jni(jni);
mainThread = findThread(MAIN_THREAD_NAME);
if (!NSK_VERIFY(mainThread != NULL)) {
NSK_COMPLAIN1("<%s> thread not found\n", MAIN_THREAD_NAME);
- return NSK_FALSE;
+ return false;
}
/* make thread accessable for a long time */
mainThread = ec_jni->NewGlobalRef(mainThread, TRACE_JNI_CALL);
startObject = getStaticObjField(DEBUGEE_CLASS_NAME, START_FIELD_NAME, OBJECT_FIELD_SIG);
if (!NSK_VERIFY(startObject != NULL))
- return NSK_FALSE;
+ return false;
/*make object accessable for a long time*/
startObject = ec_jni->NewGlobalRef(startObject, TRACE_JNI_CALL);
endObject = getStaticObjField(DEBUGEE_CLASS_NAME, END_FIELD_NAME, OBJECT_FIELD_SIG);
if (!NSK_VERIFY(endObject != NULL))
- return NSK_FALSE;
+ return false;
/*make object accessable for a long time*/
endObject = ec_jni->NewGlobalRef(endObject, TRACE_JNI_CALL);
@@ -143,17 +143,16 @@
THREAD_FIELD_NAME,
THREAD_FIELD_SIG);
if (!NSK_VERIFY(debuggeeThread != NULL))
- return NSK_FALSE;
+ return false;
/* make thread accessable for a long time */
debuggeeThread = ec_jni->NewGlobalRef(debuggeeThread, TRACE_JNI_CALL);
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-clean() {
+static bool clean() {
ExceptionCheckingJniEnvPtr ec_jni(jni);
/* disable MonitorContendedEnter event */
@@ -173,7 +172,7 @@
debuggeeThread = NULL;
mainThread = NULL;
- return NSK_TRUE;
+ return true;
}
/* ========================================================================== */
@@ -224,10 +223,10 @@
/* ============================================================================= */
-int checkEvents(int step) {
+bool checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -243,7 +242,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -277,14 +276,14 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value is 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] > 0) {
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -546,7 +545,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_MONITOR_CONTENDED_ENTER)
@@ -557,22 +556,22 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
-static int enableEventList() {
+static bool enableEventList() {
int i;
- int result = NSK_TRUE;
+ bool result = true;
NSK_DISPLAY0("Enable events\n");
@@ -588,18 +587,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -659,9 +657,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -69,12 +69,12 @@
* Testcase: check tested events.
* - check if expected events received for each method
*
- * Returns NSK_TRUE if test may continue; or NSK_FALSE for test break.
+ * Returns true if test may continue; or false for test break.
*/
-int checkEvents(int step) {
+bool checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -93,7 +93,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
if (currentCounts[ind_start] != currentCounts[ind_fnsh]) {
@@ -103,7 +103,7 @@
currentCounts[ind_start]);
NSK_COMPLAIN1("\tGARBAGE_COLLECTION_FINISH:\t%6d\n",
currentCounts[ind_fnsh]);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -132,14 +132,14 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] > 0) {
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -338,7 +338,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_GARBAGE_COLLECTION_START)
@@ -347,22 +347,22 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
-static int enableEventList() {
+static bool enableEventList() {
int i;
- int result = NSK_TRUE;
+ bool result = true;
NSK_DISPLAY0("Enable events\n");
@@ -378,18 +378,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -447,9 +446,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -67,10 +67,10 @@
/* ========================================================================== */
-int checkEvents(int step) {
+bool checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -86,7 +86,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -113,7 +113,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
@@ -122,7 +122,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -372,7 +372,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_COMPILED_METHOD_LOAD)
@@ -381,25 +381,25 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i;
- int result = NSK_TRUE;
+ bool result = true;
NSK_DISPLAY0("Enable events\n");
@@ -415,18 +415,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -485,9 +484,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -82,10 +82,10 @@
/* ========================================================================== */
-int checkEvents(int step) {
+bool checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -101,7 +101,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -128,14 +128,14 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] > 0) {
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -382,7 +382,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_NATIVE_METHOD_BIND)) {
@@ -390,25 +390,25 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i;
- int result = NSK_TRUE;
+ bool result = true;
NSK_DISPLAY0("Enable events\n");
@@ -424,18 +424,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -492,9 +491,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -70,7 +70,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -86,7 +86,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -113,7 +113,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be non-negative\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
@@ -122,7 +122,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -374,7 +374,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_VM_OBJECT_ALLOC)) {
@@ -382,23 +382,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -414,18 +414,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -479,9 +478,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -59,9 +59,9 @@
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(object, tag))) {
NSK_COMPLAIN0("TEST FAILED: unable to set tag for a tested object\n");
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
static void
@@ -86,7 +86,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -102,7 +102,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -129,7 +129,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
@@ -137,7 +137,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -323,7 +323,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_OBJECT_FREE)) {
@@ -331,23 +331,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -363,18 +363,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -428,9 +427,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -71,7 +71,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -87,7 +87,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -114,7 +114,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
@@ -122,7 +122,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -352,7 +352,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_SINGLE_STEP)) {
@@ -360,23 +360,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -392,18 +392,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -464,9 +463,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -68,7 +68,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -84,7 +84,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -113,7 +113,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
@@ -121,7 +121,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -371,7 +371,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_EXCEPTION)
@@ -380,23 +380,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -412,18 +412,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -478,9 +477,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -69,7 +69,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -85,7 +85,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -115,7 +115,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] != NUMBER_OF_INVOCATIONS) {
@@ -123,7 +123,7 @@
TranslateEvent(curr),
currentCounts[i],
NUMBER_OF_INVOCATIONS);
- result = NSK_FALSE;
+ result = false;
}
}
} else {
@@ -132,7 +132,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -378,7 +378,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_METHOD_ENTRY)
@@ -387,23 +387,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -419,18 +419,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -485,9 +484,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -73,7 +73,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -89,7 +89,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -121,14 +121,14 @@
TranslateEvent(curr),
currentCounts[i],
NUMBER_OF_INVOCATIONS);
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] < 1) {
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
}
@@ -138,7 +138,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -334,7 +334,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_FIELD_MODIFICATION)
@@ -343,23 +343,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -375,18 +375,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -441,9 +440,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -72,7 +72,7 @@
int checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -88,7 +88,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -116,7 +116,7 @@
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] != NUMBER_OF_INVOCATIONS) {
@@ -124,7 +124,7 @@
TranslateEvent(curr),
currentCounts[i],
NUMBER_OF_INVOCATIONS);
- result = NSK_FALSE;
+ result = false;
}
}
@@ -134,7 +134,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -321,7 +321,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_BREAKPOINT)) {
@@ -329,23 +329,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -361,18 +361,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -426,9 +425,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -75,10 +75,10 @@
/* ========================================================================== */
-int checkEvents(int step) {
+bool checkEvents(int step) {
int i;
jvmtiEvent curr;
- int result = NSK_TRUE;
+ bool result = true;
int *currentCounts;
int isExpected = 0;
@@ -94,7 +94,7 @@
default:
NSK_COMPLAIN1("Unexpected step no: %d\n", step);
- return NSK_FALSE;
+ return false;
}
for (i = 0; i < JVMTI_EVENT_COUNT; i++) {
@@ -123,14 +123,14 @@
TranslateEvent(curr),
currentCounts[i],
NUMBER_OF_INVOCATIONS);
- result = NSK_FALSE;
+ result = false;
}
} else {
if (currentCounts[i] < 1) {
NSK_COMPLAIN2("Unexpected events number %7d for %s\n\texpected value must be greater than 1\n",
currentCounts[i],
TranslateEvent(curr));
- result = NSK_FALSE;
+ result = false;
}
}
@@ -140,7 +140,7 @@
NSK_COMPLAIN2("Unexpected event %s was sent %d times\n",
TranslateEvent(curr),
currentCounts[i]);
- result = NSK_FALSE;
+ result = false;
}
}
}
@@ -325,7 +325,7 @@
/* ============================================================================= */
-static int enableEvent(jvmtiEvent event) {
+static bool enableEvent(jvmtiEvent event) {
if (nsk_jvmti_isOptionalEvent(event)
&& (event != JVMTI_EVENT_FRAME_POP)) {
@@ -333,23 +333,23 @@
jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
} else {
if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
NSK_COMPLAIN1("Unexpected error enabling %s\n",
TranslateEvent(event));
- return NSK_FALSE;
+ return false;
}
}
- return NSK_TRUE;
+ return true;
}
/**
* Enable or disable tested events.
*/
-static int enableEventList() {
+static bool enableEventList() {
int i, result;
@@ -365,18 +365,17 @@
result = result && enableEvent(event);
}
- if (result == NSK_FALSE) {
+ if (!result) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
-static int
-setCallBacks(int step) {
+static bool setCallBacks(int step) {
int i;
@@ -430,9 +429,9 @@
}
if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
- return NSK_FALSE;
+ return false;
- return NSK_TRUE;
+ return true;
}
/* ============================================================================= */
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -73,7 +73,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
for (i = 0; i < 30; i++) {
nsk_printf(" Inside the redefine method..\n");
- if (nsk_jvmti_redefineClass(jvmti, cla,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, cla,fileName)) {
nsk_printf("\nMyClass :: Successfully redefined..\n");
} else {
nsk_printf("\nMyClass :: Failed to redefine ..\n");
@@ -117,7 +117,7 @@
return JNI_ERR;
} else {
jvmtiCapabilities caps;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -46,9 +46,9 @@
char fileName[512];
nsk_jvmti_getFileName(0, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, klass, fileName)) {
nsk_printf("Agent:: Successfully redefined..");
- if (nsk_jvmti_disableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_disableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Agent :: NOTIFICATIONS ARE DISABLED \n");
} else {
nsk_printf(" Agent :: Failed to disabled \n");
@@ -81,7 +81,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -96,8 +96,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti,
- JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf("Agent :: NOTIFICATIONS ARE ENABLED \n");
} else {
nsk_printf(" Error in Eanableing Notifications..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -54,7 +54,7 @@
return JNI_ERR;
} else {
jvmtiCapabilities caps;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -81,7 +81,7 @@
}
nsk_jvmti_getFileName(0, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, cla, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, cla, fileName)) {
nsk_printf(" Agent :: Redefine successfull.\n");
} else {
nsk_printf("# error Agent :: Redefine failed.\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -73,7 +73,7 @@
nsk_printf(" ## Error occured %s \n",TranslateError(err));
} else {
nsk_printf(" NO ERRORS ");
- if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT, NULL)) {
nsk_printf(" Enabled.. notification event ..\n");
}
}
@@ -116,7 +116,7 @@
jlocation location) {
jvmtiError err;
err = JVMTI_ERROR_NONE;
- if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_SINGLE_STEP, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_SINGLE_STEP, NULL)) {
nsk_printf(" Enabled.. notification event ..");
}
err= jvmti->SetEventNotificationMode(JVMTI_DISABLE,
@@ -151,7 +151,7 @@
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
memset(&caps, 0, sizeof(caps));
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -172,7 +172,7 @@
nsk_printf(" ## Error occured %s \n",TranslateError(rc));
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf("Agent :: NOTIFICATIONS ARE ENABLED \n");
} else {
nsk_printf(" Error in Eanableing Notifications..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -64,7 +64,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
jvmti_env->GetMethodDeclaringClass(method, &cls);
- if (nsk_jvmti_redefineClass(jvmti_env, cls,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, cls,fileName)) {
nsk_printf(" Agent:: redefine class success ..\n");
nsk_printf("Agent::SUSPENDING>> \n");
err=jvmti_env->SuspendThread(thread);
@@ -103,7 +103,7 @@
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
memset(&caps, 0, sizeof(caps));
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -119,7 +119,7 @@
nsk_printf(" Agent:: Error occured while setting event callbacks \n");
return JNI_ERR;
}
- if (NSK_TRUE == nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_METHOD_EXIT, NULL)) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_METHOD_EXIT, NULL)) {
nsk_printf(" Agent :: NOTIFICATIONS ARE ENABLED \n");
} else {
nsk_printf(" Agent :: Error Enabling Notifications..");
@@ -160,7 +160,7 @@
// disable notifications before resuming thread
// to avoid recursion on PopFrame issued reinvoke
- if (NSK_TRUE == nsk_jvmti_disableNotification(jvmti,JVMTI_EVENT_METHOD_EXIT, NULL)) {
+ if (nsk_jvmti_disableNotification(jvmti,JVMTI_EVENT_METHOD_EXIT, NULL)) {
nsk_printf("Agent :: nsk_jvmti_disabled notifications..\n");
} else {
nsk_printf("Agent :: Failed to disable notifications..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -97,7 +97,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
nsk_printf(" %d..",redefineNumber);
- if (nsk_jvmti_redefineClass(jvmti, threadClass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, threadClass, fileName)) {
nsk_printf("\nMyClass :: Successfully redefined..\n");
} else {
nsk_printf("\nMyClass :: Failed to redefine ..\n");
@@ -118,7 +118,7 @@
jmethodID method,
jlocation location) {
nsk_printf("Agent::... BreakPoint Reached..\n");
- if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_SINGLE_STEP,thread) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_SINGLE_STEP,thread)) {
nsk_printf(" .... Enabled..\n");
}
return;
@@ -145,7 +145,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -166,8 +166,8 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if ((nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_LOAD, NULL) == NSK_TRUE) &&
- (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT,NULL) == NSK_TRUE)) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_LOAD, NULL) &&
+ nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT,NULL)) {
nsk_printf("Agent :: NOTIFICATIONS ARE ENABLED \n");
} else {
nsk_printf(" Error in Eanableing Notifications..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -98,7 +98,7 @@
nsk_printf(" %d..",redefineNumber);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, threadClass,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, threadClass,fileName)) {
nsk_printf("Agent:: Redefined..\n");
} else {
nsk_printf(" Failed to redefine..\n");
@@ -146,7 +146,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -168,10 +168,8 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if ((nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_LOAD,
- NULL) == NSK_TRUE) &&
- (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT,
- NULL) == NSK_TRUE)) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_LOAD, NULL) &&
+ nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_BREAKPOINT, NULL)) {
nsk_printf("Agent :: NOTIFICATIONS ARE ENABLED \n");
} else {
nsk_printf(" Error in Eanableing Notifications..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -99,7 +99,7 @@
} else {
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, clas, fileName) != NSK_TRUE) {
+ if (!nsk_jvmti_redefineClass(jvmti_env, clas, fileName)) {
nsk_printf(" Agent :: Failed to redefine.\n");
nsk_jvmti_agentFailed();
} else {
@@ -134,7 +134,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("#error Agent :: Failed to parse options.\n");
return JNI_ERR;
}
@@ -155,8 +155,8 @@
nsk_printf("#error Agent :: while setting event callbacks.\n");
return JNI_ERR;
}
- if ((nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) &&
- (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_FIELD_ACCESS, NULL) == NSK_TRUE)) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL) &&
+ nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_FIELD_ACCESS, NULL)) {
nsk_printf(" Agent :: Notifications are enabled.\n");
} else {
nsk_printf("#error Agent :: Eanableing Notifications.\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -50,7 +50,7 @@
nsk_jvmti_agentFailed();
} else {
if (strcmp(className, CLASS_NAME) == 0) {
- if (nsk_jvmti_enableNotification(jvmti_env, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti_env, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)) {
NSK_DISPLAY0(" Agent :: notification enabled for COMPILED_METHOD_LOAD.\n");
if (!NSK_JVMTI_VERIFY(jvmti_env->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
NSK_COMPLAIN0("#error Agent :: occured while enabling compiled method events.\n");
@@ -106,7 +106,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, threadClass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, threadClass, fileName)) {
NSK_DISPLAY0(" Agent :: Successfully redefined.\n");
redefineNumber++;
} else {
@@ -151,7 +151,7 @@
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
memset(&caps, 0, sizeof(caps));
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
NSK_DISPLAY0("#error Agent :: Failed to parse options.\n");
return JNI_ERR;
}
@@ -171,7 +171,7 @@
NSK_COMPLAIN0("#error Agent :: occured while setting event callback.\n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti,JVMTI_EVENT_CLASS_PREPARE, NULL)) {
NSK_DISPLAY0(" Agent :: Notifications are enabled.\n");
} else {
NSK_COMPLAIN0("#error Agent :: Error in enableing Notifications.\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -69,7 +69,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
NSK_DISPLAY1(">>>>>>CallbackClassLoad ... Name=%s... >>\n",name);
- if (nsk_jvmti_redefineClass(jvmti, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, klass, fileName)) {
NSK_DISPLAY0("\nMyClass :: Successfully redefined..\n");
redefineNumber++;
} else {
@@ -94,7 +94,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
NSK_DISPLAY1(">>>>>>callbackClassPrepare ... Name=%s... >>\n",name);
- if (nsk_jvmti_redefineClass(jvmti, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, klass, fileName)) {
NSK_DISPLAY0("\nMyClass :: Successfully redefined..\n");
redefineNumber++;
} else {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -104,7 +104,7 @@
sizeof(fileName)/sizeof(char));
cls = jni->FindClass(SEARCH_NAME);
printf("Agent:: Break Pont Reached..");
- if (nsk_jvmti_redefineClass(jvmti, cls, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, cls, fileName)) {
nsk_printf("\nMyClass :: Successfully redefined..\n");
} else {
nsk_printf("\nMyClass :: Failed to redefine ..\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -118,7 +118,7 @@
jvmtiThreadInfo info;
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, field_klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, field_klass, fileName)) {
NSK_DISPLAY0(" Agent :: Successfully redefined.\n");
redefineNumber++;
} else {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -97,7 +97,7 @@
/* Redefine the class loader and then pop the
frame and resume the thread..*/
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, clas, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, clas, fileName)) {
nsk_printf("\nMyClass :: Successfully redefined..\n");
} else {
nsk_printf("\nMyClass :: Failed to redefine ..\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -55,7 +55,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options.\n");
return JNI_ERR;
}
@@ -90,7 +90,7 @@
}
ret = JNI_FALSE;
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, cls, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, cls, fileName)) {
nsk_printf("Agent:: Redefine successful.\n");
ret = JNI_TRUE;
} else {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -57,7 +57,7 @@
return JNI_ERR;
} else {
jvmtiCapabilities caps;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf(" Agent:: ## error agent Failed to parse options.\n");
return JNI_ERR;
}
@@ -90,7 +90,7 @@
}
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, cls, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, cls, fileName)) {
nsk_printf("Agent:: MyClass :: Successfully redefined.\n");
ret = JNI_TRUE;
} else {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -46,7 +46,7 @@
fileName, sizeof(fileName)/sizeof(char));
nsk_jvmti_disableNotification(jvmti_env,
JVMTI_EVENT_CLASS_LOAD, NULL);
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("\n Redefine successful.\n");
} else {
nsk_printf("\n Redefine failed.\n");
@@ -75,7 +75,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options.\n");
return JNI_ERR;
}
@@ -92,7 +92,7 @@
nsk_printf(" Agent:: Error occured while setting event call back.\n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Agent:: Enabled notification.\n");
} else {
nsk_printf(" Agent:: Failed to enable notification.\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -47,7 +47,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Agent:: Redefine successful.\n");
} else {
nsk_printf("Agent:: Redefine failed.\n");
@@ -76,7 +76,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -93,7 +93,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled notification.\n");
} else {
nsk_printf(" Failed to enable notifications.\n");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -43,7 +43,7 @@
char fileName[512];
nsk_jvmti_disableNotification(jvmti, JVMTI_EVENT_CLASS_LOAD, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti, klass, fileName)) {
nsk_printf("\n Redefine successful ..\n");
} else {
nsk_printf("\n Redefine failed..\n");
@@ -73,7 +73,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -88,7 +88,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -43,7 +43,7 @@
char fileName[512];
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -73,7 +73,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -88,7 +88,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
char fileName[512];
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("Redefine failed .. \n");
@@ -76,7 +76,7 @@
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -94,8 +94,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE,
- NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName, sizeof(fileName)/sizeof(char));
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("Redefine failed .. \n");
@@ -77,7 +77,7 @@
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -93,7 +93,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -43,7 +43,7 @@
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
- if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -73,7 +73,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -88,7 +88,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -45,7 +45,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -75,7 +75,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -90,7 +90,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -74,7 +74,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -89,7 +89,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -41,7 +41,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -71,7 +71,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -86,7 +86,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -74,7 +74,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -89,7 +89,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -45,7 +45,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass,fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -74,7 +74,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -89,7 +89,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -73,7 +73,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -88,7 +88,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -44,7 +44,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -74,7 +74,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -89,7 +89,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -46,7 +46,7 @@
nsk_jvmti_disableNotification(jvmti_env, JVMTI_EVENT_CLASS_PREPARE, NULL);
nsk_jvmti_getFileName(redefineNumber, FILE_NAME, fileName,
sizeof(fileName)/sizeof(char));
- if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName) == NSK_TRUE) {
+ if (nsk_jvmti_redefineClass(jvmti_env, klass, fileName)) {
nsk_printf("Redefine successful ..\n");
} else {
nsk_printf("# error :: Redefine failed..\n");
@@ -76,7 +76,7 @@
} else {
jvmtiCapabilities caps;
jvmtiEventCallbacks eventCallbacks;
- if (nsk_jvmti_parseOptions(options) == NSK_FALSE) {
+ if (!nsk_jvmti_parseOptions(options)) {
nsk_printf("# error agent Failed to parse options \n");
return JNI_ERR;
}
@@ -91,7 +91,7 @@
nsk_printf(" Agent:: Error occured while setting event call back \n");
return JNI_ERR;
}
- if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL) == NSK_TRUE) {
+ if (nsk_jvmti_enableNotification(jvmti, JVMTI_EVENT_CLASS_PREPARE, NULL)) {
nsk_printf(" Enabled. noftification..");
} else {
nsk_printf(" Failed to Enable ..");
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -306,7 +306,7 @@
/* query frame location */
if (!NSK_JVMTI_VERIFY(
jvmti->GetFrameLocation(threadsDesc[i].thread, j, &qMethod, &qLocation))
- && (suspended == NSK_TRUE)) {
+ && suspended) {
nsk_jvmti_setFailStatus();
continue;
}
@@ -315,7 +315,7 @@
(void*)qMethod, (long)qLocation);
/* check frame equality */
- if ((suspended == NSK_TRUE) && (frameStack[j].method != qMethod)) {
+ if (suspended && (frameStack[j].method != qMethod)) {
NSK_COMPLAIN6("Different method in stack frame #%d for %s thread #%d (%s):\n"
"# GetStackTrace(): %p\n"
"# GetFrameLocation(): %p\n",
@@ -323,7 +323,7 @@
(void*)frameStack[j].method, (void*)qMethod);
nsk_jvmti_setFailStatus();
}
- if ((suspended == NSK_TRUE) && (frameStack[j].location != qLocation)) {
+ if (suspended && (frameStack[j].location != qLocation)) {
NSK_COMPLAIN6("Different location in stack frame #%d for %s thread #%d (%s):\n"
"# GetStackTrace(): %ld\n"
"# GetFrameLocation(): %ld\n",
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -329,7 +329,7 @@
/* query frame location */
if (!NSK_JVMTI_VERIFY(
jvmti->GetFrameLocation(threadsDesc[i].thread, j, &qMethod, &qLocation))
- && (suspended == NSK_TRUE)) {
+ && suspended) {
nsk_jvmti_setFailStatus();
continue;
}
@@ -338,7 +338,7 @@
(void*)qMethod, (long)qLocation);
/* check frame equality */
- if ((suspended == NSK_TRUE) && (frameStack[j].method != qMethod)) {
+ if (suspended && (frameStack[j].method != qMethod)) {
NSK_COMPLAIN6("Different method in stack frame #%d for %s thread #%d (%s):\n"
"# GetStackTrace(): 0x%p\n"
"# GetFrameLocation(): 0x%p\n",
@@ -346,7 +346,7 @@
(void*)frameStack[j].method, (void*)qMethod);
nsk_jvmti_setFailStatus();
}
- if ((suspended == NSK_TRUE) && (frameStack[j].location != qLocation)) {
+ if (suspended && (frameStack[j].location != qLocation)) {
NSK_COMPLAIN6("Different location in stack frame #%d for %s thread #%d (%s):\n"
"# GetStackTrace(): %ld\n"
"# GetFrameLocation(): %ld\n",
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -101,8 +101,7 @@
/* ============================================================================= */
static int get_reference_index(jvmtiHeapReferenceKind reference_kind,
- const jvmtiHeapReferenceInfo* reference_info)
-{
+ const jvmtiHeapReferenceInfo* reference_info) {
int referrer_index = 0;
switch (reference_kind) {
@@ -132,11 +131,10 @@
/** Initialize objectDescList. */
-static int initObjectDescList(jvmtiEnv* jvmti,
- int chainLength,
- int* objectsCount,
- ObjectDesc** objectDescList)
-{
+static bool initObjectDescList(jvmtiEnv* jvmti,
+ int chainLength,
+ int* objectsCount,
+ ObjectDesc** objectDescList) {
/* root object + reachable and unreachable object chains */
*objectsCount = 1 + 2 * chainLength;
@@ -145,7 +143,7 @@
if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)),
(unsigned char**) objectDescList))) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf(" ... allocated array: 0x%p\n", (void*)objectDescList);
fflush(0);
@@ -166,21 +164,20 @@
(*objectDescList)[chainLength].exp_found = 1;
- return NSK_TRUE;
+ return true;
} /* initObjectDescList */
/** Find and tag classes. */
-static int getAndTagClasses(jvmtiEnv* jvmti,
- JNIEnv* jni,
- jclass* debugeeClass,
- jclass* rootObjectClass,
- jclass* chainObjectClass)
-{
+static bool getAndTagClasses(jvmtiEnv* jvmti,
+ JNIEnv* jni,
+ jclass* debugeeClass,
+ jclass* rootObjectClass,
+ jclass* chainObjectClass) {
if (!NSK_JNI_VERIFY(jni, (*debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound debugee class: 0x%p\n %s\n",
(void*) *debugeeClass, DEBUGEE_CLASS_NAME);
@@ -189,7 +186,7 @@
if (!NSK_JNI_VERIFY(jni, (*rootObjectClass =
jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(*rootObjectClass, ROOT_CLASS_TAG))) {
@@ -205,7 +202,7 @@
if (!NSK_JNI_VERIFY(jni, (*chainObjectClass =
jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
if (!NSK_JVMTI_VERIFY(jvmti->SetTag(*chainObjectClass, CHAIN_CLASS_TAG))) {
@@ -216,27 +213,26 @@
CHAIN_OBJECT_CLASS_NAME);
fflush(0);
- return NSK_TRUE;
+ return true;
} /* getAndTagClasses */
/** Obtain chain of tested objects and tag them recursively. */
-static int getFieldsAndObjects(jvmtiEnv* jvmti,
- JNIEnv* jni,
- jclass debugeeClass,
- jclass rootObjectClass,
- jclass chainObjectClass,
- jobject* rootObjectPtr,
- jfieldID* reachableChainField,
- jfieldID* unreachableChainField,
- jfieldID* nextField)
-{
+static bool getFieldsAndObjects(jvmtiEnv* jvmti,
+ JNIEnv* jni,
+ jclass debugeeClass,
+ jclass rootObjectClass,
+ jclass chainObjectClass,
+ jobject* rootObjectPtr,
+ jfieldID* reachableChainField,
+ jfieldID* unreachableChainField,
+ jfieldID* nextField) {
jfieldID rootObjectField = NULL;
if (!NSK_JNI_VERIFY(jni, (rootObjectField =
jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound fieldID: 0x%p - \'%s\' static field in debugee class\n",
(void*) rootObjectField, OBJECT_FIELD_NAME);
@@ -245,7 +241,7 @@
if (!NSK_JNI_VERIFY(jni, (*reachableChainField =
jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound fieldID: 0x%p - \'%s\' field in root object class\n",
(void*) reachableChainField, REACHABLE_CHAIN_FIELD_NAME);
@@ -254,7 +250,7 @@
if (!NSK_JNI_VERIFY(jni, (*unreachableChainField =
jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound fieldID: 0x%p - \'%s\' field in root object class\n",
@@ -264,7 +260,7 @@
if (!NSK_JNI_VERIFY(jni, (*nextField =
jni->GetFieldID(chainObjectClass, NEXT_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound fieldID: 0x%p - \'%s\' field in chain object class\n",
(void*) nextField, NEXT_FIELD_NAME);
@@ -273,24 +269,24 @@
if (!NSK_JNI_VERIFY(jni, (*rootObjectPtr =
jni->GetStaticObjectField(debugeeClass, rootObjectField)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("\nFound root object: 0x%p\n", (void*) *rootObjectPtr);
fflush(0);
if (!NSK_JNI_VERIFY(jni, (*rootObjectPtr = jni->NewGlobalRef(*rootObjectPtr)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf("Created root object global ref: 0x%p\n", (void*)*rootObjectPtr);
fflush(0);
- return NSK_TRUE;
+ return true;
} /* getFieldsAndObjects */
/** Obtain chain of tested objects and tag them recursively. */
-static int getAndTagChainObjects(
+static bool getAndTagChainObjects(
jvmtiEnv* jvmti,
JNIEnv* jni,
jobject currObj,
@@ -299,13 +295,12 @@
int count,
ObjectDesc objectDescList[],
jlong tag,
- int reachable)
-{
+ bool reachable) {
jobject nextObj = NULL;
jlong objTag = (reachable ? tag : -tag);
if (count <= 0) {
- return NSK_TRUE;
+ return true;
}
count--;
@@ -313,7 +308,7 @@
if (!NSK_JNI_VERIFY(jni, (nextObj = jni->GetObjectField(currObj, refField)) != NULL)) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
objectDescList[count].tag = objTag;
@@ -338,12 +333,12 @@
tag,
reachable)
) {
- return NSK_FALSE;
+ return false;
}
NSK_TRACE(jni->DeleteLocalRef(nextObj));
- return NSK_TRUE;
+ return true;
} /* getAndTagChainObjects */
/** Obtain all tested objects from debugee class and tag them recursively. */
@@ -363,31 +358,31 @@
jfieldID unreachableChainField = NULL;
jfieldID nextField = NULL;
- if (initObjectDescList(jvmti,
- chainLength,
- objectsCount,
- objectDescList) == NSK_FALSE) {
- return NSK_FALSE;
+ if (!initObjectDescList(jvmti,
+ chainLength,
+ objectsCount,
+ objectDescList)) {
+ return false;
}
- if (getAndTagClasses(jvmti,
- jni,
- &debugeeClass,
- &rootObjectClass,
- &chainObjectClass) == NSK_FALSE) {
- return NSK_FALSE;
+ if (!getAndTagClasses(jvmti,
+ jni,
+ &debugeeClass,
+ &rootObjectClass,
+ &chainObjectClass)) {
+ return false;
}
- if (getFieldsAndObjects(jvmti,
- jni,
- debugeeClass,
- rootObjectClass,
- chainObjectClass,
- rootObjectPtr,
- &reachableChainField,
- &unreachableChainField,
- &nextField) == NSK_FALSE) {
- return NSK_FALSE;
+ if (!getFieldsAndObjects(jvmti,
+ jni,
+ debugeeClass,
+ rootObjectClass,
+ chainObjectClass,
+ rootObjectPtr,
+ &reachableChainField,
+ &unreachableChainField,
+ &nextField)) {
+ return false;
}
printf("\nObtain and tag chain objects:\n");
@@ -411,10 +406,10 @@
chainLength,
(*objectDescList) + 1,
CHAIN_OBJECT_TAG,
- NSK_TRUE) /* reachable objects */
+ true) /* reachable objects */
) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
printf(" unreachable objects chain: %d objects\n", chainLength);
@@ -426,22 +421,22 @@
chainLength,
(*objectDescList) + 1 + chainLength,
CHAIN_OBJECT_TAG,
- NSK_FALSE) /* unreachable objects */
+ false) /* unreachable objects */
) {
nsk_jvmti_setFailStatus();
- return NSK_FALSE;
+ return false;
}
- return NSK_TRUE;
+ return true;
} /* getAndTagTestedObjects */
/** Check if tagged objects were iterated. */
-static int checkTestedObjects(jvmtiEnv* jvmti,
- JNIEnv* jni,
- int chainLength,
- ObjectDesc objectDescList[])
+static bool checkTestedObjects(jvmtiEnv* jvmti,
+ JNIEnv* jni,
+ int chainLength,
+ ObjectDesc objectDescList[])
{
- int success = NSK_TRUE;
+ bool success = true;
int i, idx;
printf("Following tagged objects were iterated:\n");
@@ -498,16 +493,16 @@
fflush(0);
}
- return NSK_TRUE;
+ return true;
} /* checkTestedObjects */
/** Release references to the tested objects and free allocated memory. */
-static int releaseTestedObjects(jvmtiEnv* jvmti,
- JNIEnv* jni,
- int chainLength,
- ObjectDesc* objectDescList,
- jobject rootObject)
+static void releaseTestedObjects(jvmtiEnv* jvmti,
+ JNIEnv* jni,
+ int chainLength,
+ ObjectDesc* objectDescList,
+ jobject rootObject)
{
if (rootObject != NULL) {
printf("Release object reference to root tested object: 0x%p\n", rootObject);
@@ -522,7 +517,6 @@
}
fflush(0);
- return NSK_TRUE;
} /* releaseTestedObjects */
@@ -784,10 +778,7 @@
printf(">>> Clean used data\n");
fflush(0);
- if (!NSK_VERIFY(releaseTestedObjects(jvmti, jni, chainLength,
- objectDescList, rootObject))) {
- return;
- }
+ releaseTestedObjects(jvmti, jni, chainLength, objectDescList, rootObject);
printf(">>> Let debugee to finish\n");
fflush(0);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -96,7 +96,7 @@
}
int result = suspendThreadAtMethod(jvmti, cls, earlyretThr, midActiveMethod);
- if( result == NSK_TRUE) {
+ if (result) {
return PASSED;
} else {
RETURN_FAILED;
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp Thu Aug 08 17:23:13 2019 -0400
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp Thu Aug 08 17:27:17 2019 -0400
@@ -523,7 +523,7 @@
JNIEXPORT jboolean JNICALL
Java_nsk_share_jvmti_RedefineAgent_redefineAttempted(JNIEnv *jni, jobject obj) {
- if (redefineAttempted == NSK_TRUE) {
+ if (redefineAttempted) {
return JNI_TRUE;
}else {
return JNI_FALSE;
@@ -534,7 +534,7 @@
JNIEXPORT jboolean JNICALL
Java_nsk_share_jvmti_RedefineAgent_isRedefined(JNIEnv * jni, jobject obj) {
- if (redefineSucceed == NSK_TRUE) {
+ if (redefineSucceed) {
return JNI_TRUE;
}else {
return JNI_FALSE;
@@ -545,7 +545,7 @@
*/
JNIEXPORT jboolean JNICALL
Java_nsk_share_jvmti_RedefineAgent_agentStatus(JNIEnv * jni, jobject obj) {
- if (agentFailed == NSK_TRUE) {
+ if (agentFailed) {
return JNI_FALSE;
} else {
return JNI_TRUE;
--- a/test/jdk/ProblemList.txt Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/ProblemList.txt Thu Aug 08 17:27:17 2019 -0400
@@ -890,3 +890,8 @@
############################################################################
+# jdk_internal
+
+jdk/internal/platform/docker/TestDockerMemoryMetrics.java 8227317 linux-x64
+
+############################################################################
--- a/test/jdk/java/net/DatagramSocket/ReuseAddressTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/DatagramSocket/ReuseAddressTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -30,6 +30,9 @@
/*
* @test
* @bug 8153674
+ * @key intermittent
+ * @summary This test might fail intermittently as it needs a UDP socket that
+ * binds to the wildcard address.
* @summary Expected SocketException not thrown when calling bind() with
* setReuseAddress(false)
* @run main/othervm ReuseAddressTest
--- a/test/jdk/java/net/DatagramSocket/SendSize.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/DatagramSocket/SendSize.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -36,13 +36,16 @@
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
public class SendSize {
static final int bufferLength = 512;
static final int packetLength = 256;
public static void main(String[] args) throws Exception {
- DatagramSocket serverSocket = new DatagramSocket();
+ DatagramSocket serverSocket = new DatagramSocket(
+ new InetSocketAddress(InetAddress.getLocalHost(), 0)
+ );
Thread server = new ServerThread(serverSocket);
server.start();
Thread client = new ClientThread(serverSocket.getLocalPort());
--- a/test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -31,9 +31,10 @@
import java.io.*;
import java.net.*;
import java.util.*;
+import java.util.concurrent.CountDownLatch;
public class ADatagramSocket {
- public static void main(String[] args) throws IOException {
+ public static void main(String[] args) throws Exception {
// testing out setDatagramSocketImplFactory
System.err.println("setting DatagramSocketImplFactory...");
try {
@@ -46,6 +47,8 @@
int port = server.getPort();
System.out.println("Server port is " + port);
server.start();
+ // Wait server thread to reach receive call
+ server.readyToStart.await();
// get a datagram socket
DatagramSocket socket = new DatagramSocket();
@@ -72,6 +75,7 @@
protected DatagramSocket socket = null;
private final int port;
+ final CountDownLatch readyToStart = new CountDownLatch(1);
public QuoteServerThread() throws IOException {
this("QuoteServerThread");
@@ -79,7 +83,7 @@
public QuoteServerThread(String name) throws IOException {
super(name);
- socket = new DatagramSocket(0);
+ socket = new DatagramSocket(0, InetAddress.getLocalHost());
port = socket.getLocalPort();
}
public int getPort(){
@@ -92,6 +96,8 @@
// receive request
DatagramPacket packet = new DatagramPacket(buf, buf.length);
+ // Notify client that server is ready to receive packet
+ readyToStart.countDown();
socket.receive(packet);
// figure out response
--- a/test/jdk/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java Thu Aug 08 17:27:17 2019 -0400
@@ -26,8 +26,11 @@
*
* @test
* @bug 6368984
+ * @key intermittent
* @summary Configuring unconnected Socket before passing to implAccept
- * can cause fd leak
+ * can cause fd leak.
+ * This test may fail intermittently if foreign processes will
+ * try to establish connection to the test server socket.
* @requires (os.family != "windows")
* @library /test/lib
* @build jdk.test.lib.Utils
@@ -43,6 +46,7 @@
import java.io.IOException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.List;
@@ -82,7 +86,7 @@
}
}
- final ServerSocket ss = new ServerSocket(0, 0, InetAddress.getLoopbackAddress()) {
+ final ServerSocket ss = new ServerSocket() {
public Socket accept() throws IOException {
Socket s = new Socket() {
};
@@ -91,23 +95,29 @@
return s;
}
};
+ ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
Thread t = new Thread(new Runnable() {
public void run() {
+ int repsCompleted = 0;
try {
- for (int i = 0; i < REPS; i++) {
+ for (; repsCompleted < REPS; repsCompleted++) {
(new Socket(InetAddress.getLoopbackAddress(), ss.getLocalPort())).close();
}
} catch (IOException e) {
e.printStackTrace();
+ } finally {
+ System.out.println("Client iterations completed:" + repsCompleted);
}
}
});
t.start();
+ int repsCompleted = 0;
try {
- for (int i = 0; i < REPS; i++) {
+ for (; repsCompleted < REPS; repsCompleted++) {
ss.accept().close();
}
} finally {
+ System.out.println("Server iterations completed:" + repsCompleted);
ss.close();
}
t.join();
--- a/test/jdk/java/net/Socket/NullHost.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/Socket/NullHost.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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
@@ -36,7 +36,10 @@
public Server() throws IOException {
svr = new ServerSocket();
- svr.bind(new InetSocketAddress(0));
+ // The client side calls Socket((String) null, ...) which
+ // resolves to InetAddress.getByName((String)null) which in
+ // turns will resolve to the loopback address
+ svr.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
}
public int getPort() {
--- a/test/jdk/java/net/Socket/ProxyCons.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/Socket/ProxyCons.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -64,12 +64,14 @@
}
void test() throws Exception {
- ServerSocket ss = new ServerSocket(0);
+ InetAddress localHost = InetAddress.getLocalHost();
+ ServerSocket ss = new ServerSocket();
+ ss.bind(new InetSocketAddress(localHost, 0));
try {
Server s = new Server(ss);
s.start();
Socket sock = new Socket(Proxy.NO_PROXY);
- sock.connect(new InetSocketAddress("localhost", ss.getLocalPort()));
+ sock.connect(new InetSocketAddress(localHost, ss.getLocalPort()));
s.done();
sock.close();
} catch (java.io.IOException e) {
--- a/test/jdk/java/net/Socket/SocksConnectTimeout.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/Socket/SocksConnectTimeout.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, 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
@@ -53,7 +53,9 @@
IPSupport.throwSkippedExceptionIfNonOperational();
try {
- serverSocket = new ServerSocket(0);
+ serverSocket = new ServerSocket();
+ InetAddress localHost = InetAddress.getLocalHost();
+ serverSocket.bind(new InetSocketAddress(localHost, 0));
(new Thread() {
@Override
@@ -61,7 +63,7 @@
}).start();
Proxy socksProxy = new Proxy(Proxy.Type.SOCKS,
- new InetSocketAddress(InetAddress.getLocalHost(), serverSocket.getLocalPort()));
+ new InetSocketAddress(localHost, serverSocket.getLocalPort()));
test(socksProxy);
} catch (IOException e) {
--- a/test/jdk/java/net/Socket/TestClose.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/Socket/TestClose.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -44,9 +44,11 @@
InetAddress ad1, ad2;
int port1, port2, serverport;
- ss = new ServerSocket(0);
+ InetAddress loopback = InetAddress.getLoopbackAddress();
+ ss = new ServerSocket();
+ ss.bind(new InetSocketAddress(loopback, 0));
serverport = ss.getLocalPort();
- s = new Socket("localhost", serverport);
+ s = new Socket(loopback, serverport);
s.close();
ss.close();
ad1 = ss.getInetAddress();
--- a/test/jdk/java/net/URLClassLoader/ClassLoad.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/URLClassLoader/ClassLoad.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -25,24 +25,29 @@
* @test
* @bug 4151665
* @modules jdk.httpserver
+ * @library /test/lib
* @summary Test for FileNotFoundException when loading bogus class
*/
import java.io.InputStream;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URL;
import java.net.URLClassLoader;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
+import jdk.test.lib.net.URIBuilder;
public class ClassLoad {
public static void main(String[] args) throws Exception {
boolean error = true;
// Start a dummy server to return 404
- HttpServer server = HttpServer.create(new InetSocketAddress(0), 0);
+ HttpServer server = HttpServer.create();
+ server.bind(new InetSocketAddress(
+ InetAddress.getLoopbackAddress(), 0), 0);
HttpHandler handler = new HttpHandler() {
public void handle(HttpExchange t) throws IOException {
InputStream is = t.getRequestBody();
@@ -56,7 +61,11 @@
// Client request
try {
- URL url = new URL("http://localhost:" + server.getAddress().getPort());
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(server.getAddress().getPort())
+ .toURL();
String name = args.length >= 2 ? args[1] : "foo.bar.Baz";
ClassLoader loader = new URLClassLoader(new URL[] { url });
System.out.println(url);
--- a/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/URLClassLoader/closetest/CloseTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -168,7 +168,9 @@
}
static void startHttpServer(String docroot) throws Exception {
- httpServer = HttpServer.create(new InetSocketAddress(0), 10);
+ httpServer = HttpServer.create(
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), 0),
+ 10);
HttpContext ctx = httpServer.createContext(
"/", new FileServerHandler(docroot)
);
--- a/test/jdk/java/net/URLConnection/HandleContentTypeWithAttrs.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/URLConnection/HandleContentTypeWithAttrs.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -24,8 +24,9 @@
/*
* @test
* @bug 4160200
- * @summary Make sure URLConnection.getContnentHandler
+ * @summary Make sure URLConnection.getContentHandler
* can handle MIME types with attributes
+ * @library /test/lib
* @modules java.base/sun.net.www java.base/sun.net.www.content.text
*/
import java.net.*;
@@ -34,6 +35,8 @@
import sun.net.www.MessageHeader;
import static java.net.Proxy.NO_PROXY;
+import jdk.test.lib.net.URIBuilder;
+
public class HandleContentTypeWithAttrs {
URL url;
@@ -43,7 +46,12 @@
// Request echo.html from myHttpServer.
// In the header of the response, we make
// the content type have some attributes.
- url = new URL("http://localhost:" + port + "/echo.html");
+ url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .path("/echo.html")
+ .toURL();
URLConnection urlConn = url.openConnection(NO_PROXY);
// the method getContent() calls the method
@@ -135,7 +143,8 @@
/** Start a server on port <i>port</i>. It will call serviceRequest()
for each new connection. */
final public void startServer(int port) throws IOException {
- serverSocket = new ServerSocket(port, 50);
+ serverSocket = new ServerSocket(port, 50,
+ InetAddress.getLoopbackAddress());
serverInstance = new Thread(this);
serverInstance.start();
}
@@ -219,10 +228,13 @@
public myHttpServer () {
try {
- defaultContext
- = new URL("http", InetAddress.getLocalHost().getHostName(), "/");
+ defaultContext = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .path("/")
+ .toURL();
} catch(Exception e) {
- System.out.println("Failed to construct defauit URL context: "
+ System.out.println("Failed to construct default URL context: "
+ e);
e.printStackTrace();
}
--- a/test/jdk/java/net/URLConnection/RedirectLimit.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/URLConnection/RedirectLimit.java Thu Aug 08 17:27:17 2019 -0400
@@ -35,11 +35,12 @@
import java.io.*;
import java.net.*;
+import java.util.concurrent.CountDownLatch;
import jdk.test.lib.net.URIBuilder;
class RedirLimitServer extends Thread {
- static final int TIMEOUT = 10 * 1000;
+ static final int TIMEOUT = 20 * 1000;
static final int NUM_REDIRECTS = 9;
static final String reply1 = "HTTP/1.1 307 Temporary Redirect\r\n" +
@@ -59,6 +60,7 @@
final ServerSocket ss;
final int port;
+ final CountDownLatch readyToStart = new CountDownLatch(1);
RedirLimitServer(ServerSocket ss) throws IOException {
this.ss = ss;
@@ -85,6 +87,7 @@
public void run() {
try {
+ readyToStart.countDown();
for (int i=0; i<NUM_REDIRECTS; i++) {
try (Socket s = ss.accept()) {
s.setSoTimeout(TIMEOUT);
@@ -100,33 +103,32 @@
}
} catch (Exception e) {
e.printStackTrace();
- } finally {
- try { ss.close(); } catch (IOException unused) {}
}
}
};
public class RedirectLimit {
public static void main(String[] args) throws Exception {
- ServerSocket ss = new ServerSocket(0, 0, InetAddress.getLoopbackAddress());
- int port = ss.getLocalPort();
- RedirLimitServer server = new RedirLimitServer(ss);
- server.start();
+ try (ServerSocket ss = new ServerSocket(0, 0, InetAddress.getLoopbackAddress())) {
+ int port = ss.getLocalPort();
+ RedirLimitServer server = new RedirLimitServer(ss);
+ server.start();
+ server.readyToStart.await();
+ URL url = URIBuilder.newBuilder()
+ .scheme("http")
+ .loopback()
+ .port(port)
+ .toURL();
+ URLConnection conURL = url.openConnection(Proxy.NO_PROXY);
- URL url = URIBuilder.newBuilder()
- .scheme("http")
- .loopback()
- .port(port)
- .toURL();
- URLConnection conURL = url.openConnection();
+ conURL.setDoInput(true);
+ conURL.setAllowUserInteraction(false);
+ conURL.setUseCaches(false);
- conURL.setDoInput(true);
- conURL.setAllowUserInteraction(false);
- conURL.setUseCaches(false);
-
- try (InputStream in = conURL.getInputStream()) {
- if ((in.read() != (int)'W') || (in.read()!=(int)'o')) {
- throw new RuntimeException("Unexpected string read");
+ try (InputStream in = conURL.getInputStream()) {
+ if ((in.read() != (int) 'W') || (in.read() != (int) 'o')) {
+ throw new RuntimeException("Unexpected string read");
+ }
}
}
}
--- a/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -40,13 +40,18 @@
import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
/*
* @test
+ * @bug 8197564 8228970
* @summary Simple smoke test for BodySubscriber.asInputStream();
* @run testng/othervm HttpResponseInputStreamTest
* @author daniel fuchs
*/
public class HttpResponseInputStreamTest {
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+ static final Class<IndexOutOfBoundsException> OOB = IndexOutOfBoundsException.class;
static class TestException extends IOException {}
@@ -184,6 +189,33 @@
}
@Test
+ public static void testReadParameters() throws InterruptedException, ExecutionException, IOException {
+ BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
+ InputStream is = isb.getBody().toCompletableFuture().get();
+
+ Throwable ex;
+
+ // len == 0
+ assertEquals(is.read(new byte[16], 0, 0), 0);
+ assertEquals(is.read(new byte[16], 16, 0), 0);
+
+ // index == -1
+ ex = expectThrows(OOB, () -> is.read(new byte[16], -1, 10));
+ System.out.println("OutOfBoundsException thrown as expected: " + ex);
+
+ // large offset
+ ex = expectThrows(OOB, () -> is.read(new byte[16], 17, 10));
+ System.out.println("OutOfBoundsException thrown as expected: " + ex);
+
+ ex = expectThrows(OOB, () -> is.read(new byte[16], 10, 10));
+ System.out.println("OutOfBoundsException thrown as expected: " + ex);
+
+ // null value
+ ex = expectThrows(NPE, () -> is.read(null, 0, 10));
+ System.out.println("NullPointerException thrown as expected: " + ex);
+ }
+
+ @Test
public static void testSubscribeAndClose()
throws InterruptedException, ExecutionException
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/file/Files/InputStreamTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8227609
+ * @summary Test of InputStream and OutputStream created by java.nio.file.Files
+ * @library ..
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.ClosedChannelException;
+import java.nio.file.*;
+import static java.nio.file.Files.*;
+import static java.nio.file.LinkOption.*;
+import java.nio.file.attribute.*;
+import java.io.IOException;
+import java.util.*;
+
+public class InputStreamTest {
+
+ public static void main(String[] args) throws IOException {
+ Path dir = TestUtil.createTemporaryDirectory();
+ try {
+ testSkip(dir);
+ } finally {
+ TestUtil.removeAll(dir);
+ }
+ }
+
+ /**
+ * Tests Files.newInputStream(Path).skip().
+ */
+ static void testSkip(Path tmpdir) throws IOException {
+ Path file = createFile(tmpdir.resolve("foo"));
+ try (OutputStream out = Files.newOutputStream(file)) {
+ final int size = 512;
+ byte[] blah = new byte[size];
+ for (int i = 0; i < size; i++) {
+ blah[i] = (byte)(i % 128);
+ }
+ out.write(blah);
+ out.close();
+
+ try (InputStream in = Files.newInputStream(file)) {
+ assertTrue(in.available() == size);
+ assertTrue(in.skip(size/4) == size/4); // 0.25
+ assertTrue(in.available() == 3*size/4);
+
+ int b = in.read();
+ assertTrue(b == blah[size/4]);
+ assertTrue(in.available() == 3*size/4 - 1);
+ assertTrue(in.skip(-1) == -1); // 0.25
+ assertTrue(in.available() == 3*size/4);
+
+ assertTrue(in.skip(-size/2) == -size/4); // 0
+ assertTrue(in.available() == size);
+
+ assertTrue(in.skip(5*size/4) == size); // 1.0
+ assertTrue(in.available() == 0);
+
+ assertTrue(in.skip(-3*size/4) == -3*size/4); // 0.25
+ assertTrue(in.available() == 3*size/4);
+
+ byte[] buf = new byte[16];
+ in.read(buf, 2, 12);
+ assertTrue(Arrays.equals(buf, 2, 14,
+ blah, size/4, size/4 + 12));
+ assertTrue(in.skip(-12) == -12); // 0.25
+
+ assertTrue(in.skip(3*size/4) == 3*size/4); // 1.0
+ assertTrue(in.available() == 0);
+
+ assertTrue(in.skip(-size/2) == -size/2); // 0.5
+ assertTrue(in.available() == size/2);
+
+ assertTrue(in.skip(-size) == -size/2); // 0
+ assertTrue(in.available() == size);
+
+ assertTrue(in.skip(size/2) == size/2); // 0.5
+ assertTrue(in.available() == size/2);
+
+ assertTrue(in.skip(Long.MIN_VALUE) == -size/2); // 0
+ assertTrue(in.available() == size);
+
+ assertTrue(in.skip(size/2) == size/2); // 0.5
+ assertTrue(in.available() == size/2);
+
+ assertTrue(in.skip(Long.MAX_VALUE - size/4) == size/2);
+ assertTrue(in.available() == 0);
+
+ in.close();
+ try {
+ in.skip(1);
+ throw new RuntimeException("skip() did not fail");
+ } catch (IOException ioe) {
+ if (!(ioe instanceof ClosedChannelException)) {
+ throw new RuntimeException
+ ("IOException is not a ClosedChannelException");
+ }
+ }
+ }
+ }
+ }
+
+ static void assertTrue(boolean okay) {
+ if (!okay)
+ throw new RuntimeException("Assertion Failed");
+ }
+}
--- a/test/jdk/java/nio/file/Files/Misc.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/nio/file/Files/Misc.java Thu Aug 08 17:27:17 2019 -0400
@@ -22,14 +22,11 @@
*/
/* @test
- * @bug 4313887 6838333 8005566 8032220 8215467 8227080
+ * @bug 4313887 6838333 8005566 8032220 8215467
* @summary Unit test for miscellenous methods in java.nio.file.Files
* @library ..
*/
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.channels.ClosedChannelException;
import java.nio.file.*;
import static java.nio.file.Files.*;
import static java.nio.file.LinkOption.*;
@@ -47,7 +44,6 @@
testIsSameFile(dir);
testFileTypeMethods(dir);
testAccessMethods(dir);
- testSkip(dir);
} finally {
TestUtil.removeAll(dir);
}
@@ -376,38 +372,6 @@
}
}
- /**
- * Tests Files.newInputStream(Path).skip().
- */
- static void testSkip(Path tmpdir) throws IOException {
- Path file = createFile(tmpdir.resolve("foo"));
- try (OutputStream out = Files.newOutputStream(file)) {
- byte[] blah = new byte[8192];
- Arrays.fill(blah, (byte)42);
- out.write(blah);
- out.close();
- try (InputStream in = Files.newInputStream(file)) {
- assertTrue(in.skip(-1) == 0);
- assertTrue(in.skip(0) == 0);
- assertTrue(in.skip(blah.length/4) == blah.length/4);
- assertTrue(in.skip(blah.length/2) == blah.length/2);
- assertTrue(in.skip(Long.MAX_VALUE) == blah.length/4);
- in.close();
- try {
- long n = in.skip(1);
- throw new RuntimeException("skip() did not fail");
- } catch (IOException ioe) {
- if (!(ioe.getCause() instanceof ClosedChannelException)) {
- throw new RuntimeException
- ("IOException not caused by ClosedChannelException");
- }
- }
- }
- } finally {
- delete(file);
- }
- }
-
static void assertTrue(boolean okay) {
if (!okay)
throw new RuntimeException("Assertion Failed");
--- a/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/time/tck/java/time/format/TCKDateTimeFormatterBuilder.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -614,7 +614,7 @@
@Test(dataProvider = "parseGenericTimeZonePatterns")
public void test_appendZoneText_parseGenericTimeZonePatterns(String pattern, LocalDateTime ldt, ZoneId zId, String input) {
- DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter();
+ DateTimeFormatter df = new DateTimeFormatterBuilder().appendPattern(pattern).toFormatter(Locale.US);
ZonedDateTime expected = ZonedDateTime.parse(input, df);
ZonedDateTime actual = ZonedDateTime.of(ldt, zId);
assertEquals(actual, expected);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ *
+ * @test
+ * @bug 8215181
+ * @summary Tests the "u-cf" extension
+ * @modules jdk.localedata
+ * @run testng/othervm CurrencyFormatTests
+ */
+
+import static org.testng.Assert.assertEquals;
+
+import java.text.NumberFormat;
+import java.util.Locale;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test NumberFormat with BCP47 u-cf extensions. Note that this test depends
+ * on the particular CLDR release. Results may vary on other CLDR releases.
+ */
+@Test
+public class CurrencyFormatTests {
+
+ @DataProvider(name="getInstanceData")
+ Object[][] getInstanceData() {
+ return new Object[][] {
+ // Locale, amount, expected
+ // US dollar
+ {Locale.US, -100, "-$100.00"},
+ {Locale.forLanguageTag("en-US-u-cf-standard"), -100, "-$100.00"},
+ {Locale.forLanguageTag("en-US-u-cf-account"), -100, "($100.00)"},
+ {Locale.forLanguageTag("en-US-u-cf-bogus"), -100, "-$100.00"},
+
+ // Euro
+ {Locale.forLanguageTag("en-AT"), -100, "-\u20ac\u00a0100,00"},
+ {Locale.forLanguageTag("en-AT-u-cf-standard"), -100, "-\u20ac\u00a0100,00"},
+ {Locale.forLanguageTag("en-AT-u-cf-account"), -100, "-\u20ac\u00a0100,00"},
+ {Locale.forLanguageTag("en-AT-u-cf-bogus"), -100, "-\u20ac\u00a0100,00"},
+
+ // Rupee
+ {Locale.forLanguageTag("en-IN"), -100, "-\u20b9\u00a0100.00"},
+ {Locale.forLanguageTag("en-IN-u-cf-standard"), -100, "-\u20b9\u00a0100.00"},
+ {Locale.forLanguageTag("en-IN-u-cf-account"), -100, "(\u20b9100.00)"},
+ {Locale.forLanguageTag("en-IN-u-cf-bogus"), -100, "-\u20b9\u00a0100.00"},
+
+ // Swiss franc
+ {Locale.forLanguageTag("en-CH"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-CH-u-cf-standard"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-CH-u-cf-account"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-CH-u-cf-bogus"), -100, "CHF-100.00"},
+
+ // Region override
+ {Locale.forLanguageTag("en-US-u-rg-CHZZZZ"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-US-u-rg-CHZZZZ-cf-standard"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-US-u-rg-CHZZZZ-cf-account"), -100, "CHF-100.00"},
+ {Locale.forLanguageTag("en-US-u-rg-CHZZZZ-cf-bogus"), -100, "CHF-100.00"},
+ };
+ }
+
+ @Test(dataProvider="getInstanceData")
+ public void test_getInstance(Locale locale, int amount, String expected) {
+ assertEquals(NumberFormat.getCurrencyInstance(locale).format(amount), expected);
+ }
+}
--- a/test/jdk/java/util/TimeZone/TimeZoneTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/util/TimeZone/TimeZoneTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -25,6 +25,7 @@
* @test
* @bug 4028006 4044013 4096694 4107276 4107570 4112869 4130885 7039469 7126465 7158483
* 8008577 8077685 8098547 8133321 8138716 8148446 8151876 8159684 8166875 8181157
+ * 8228469
* @modules java.base/sun.util.resources
* @library /java/text/testlib
* @summary test TimeZone
@@ -113,7 +114,7 @@
new ZoneDescriptor("PRT", -240, false),
new ZoneDescriptor("CNT", -210, true),
new ZoneDescriptor("AGT", -180, false),
- new ZoneDescriptor("BET", -180, true),
+ new ZoneDescriptor("BET", -180, false),
// new ZoneDescriptor("CAT", -60, false), // Wrong:
// As of bug 4130885, fix CAT (Central Africa)
new ZoneDescriptor("CAT", 120, false), // Africa/Harare
--- a/test/jdk/java/util/regex/RegExTest.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/java/util/regex/RegExTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -35,7 +35,7 @@
* 8027645 8035076 8039124 8035975 8074678 6854417 8143854 8147531 7071819
* 8151481 4867170 7080302 6728861 6995635 6736245 4916384 6328855 6192895
* 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
- * 8194667 8197462 8184692 8221431 8224789
+ * 8194667 8197462 8184692 8221431 8224789 8228352
*
* @library /test/lib
* @library /lib/testlibrary/java/lang
@@ -185,6 +185,7 @@
expoBacktracking();
invalidGroupName();
illegalRepetitionRange();
+ surrogatePairWithCanonEq();
if (failure) {
throw new
@@ -4973,4 +4974,14 @@
}
report("illegalRepetitionRange");
}
+
+ private static void surrogatePairWithCanonEq() {
+ try {
+ Pattern.compile("\ud834\udd21", Pattern.CANON_EQ);
+ } catch (Throwable t) {
+ failCount++;
+ System.out.println("Unexpected exception: " + t);
+ }
+ report("surrogatePairWithCanonEq");
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/util/zip/ZipFile/Zip64SizeTest.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @test
+ * @bug 8226530
+ * @summary ZIP File System tests that leverage DirectoryStream
+ * @modules java.base
+ * @compile Zip64SizeTest.java
+ * @run testng Zip64SizeTest
+ */
+public class Zip64SizeTest {
+
+ private static final int BUFFER_SIZE = 2048;
+ // ZIP file to create
+ private static final String ZIP_FILE_NAME = "Zip64SizeTest.zip";
+ // File that will be created with a size greater than 0xFFFFFFFF
+ private static final String LARGE_FILE_NAME = "LargeZipEntry.txt";
+ // File that will be created with a size less than 0xFFFFFFFF
+ private static final String SMALL_FILE_NAME = "SmallZipEntry.txt";
+ // List of files to be added to the ZIP file
+ private static final List<String> ZIP_ENTRIES = List.of(LARGE_FILE_NAME,
+ SMALL_FILE_NAME);
+ private static final long LARGE_FILE_SIZE = 5L * 1024L * 1024L * 1024L; // 5GB
+ private static final long SMALL_FILE_SIZE = 0x100000L; // 1024L x 1024L;
+
+ /**
+ * Validate that if the size of a ZIP entry exceeds 0xFFFFFFFF, that the
+ * correct size is returned from the ZIP64 Extended information.
+ * @throws IOException
+ */
+ @Test
+ private static void validateZipEntrySizes() throws IOException {
+ createFiles();
+ createZipFile();
+ System.out.println("Validating Zip Entry Sizes");
+ try (ZipFile zip = new ZipFile(ZIP_FILE_NAME)) {
+ ZipEntry ze = zip.getEntry(LARGE_FILE_NAME);
+ System.out.printf("Entry: %s, size= %s%n", ze.getName(), ze.getSize());
+ assertTrue(ze.getSize() == LARGE_FILE_SIZE);
+ ze = zip.getEntry(SMALL_FILE_NAME);
+ System.out.printf("Entry: %s, size= %s%n", ze.getName(), ze.getSize());
+ assertTrue(ze.getSize() == SMALL_FILE_SIZE);
+
+ }
+ }
+
+ /**
+ * Delete the files created for use by the test
+ * @throws IOException if an error occurs deleting the files
+ */
+ private static void deleteFiles() throws IOException {
+ Files.deleteIfExists(Path.of(ZIP_FILE_NAME));
+ Files.deleteIfExists(Path.of(LARGE_FILE_NAME));
+ Files.deleteIfExists(Path.of(SMALL_FILE_NAME));
+ }
+
+ /**
+ * Create the ZIP file adding an entry whose size exceeds 0xFFFFFFFF
+ * @throws IOException if an error occurs creating the ZIP File
+ */
+ private static void createZipFile() throws IOException {
+ try (FileOutputStream fos = new FileOutputStream(ZIP_FILE_NAME);
+ ZipOutputStream zos = new ZipOutputStream(fos)) {
+ System.out.printf("Creating Zip file: %s%n", ZIP_FILE_NAME);
+ for (String srcFile : ZIP_ENTRIES) {
+ System.out.printf("...Adding Entry: %s%n", srcFile);
+ File fileToZip = new File(srcFile);
+ try (FileInputStream fis = new FileInputStream(fileToZip)) {
+ ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
+ zipEntry.setSize(fileToZip.length());
+ zos.putNextEntry(zipEntry);
+ byte[] bytes = new byte[BUFFER_SIZE];
+ int length;
+ while ((length = fis.read(bytes)) >= 0) {
+ zos.write(bytes, 0, length);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Create the files that will be added to the ZIP file
+ * @throws IOException if there is a problem creating the files
+ */
+ private static void createFiles() throws IOException {
+ try (RandomAccessFile largeFile = new RandomAccessFile(LARGE_FILE_NAME, "rw");
+ RandomAccessFile smallFile = new RandomAccessFile(SMALL_FILE_NAME, "rw")) {
+ System.out.printf("Creating %s%n", LARGE_FILE_NAME);
+ largeFile.setLength(LARGE_FILE_SIZE);
+ System.out.printf("Creating %s%n", SMALL_FILE_NAME);
+ smallFile.setLength(SMALL_FILE_SIZE);
+ }
+ }
+
+ /**
+ * Make sure the needed test files do not exist prior to executing the test
+ * @throws IOException
+ */
+ @BeforeMethod
+ public void setUp() throws IOException {
+ deleteFiles();
+ }
+
+ /**
+ * Remove the files created for the test
+ * @throws IOException
+ */
+ @AfterMethod
+ public void tearDown() throws IOException {
+ deleteFiles();
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/nio/zipfs/TestPosix.java Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,725 @@
+/*
+ * Copyright (c) 2019, SAP SE. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.GroupPrincipal;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.nio.file.attribute.UserPrincipal;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.spi.ToolProvider;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.testng.annotations.Test;
+
+import static java.nio.file.attribute.PosixFilePermission.GROUP_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.GROUP_READ;
+import static java.nio.file.attribute.PosixFilePermission.GROUP_WRITE;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_READ;
+import static java.nio.file.attribute.PosixFilePermission.OTHERS_WRITE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_EXECUTE;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
+import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+/**
+ * @test
+ * @bug 8213031
+ * @modules jdk.zipfs
+ * jdk.jartool
+ * @run testng TestPosix
+ * @run testng/othervm/java.security.policy=test.policy.posix TestPosix
+ * @summary Test POSIX zip file operations.
+ */
+public class TestPosix {
+ private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
+ .orElseThrow(()->new RuntimeException("jar tool not found"));
+
+ // files and directories
+ private static final Path ZIP_FILE = Paths.get("testPosix.zip");
+ private static final Path JAR_FILE = Paths.get("testPosix.jar");
+ private static final Path ZIP_FILE_COPY = Paths.get("testPosixCopy.zip");
+ private static final Path UNZIP_DIR = Paths.get("unzip/");
+
+ // permission sets
+ private static final Set<PosixFilePermission> ALLPERMS =
+ PosixFilePermissions.fromString("rwxrwxrwx");
+ private static final Set<PosixFilePermission> EMPTYPERMS =
+ Collections.<PosixFilePermission>emptySet();
+ private static final Set<PosixFilePermission> UR = Set.of(OWNER_READ);
+ private static final Set<PosixFilePermission> UW = Set.of(OWNER_WRITE);
+ private static final Set<PosixFilePermission> UE = Set.of(OWNER_EXECUTE);
+ private static final Set<PosixFilePermission> GR = Set.of(GROUP_READ);
+ private static final Set<PosixFilePermission> GW = Set.of(GROUP_WRITE);
+ private static final Set<PosixFilePermission> GE = Set.of(GROUP_EXECUTE);
+ private static final Set<PosixFilePermission> OR = Set.of(OTHERS_READ);
+ private static final Set<PosixFilePermission> OW = Set.of(OTHERS_WRITE);
+ private static final Set<PosixFilePermission> OE = Set.of(OTHERS_EXECUTE);
+
+ // principals
+ private static final UserPrincipal DUMMY_USER = ()->"defusr";
+ private static final GroupPrincipal DUMMY_GROUP = ()->"defgrp";
+
+ // FS open options
+ private static final Map<String, Object> ENV_DEFAULT = Collections.<String, Object>emptyMap();
+ private static final Map<String, Object> ENV_POSIX = Map.of("enablePosixFileAttributes", true);
+
+ // misc
+ private static final CopyOption[] COPY_ATTRIBUTES = {StandardCopyOption.COPY_ATTRIBUTES};
+ private static final Map<String, ZipFileEntryInfo> ENTRIES = new HashMap<>();
+
+ private int entriesCreated;
+
+ static enum checkExpects {
+ contentOnly,
+ noPermDataInZip,
+ permsInZip,
+ permsPosix
+ }
+
+ static class ZipFileEntryInfo {
+ // permissions to set initially
+ private final Set<PosixFilePermission> intialPerms;
+ // permissions to set in a later call
+ private final Set<PosixFilePermission> laterPerms;
+ // permissions that should be effective in the zip file
+ private final Set<PosixFilePermission> permsInZip;
+ // permissions that should be returned by zipfs w/Posix support
+ private final Set<PosixFilePermission> permsPosix;
+ // entry is a directory
+ private final boolean isDir;
+ // need additional read flag in copy test
+ private final boolean setReadFlag;
+
+ private ZipFileEntryInfo(Set<PosixFilePermission> initialPerms, Set<PosixFilePermission> laterPerms,
+ Set<PosixFilePermission> permsInZip, Set<PosixFilePermission> permsZipPosix, boolean isDir, boolean setReadFlag)
+ {
+ this.intialPerms = initialPerms;
+ this.laterPerms = laterPerms;
+ this.permsInZip = permsInZip;
+ this.permsPosix = permsZipPosix;
+ this.isDir = isDir;
+ this.setReadFlag = setReadFlag;
+ }
+ }
+
+ static class CopyVisitor extends SimpleFileVisitor<Path> {
+ private Path from, to;
+ private boolean copyPerms;
+
+ CopyVisitor(Path from, Path to) {
+ this.from = from;
+ this.to = to;
+ }
+
+ CopyVisitor(Path from, Path to, boolean copyPerms) {
+ this.from = from;
+ this.to = to;
+ this.copyPerms = copyPerms;
+ }
+
+ @Override
+ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+ FileVisitResult rc = super.preVisitDirectory(dir, attrs);
+ Path target = to.resolve(from.relativize(dir).toString());
+ if (!Files.exists(target)) {
+ Files.copy(dir, target, COPY_ATTRIBUTES);
+ if (copyPerms) {
+ Files.setPosixFilePermissions(target, Files.getPosixFilePermissions(dir));
+ }
+ }
+ return rc;
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+ FileVisitResult rc = super.visitFile(file, attrs);
+ Path target = to.resolve(from.relativize(file).toString());
+ Files.copy(file, target, COPY_ATTRIBUTES);
+ if (copyPerms) {
+ Files.setPosixFilePermissions(target, Files.getPosixFilePermissions(file));
+ }
+ return rc;
+ }
+ }
+
+ static class DeleteVisitor extends SimpleFileVisitor<Path> {
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+ FileVisitResult rc = super.postVisitDirectory(dir, exc);
+ Files.delete(dir);
+ return rc;
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+ FileVisitResult rc = super.visitFile(file, attrs);
+ Files.delete(file);
+ return rc;
+ }
+ }
+
+ @FunctionalInterface
+ static interface Executor {
+ void doIt() throws IOException;
+ }
+
+ static {
+ ENTRIES.put("dir", new ZipFileEntryInfo(ALLPERMS, null, ALLPERMS, ALLPERMS, true, false));
+ ENTRIES.put("uread", new ZipFileEntryInfo(UR, null, UR, UR, false, false));
+ ENTRIES.put("uwrite", new ZipFileEntryInfo(UW, null, UW, UW, false, true));
+ ENTRIES.put("uexec", new ZipFileEntryInfo(UE, null, UE, UE, false, true));
+ ENTRIES.put("gread", new ZipFileEntryInfo(GR, null, GR, GR, false, true));
+ ENTRIES.put("gwrite", new ZipFileEntryInfo(GW, null, GW, GW, false, true));
+ ENTRIES.put("gexec", new ZipFileEntryInfo(GE, null, GE, GE, false, true));
+ ENTRIES.put("oread", new ZipFileEntryInfo(OR, null, OR, OR, false, true));
+ ENTRIES.put("owrite", new ZipFileEntryInfo(OW, null, OW, OW, false, true));
+ ENTRIES.put("oexec", new ZipFileEntryInfo(OE, null, OE, OE, false, true));
+ ENTRIES.put("emptyperms", new ZipFileEntryInfo(EMPTYPERMS, null, EMPTYPERMS, EMPTYPERMS, false, true));
+ ENTRIES.put("noperms", new ZipFileEntryInfo(null, null, null, ALLPERMS, false, false));
+ ENTRIES.put("permslater", new ZipFileEntryInfo(null, UR, UR, UR, false, false));
+ }
+
+ private static String expectedDefaultOwner(Path zf) {
+ try {
+ try {
+ PrivilegedExceptionAction<String> pa = ()->Files.getOwner(zf).getName();
+ return AccessController.doPrivileged(pa);
+ } catch (UnsupportedOperationException e) {
+ // if we can't get the owner of the file, we fall back to system property user.name
+ PrivilegedAction<String> pa = ()->System.getProperty("user.name");
+ return AccessController.doPrivileged(pa);
+ }
+ } catch (PrivilegedActionException | SecurityException e) {
+ System.out.println("Caught " + e.getClass().getName() + "(" + e.getMessage() +
+ ") when running a privileged operation to get the default owner.");
+ return null;
+ }
+ }
+
+ private static String expectedDefaultGroup(Path zf, String defaultOwner) {
+ try {
+ try {
+ PosixFileAttributeView zfpv = Files.getFileAttributeView(zf, PosixFileAttributeView.class);
+ if (zfpv == null) {
+ return defaultOwner;
+ }
+ PrivilegedExceptionAction<String> pa = ()->zfpv.readAttributes().group().getName();
+ return AccessController.doPrivileged(pa);
+ } catch (UnsupportedOperationException e) {
+ return defaultOwner;
+ }
+ } catch (PrivilegedActionException | SecurityException e) {
+ System.out.println("Caught an exception when running a privileged operation to get the default group.");
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private void putEntry(FileSystem fs, String name, ZipFileEntryInfo entry) throws IOException {
+ if (entry.isDir) {
+ if (entry.intialPerms == null) {
+ Files.createDirectory(fs.getPath(name));
+ } else {
+ Files.createDirectory(fs.getPath(name), PosixFilePermissions.asFileAttribute(entry.intialPerms));
+ }
+
+ } else {
+ if (entry.intialPerms == null) {
+ Files.createFile(fs.getPath(name));
+ } else {
+ Files.createFile(fs.getPath(name), PosixFilePermissions.asFileAttribute(entry.intialPerms));
+ }
+ }
+ if (entry.laterPerms != null) {
+ Files.setAttribute(fs.getPath(name), "zip:permissions", entry.laterPerms);
+ }
+ entriesCreated++;
+ }
+
+ private FileSystem createTestZipFile(Path zpath, Map<String, Object> env) throws IOException {
+ if (Files.exists(zpath)) {
+ System.out.println("Deleting old " + zpath + "...");
+ Files.delete(zpath);
+ }
+ System.out.println("Creating " + zpath + "...");
+ entriesCreated = 0;
+ var opts = new HashMap<String, Object>();
+ opts.putAll(env);
+ opts.put("create", true);
+ FileSystem fs = FileSystems.newFileSystem(zpath, opts);
+ for (String name : ENTRIES.keySet()) {
+ putEntry(fs, name, ENTRIES.get(name));
+ }
+ return fs;
+ }
+
+ private FileSystem createEmptyZipFile(Path zpath, Map<String, Object> env) throws IOException {
+ if (Files.exists(zpath)) {
+ System.out.println("Deleting old " + zpath + "...");
+ Files.delete(zpath);
+ }
+ System.out.println("Creating " + zpath + "...");
+ var opts = new HashMap<String, Object>();
+ opts.putAll(env);
+ opts.put("create", true);
+ return FileSystems.newFileSystem(zpath, opts);
+ }
+
+ private void delTree(Path p) throws IOException {
+ if (Files.exists(p)) {
+ Files.walkFileTree(p, new DeleteVisitor());
+ }
+ }
+
+ private void addOwnerRead(Path root) throws IOException {
+ for (String name : ENTRIES.keySet()) {
+ ZipFileEntryInfo ei = ENTRIES.get(name);
+ if (!ei.setReadFlag) {
+ continue;
+ }
+ Path setReadOn = root.resolve(name);
+ Set<PosixFilePermission> perms = Files.getPosixFilePermissions(setReadOn);
+ perms.add(OWNER_READ);
+ Files.setPosixFilePermissions(setReadOn, perms);
+ }
+ }
+
+ private void removeOwnerRead(Path root) throws IOException {
+ for (String name : ENTRIES.keySet()) {
+ ZipFileEntryInfo ei = ENTRIES.get(name);
+ if (!ei.setReadFlag) {
+ continue;
+ }
+ Path removeReadFrom = root.resolve(name);
+ Set<PosixFilePermission> perms = Files.getPosixFilePermissions(removeReadFrom);
+ perms.remove(OWNER_READ);
+ Files.setPosixFilePermissions(removeReadFrom, perms);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private void checkEntry(Path file, checkExpects expected) {
+ System.out.println("Checking " + file + "...");
+ String name = file.getFileName().toString();
+ ZipFileEntryInfo ei = ENTRIES.get(name);
+ assertNotNull(ei, "Found unknown entry " + name + ".");
+ BasicFileAttributes attrs = null;
+ if (expected == checkExpects.permsPosix) {
+ try {
+ attrs = Files.readAttributes(file, PosixFileAttributes.class);
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Caught IOException reading file attributes (posix) for " + name + ": " + e.getMessage());
+ }
+ } else {
+ try {
+ attrs = Files.readAttributes(file, BasicFileAttributes.class);
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Caught IOException reading file attributes (basic) " + name + ": " + e.getMessage());
+ }
+ }
+ assertEquals(Files.isDirectory(file), ei.isDir, "Unexpected directory attribute for:" + System.lineSeparator() + attrs);
+
+ if (expected == checkExpects.contentOnly) {
+ return;
+ }
+
+ Set<PosixFilePermission> permissions;
+ if (expected == checkExpects.permsPosix) {
+ try {
+ permissions = Files.getPosixFilePermissions(file);
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Caught IOException getting permission attribute for:" + System.lineSeparator() + attrs);
+ return;
+ }
+ comparePermissions(ei.permsPosix, permissions);
+ } else if (expected == checkExpects.permsInZip || expected == checkExpects.noPermDataInZip) {
+ try {
+ permissions = (Set<PosixFilePermission>)Files.getAttribute(file, "zip:permissions");
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail("Caught IOException getting permission attribute for:" + System.lineSeparator() + attrs);
+ return;
+ }
+ comparePermissions(expected == checkExpects.noPermDataInZip ? null : ei.permsInZip, permissions);
+ }
+ }
+
+ private void doCheckEntries(Path path, checkExpects expected) throws IOException {
+ AtomicInteger entries = new AtomicInteger();
+
+ try (DirectoryStream<Path> paths = Files.newDirectoryStream(path)) {
+ paths.forEach(file -> {
+ entries.getAndIncrement();
+ checkEntry(file, expected);
+ });
+ }
+ System.out.println("Number of entries: " + entries.get() + ".");
+ assertEquals(entries.get(), entriesCreated, "File contained wrong number of entries.");
+ }
+
+ private void checkEntries(FileSystem fs, checkExpects expected) throws IOException {
+ System.out.println("Checking permissions on file system " + fs + "...");
+ doCheckEntries(fs.getPath("/"), expected);
+ }
+
+ private void checkEntries(Path path, checkExpects expected) throws IOException {
+ System.out.println("Checking permissions on path " + path + "...");
+ doCheckEntries(path, expected);
+ }
+
+ private boolean throwsUOE(Executor e) throws IOException {
+ try {
+ e.doIt();
+ return false;
+ } catch (UnsupportedOperationException exc) {
+ return true;
+ }
+ }
+
+ private void comparePermissions(Set<PosixFilePermission> expected, Set<PosixFilePermission> actual) {
+ if (expected == null) {
+ assertNull(actual, "Permissions are not null");
+ } else {
+ assertNotNull(actual, "Permissions are null.");
+ assertEquals(actual.size(), expected.size(), "Unexpected number of permissions (" +
+ actual.size() + " received vs " + expected.size() + " expected).");
+ for (PosixFilePermission p : expected) {
+ assertTrue(actual.contains(p), "Posix permission " + p + " missing.");
+ }
+ }
+ }
+
+ /**
+ * This tests whether the entries in a zip file created w/o
+ * Posix support are correct.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testDefault() throws IOException {
+ // create zip file using zipfs with default options
+ createTestZipFile(ZIP_FILE, ENV_DEFAULT).close();
+ // check entries on zipfs with default options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_DEFAULT)) {
+ checkEntries(zip, checkExpects.permsInZip);
+ }
+ // check entries on zipfs with posix options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX)) {
+ checkEntries(zip, checkExpects.permsPosix);
+ }
+ }
+
+ /**
+ * This tests whether the entries in a zip file created w/
+ * Posix support are correct.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testPosix() throws IOException {
+ // create zip file using zipfs with posix option
+ createTestZipFile(ZIP_FILE, ENV_POSIX).close();
+ // check entries on zipfs with default options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_DEFAULT)) {
+ checkEntries(zip, checkExpects.permsInZip);
+ }
+ // check entries on zipfs with posix options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX)) {
+ checkEntries(zip, checkExpects.permsPosix);
+ }
+ }
+
+ /**
+ * This tests whether the entries in a zip file copied from another
+ * are correct.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testCopy() throws IOException {
+ // copy zip to zip with default options
+ try (FileSystem zipIn = createTestZipFile(ZIP_FILE, ENV_DEFAULT);
+ FileSystem zipOut = createEmptyZipFile(ZIP_FILE_COPY, ENV_DEFAULT)) {
+ Path from = zipIn.getPath("/");
+ Files.walkFileTree(from, new CopyVisitor(from, zipOut.getPath("/")));
+ }
+ // check entries on copied zipfs with default options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY, ENV_DEFAULT)) {
+ checkEntries(zip, checkExpects.permsInZip);
+ }
+ // check entries on copied zipfs with posix options
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY, ENV_POSIX)) {
+ checkEntries(zip, checkExpects.permsPosix);
+ }
+ }
+
+ /**
+ * This tests whether the entries of a zip file look correct after extraction
+ * and re-packing. When not using zipfs with Posix support, we expect the
+ * effective permissions in the resulting zip file to be empty.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testUnzipDefault() throws IOException {
+ delTree(UNZIP_DIR);
+ Files.createDirectory(UNZIP_DIR);
+
+ try (FileSystem srcZip = createTestZipFile(ZIP_FILE, ENV_DEFAULT)) {
+ Path from = srcZip.getPath("/");
+ Files.walkFileTree(from, new CopyVisitor(from, UNZIP_DIR));
+ }
+
+ // we just check that the entries got extracted to file system
+ checkEntries(UNZIP_DIR, checkExpects.contentOnly);
+
+ // the target zip file is opened with Posix support
+ // but we expect no permission data to be copied using the default copy method
+ try (FileSystem tgtZip = createEmptyZipFile(ZIP_FILE_COPY, ENV_POSIX)) {
+ Files.walkFileTree(UNZIP_DIR, new CopyVisitor(UNZIP_DIR, tgtZip.getPath("/")));
+ }
+
+ // check entries on copied zipfs - no permission data should exist
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY, ENV_DEFAULT)) {
+ checkEntries(zip, checkExpects.noPermDataInZip);
+ }
+ }
+
+ /**
+ * This tests whether the entries of a zip file look correct after extraction
+ * and re-packing. If the default file system supports Posix, we test whether we
+ * correctly carry the Posix permissions. Otherwise there's not much to test in
+ * this method.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testUnzipPosix() throws IOException {
+ delTree(UNZIP_DIR);
+ Files.createDirectory(UNZIP_DIR);
+
+ try {
+ Files.getPosixFilePermissions(UNZIP_DIR);
+ } catch (Exception e) {
+ // if we run into any exception here, be it because of the fact that the file system
+ // is not Posix or if we have insufficient security permissions, we can't do this test.
+ System.out.println("This can't be tested here because of " + e);
+ return;
+ }
+
+ try (FileSystem srcZip = createTestZipFile(ZIP_FILE, ENV_POSIX)) {
+ Path from = srcZip.getPath("/");
+ // copy permissions as well
+ Files.walkFileTree(from, new CopyVisitor(from, UNZIP_DIR, true));
+ }
+
+ // permissions should have been propagated to file system
+ checkEntries(UNZIP_DIR, checkExpects.permsPosix);
+
+ try (FileSystem tgtZip = createEmptyZipFile(ZIP_FILE_COPY, ENV_POSIX)) {
+ // Make some files owner readable to be able to copy them into the zipfs
+ addOwnerRead(UNZIP_DIR);
+
+ // copy permissions as well
+ Files.walkFileTree(UNZIP_DIR, new CopyVisitor(UNZIP_DIR, tgtZip.getPath("/"), true));
+
+ // Fix back all the files in the target zip file which have been made readable before
+ removeOwnerRead(tgtZip.getPath("/"));
+ }
+
+ // check entries on copied zipfs - permission data should have been propagated
+ try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE_COPY, ENV_POSIX)) {
+ checkEntries(zip, checkExpects.permsPosix);
+ }
+ }
+
+ /**
+ * Tests POSIX default behavior.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testPosixDefaults() throws IOException {
+ // test with posix = false, expect UnsupportedOperationException
+ try (FileSystem zipIn = createTestZipFile(ZIP_FILE, ENV_DEFAULT)) {
+ var entry = zipIn.getPath("/dir");
+ assertTrue(throwsUOE(()->Files.getPosixFilePermissions(entry)));
+ assertTrue(throwsUOE(()->Files.setPosixFilePermissions(entry, UW)));
+ assertTrue(throwsUOE(()->Files.getOwner(entry)));
+ assertTrue(throwsUOE(()->Files.setOwner(entry, DUMMY_USER)));
+ assertTrue(throwsUOE(()->Files.getFileAttributeView(entry, PosixFileAttributeView.class)));
+ }
+
+ // test with posix = true -> default values
+ try (FileSystem zipIn = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX)) {
+ String defaultOwner = expectedDefaultOwner(ZIP_FILE);
+ String defaultGroup = expectedDefaultGroup(ZIP_FILE, defaultOwner);
+ var entry = zipIn.getPath("/noperms");
+ comparePermissions(ALLPERMS, Files.getPosixFilePermissions(entry));
+ var owner = Files.getOwner(entry);
+ assertNotNull(owner, "owner should not be null");
+ if (defaultOwner != null) {
+ assertEquals(owner.getName(), defaultOwner);
+ }
+ Files.setOwner(entry, DUMMY_USER);
+ assertEquals(Files.getOwner(entry), DUMMY_USER);
+ var view = Files.getFileAttributeView(entry, PosixFileAttributeView.class);
+ var group = view.readAttributes().group();
+ assertNotNull(group, "group must not be null");
+ if (defaultGroup != null) {
+ assertEquals(group.getName(), defaultGroup);
+ }
+ view.setGroup(DUMMY_GROUP);
+ assertEquals(view.readAttributes().group(), DUMMY_GROUP);
+ entry = zipIn.getPath("/uexec");
+ Files.setPosixFilePermissions(entry, GR); // will be persisted
+ comparePermissions(GR, Files.getPosixFilePermissions(entry));
+ }
+
+ // test with posix = true + custom defaults of type String
+ try (FileSystem zipIn = FileSystems.newFileSystem(ZIP_FILE, Map.of("enablePosixFileAttributes", true,
+ "defaultOwner", "auser", "defaultGroup", "agroup", "defaultPermissions", "r--------")))
+ {
+ var entry = zipIn.getPath("/noperms");
+ comparePermissions(UR, Files.getPosixFilePermissions(entry));
+ assertEquals(Files.getOwner(entry).getName(), "auser");
+ var view = Files.getFileAttributeView(entry, PosixFileAttributeView.class);
+ assertEquals(view.readAttributes().group().getName(), "agroup");
+ // check if the change to permissions of /uexec was persisted
+ comparePermissions(GR, Files.getPosixFilePermissions(zipIn.getPath("/uexec")));
+ }
+
+ // test with posix = true + custom defaults as Objects
+ try (FileSystem zipIn = FileSystems.newFileSystem(ZIP_FILE, Map.of("enablePosixFileAttributes", true,
+ "defaultOwner", DUMMY_USER, "defaultGroup", DUMMY_GROUP, "defaultPermissions", UR)))
+ {
+ var entry = zipIn.getPath("/noperms");
+ comparePermissions(UR, Files.getPosixFilePermissions(entry));
+ assertEquals(Files.getOwner(entry), DUMMY_USER);
+ var view = Files.getFileAttributeView(entry, PosixFileAttributeView.class);
+ assertEquals(view.readAttributes().group(), DUMMY_GROUP);
+ }
+ }
+
+ /**
+ * Sanity check to test whether the zip file can be unzipped with the java.util.zip API.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testUnzipWithJavaUtilZip() throws IOException {
+ createTestZipFile(ZIP_FILE, ENV_DEFAULT).close();
+ delTree(UNZIP_DIR);
+ Files.createDirectory(UNZIP_DIR);
+ File targetDir = UNZIP_DIR.toFile();
+ try (ZipFile zf = new ZipFile(ZIP_FILE.toFile())) {
+ Enumeration<? extends ZipEntry> zenum = zf.entries();
+ while (zenum.hasMoreElements()) {
+ ZipEntry ze = zenum.nextElement();
+ File target = new File(targetDir + File.separator + ze.getName());
+ if (ze.isDirectory()) {
+ target.mkdir();
+ continue;
+ }
+ try (InputStream is = zf.getInputStream(ze);
+ FileOutputStream fos = new FileOutputStream(target))
+ {
+ while (is.available() > 0) {
+ fos.write(is.read());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Sanity check to test whether a jar file created with zipfs can be
+ * extracted with the java.util.jar API.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testJarFile() throws IOException {
+ // create jar file using zipfs with default options
+ createTestZipFile(JAR_FILE, ENV_DEFAULT).close();
+
+ // extract it using java.util.jar.JarFile
+ delTree(UNZIP_DIR);
+ Files.createDirectory(UNZIP_DIR);
+ File targetDir = UNZIP_DIR.toFile();
+ try (JarFile jf = new JarFile(ZIP_FILE.toFile())) {
+ Enumeration<? extends JarEntry> zenum = jf.entries();
+ while (zenum.hasMoreElements()) {
+ JarEntry ze = zenum.nextElement();
+ File target = new File(targetDir + File.separator + ze.getName());
+ if (ze.isDirectory()) {
+ target.mkdir();
+ continue;
+ }
+ try (InputStream is = jf.getInputStream(ze);
+ FileOutputStream fos = new FileOutputStream(target))
+ {
+ while (is.available() > 0) {
+ fos.write(is.read());
+ }
+ }
+ }
+ }
+
+ // extract it using the jar tool
+ delTree(UNZIP_DIR);
+ System.out.println("jar xvf " + JAR_FILE);
+
+ // the run method catches IOExceptions, we need to expose them
+ int rc = JAR_TOOL.run(System.out, System.err, "xvf", JAR_FILE.toString());
+ assertEquals(rc, 0, "Return code of jar call is " + rc + " but expected 0");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/nio/zipfs/test.policy.posix Thu Aug 08 17:27:17 2019 -0400
@@ -0,0 +1,8 @@
+grant {
+ permission java.io.FilePermission "<<ALL FILES>>","read,write,delete";
+ permission java.util.PropertyPermission "sun.tools.jar.useExtractionTime","read";
+ permission java.util.PropertyPermission "test.jdk","read";
+ permission java.util.PropertyPermission "test.src","read";
+ permission java.util.PropertyPermission "user.dir","read";
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.module";
+};
--- a/test/jdk/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/jdk/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -40,47 +40,33 @@
private static HotspotRuntimeMBean mbean =
(HotspotRuntimeMBean)ManagementFactoryHelper.getHotspotRuntimeMBean();
- private static final long NUM_THREAD_DUMPS = 100;
-
// Careful with these values.
private static final long MIN_VALUE_FOR_PASS = 1;
- private static final long MAX_VALUE_FOR_PASS = Long.MAX_VALUE;
- private static boolean trace = false;
+ // Thread.getAllStackTraces() should cause safepoints.
+ // If this test is failing because it doesn't,
+ // MIN_VALUE_FOR_PASS should be reset to 0
+ public static long executeThreadDumps(long initial_value) {
+ long value;
+ do {
+ Thread.getAllStackTraces();
+ value = mbean.getTotalSafepointTime();
+ } while (value == initial_value);
+ return value;
+ }
public static void main(String args[]) throws Exception {
- if (args.length > 0 && args[0].equals("trace")) {
- trace = true;
- }
+ long value = executeThreadDumps(0);
+ System.out.println("Total safepoint time (ms): " + value);
- // Thread.getAllStackTraces() should cause safepoints.
- // If this test is failing because it doesn't,
- // MIN_VALUE_FOR_PASS should be reset to 0
- for (int i = 0; i < NUM_THREAD_DUMPS; i++) {
- Thread.getAllStackTraces();
+ if (value < MIN_VALUE_FOR_PASS) {
+ throw new RuntimeException("Total safepoint time " +
+ "illegal value: " + value + " ms " +
+ "(MIN = " + MIN_VALUE_FOR_PASS + ")");
}
- long value = mbean.getTotalSafepointTime();
-
- if (trace) {
- System.out.println("Total safepoint time (ms): " + value);
- }
-
- if (value < MIN_VALUE_FOR_PASS || value > MAX_VALUE_FOR_PASS) {
- throw new RuntimeException("Total safepoint time " +
- "illegal value: " + value + " ms " +
- "(MIN = " + MIN_VALUE_FOR_PASS + "; " +
- "MAX = " + MAX_VALUE_FOR_PASS + ")");
- }
-
- for (int i = 0; i < 2 * NUM_THREAD_DUMPS; i++) {
- Thread.getAllStackTraces();
- }
- long value2 = mbean.getTotalSafepointTime();
-
- if (trace) {
- System.out.println("Total safepoint time2 (ms): " + value2);
- }
+ long value2 = executeThreadDumps(value);
+ System.out.println("Total safepoint time (ms): " + value2);
if (value2 <= value) {
throw new RuntimeException("Total safepoint time " +
--- a/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/package-list Thu Aug 08 17:23:13 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/JavascriptWinTitle/package-list Thu Aug 08 17:27:17 2019 -0400
@@ -30,7 +30,6 @@
java.rmi.registry
java.rmi.server
java.security
-java.security.acl
java.security.cert
java.security.interfaces
java.security.spec
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/jdk/package-list Thu Aug 08 17:23:13 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/jdk/package-list Thu Aug 08 17:27:17 2019 -0400
@@ -30,7 +30,6 @@
java.rmi.registry
java.rmi.server
java.security
-java.security.acl
java.security.cert
java.security.interfaces
java.security.spec
--- a/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list Thu Aug 08 17:23:13 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testModules/jdk/element-list Thu Aug 08 17:27:17 2019 -0400
@@ -20,7 +20,6 @@
java.nio.file.attribute
java.nio.file.spi
java.security
-java.security.acl
java.security.cert
java.security.interfaces
java.security.spec
--- a/test/lib/jdk/test/lib/process/ProcessTools.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java Thu Aug 08 17:27:17 2019 -0400
@@ -360,7 +360,7 @@
* @return The {@linkplain OutputAnalyzer} instance wrapping the process.
*/
public static OutputAnalyzer executeProcess(ProcessBuilder pb, String input) throws Exception {
- return executeProcess(pb, null, null);
+ return executeProcess(pb, input, null);
}
/**
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -40,7 +40,7 @@
public class AESGCMBench extends CryptoBase {
- @Param({"AES/GCM/NoPadding","AES/GCM/PKCS5Padding"})
+ @Param({"AES/GCM/NoPadding"})
private String algorithm;
@Param({"128"})
--- a/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java Thu Aug 08 17:23:13 2019 -0400
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java Thu Aug 08 17:27:17 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -122,7 +122,7 @@
@Param({"GCM"})
private String mode;
- @Param({"NoPadding", "PKCS5Padding"})
+ @Param({"NoPadding"})
private String padding;
@Param({"128", "256"})