--- a/.hgtags Wed Sep 26 18:11:00 2018 +0100
+++ b/.hgtags Mon Oct 01 09:56:45 2018 +0100
@@ -513,3 +513,4 @@
8f594f75e0547d4ca16649cb3501659e3155e81b jdk-12+10
f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12
+511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13
--- a/make/autoconf/hotspot.m4 Wed Sep 26 18:11:00 2018 +0100
+++ b/make/autoconf/hotspot.m4 Mon Oct 01 09:56:45 2018 +0100
@@ -351,6 +351,11 @@
AC_MSG_RESULT([no])
fi
+ # Disable unsupported GCs for Zero
+ if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+ DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc"
+ fi
+
# Turn on additional features based on other parts of configure
if test "x$INCLUDE_DTRACE" = "xtrue"; then
JVM_FEATURES="$JVM_FEATURES dtrace"
--- a/make/conf/jib-profiles.js Wed Sep 26 18:11:00 2018 +0100
+++ b/make/conf/jib-profiles.js Mon Oct 01 09:56:45 2018 +0100
@@ -840,7 +840,7 @@
linux_x64: "gcc7.3.0-OEL6.4+1.0",
macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
solaris_x64: "SS12u4-Solaris11u1+1.0",
- solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
+ solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.5.5+1.0",
linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
--- a/make/devkit/createSolarisDevkit12.6.sh Wed Sep 26 18:11:00 2018 +0100
+++ b/make/devkit/createSolarisDevkit12.6.sh Mon Oct 01 09:56:45 2018 +0100
@@ -34,18 +34,19 @@
# install in a separate temporary image.
#
# The Solaris Studio installation must contain at least these packages:
-# developer/developerstudio-126/backend 12.6-1.0.0.0 i--
-# developer/developerstudio-126/c++ 12.6-1.0.0.0 i--
-# developer/developerstudio-126/cc 12.6-1.0.0.0 i--
-# developer/developerstudio-126/dbx (solarisstudio) 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/c++-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/math-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/c-libs 12.6-1.0.0.0 i--
-# developer/developerstudio-126/library/studio-gccrt 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-common 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-ja 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-legal 12.6-1.0.0.0 i--
-# developer/developerstudio-126/studio-zhCN 12.6-1.0.0.0 i--
+#developer/developerstudio-126/backend 12.6-1.0.0.1
+#developer/developerstudio-126/c++ 12.6-1.0.2.0
+#developer/developerstudio-126/cc 12.6-1.0.1.0
+#developer/developerstudio-126/dbx 12.6-1.0.0.1
+#developer/developerstudio-126/library/c++-libs 12.6-1.0.2.0
+#developer/developerstudio-126/library/c-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/f90-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/math-libs 12.6-1.0.0.1
+#developer/developerstudio-126/library/studio-gccrt 12.6-1.0.0.1
+#developer/developerstudio-126/studio-common 12.6-1.0.0.1
+#developer/developerstudio-126/studio-ja 12.6-1.0.0.1
+#developer/developerstudio-126/studio-legal 12.6-1.0.0.1
+#developer/developerstudio-126/studio-zhCN 12.6-1.0.0.1
#
# erik.joelsson@oracle.com
@@ -93,7 +94,7 @@
pkg -R $INSTALL_ROOT set-publisher -P -g ${PUBLISHER_URI} solaris
sudo pkg -R $INSTALL_ROOT install --accept entire@$SOLARIS_ENTIRE_VERSION \
system/install developer/gnu-binutils system/library/mmheap system/picl \
- developer/assembler
+ developer/assembler system/library/freetype-2
else
echo "Skipping installing packages"
fi
--- a/make/lib/CoreLibraries.gmk Wed Sep 26 18:11:00 2018 +0100
+++ b/make/lib/CoreLibraries.gmk Mon Oct 01 09:56:45 2018 +0100
@@ -244,7 +244,7 @@
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
OPTIMIZATION := HIGH, \
- CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
+ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \
ARFLAGS := $(ARFLAGS), \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))
--- a/src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessor.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessor.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,3 +1,34 @@
+/*
+ *
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package java2d;
import java.awt.Color;
--- a/src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessorImplBase.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessorImplBase.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,3 +1,34 @@
+/*
+ *
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
package java2d;
import java.awt.Color;
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -870,8 +870,8 @@
case doubleTag: do_ArithmeticOp_FPU(x); return;
case longTag: do_ArithmeticOp_Long(x); return;
case intTag: do_ArithmeticOp_Int(x); return;
+ default: ShouldNotReachHere(); return;
}
- ShouldNotReachHere();
}
--- a/src/hotspot/cpu/arm/templateTable_arm.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -2996,6 +2996,7 @@
switch (code) {
case Bytecodes::_nofast_getfield: code = Bytecodes::_getfield; break;
case Bytecodes::_nofast_putfield: code = Bytecodes::_putfield; break;
+ default: break;
}
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -2403,8 +2403,9 @@
if (UseAVX > 2 && !VM_Version::supports_avx512vl()) {
assert(tmp->is_valid(), "need temporary");
__ vpandn(dest->as_xmm_double_reg(), tmp->as_xmm_double_reg(), value->as_xmm_double_reg(), 2);
- } else {
+ } else
#endif
+ {
if (dest->as_xmm_double_reg() != value->as_xmm_double_reg()) {
__ movdbl(dest->as_xmm_double_reg(), value->as_xmm_double_reg());
}
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -131,7 +131,8 @@
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();
+ case T_INT: slow_case_addr = jni_GetIntField_addr(); break;
+ default: ShouldNotReachHere();
}
// tail call
__ jump (ExternalAddress(slow_case_addr));
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -87,8 +87,8 @@
case T_INT: inc_counter_np(SharedRuntime::_jint_array_copy_ctr); return;
case T_LONG: inc_counter_np(SharedRuntime::_jlong_array_copy_ctr); return;
case T_OBJECT: inc_counter_np(SharedRuntime::_oop_array_copy_ctr); return;
+ default: ShouldNotReachHere();
}
- ShouldNotReachHere();
#endif //PRODUCT
}
--- a/src/hotspot/os/linux/os_linux.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/os/linux/os_linux.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -1877,12 +1877,16 @@
return (void*)::dlopen(NULL, RTLD_LAZY);
}
-static bool _print_ascii_file(const char* filename, outputStream* st) {
+static bool _print_ascii_file(const char* filename, outputStream* st, const char* hdr = NULL) {
int fd = ::open(filename, O_RDONLY);
if (fd == -1) {
return false;
}
+ if (hdr != NULL) {
+ st->print_cr("%s", hdr);
+ }
+
char buf[33];
int bytes;
buf[32] = '\0';
@@ -1975,6 +1979,8 @@
os::Linux::print_proc_sys_info(st);
+ os::Linux::print_ld_preload_file(st);
+
os::Linux::print_container_info(st);
}
@@ -2133,6 +2139,11 @@
st->cr();
}
+void os::Linux::print_ld_preload_file(outputStream* st) {
+ _print_ascii_file("/etc/ld.so.preload", st, "\n/etc/ld.so.preload:");
+ st->cr();
+}
+
void os::Linux::print_container_info(outputStream* st) {
if (!OSContainer::is_containerized()) {
return;
--- a/src/hotspot/os/linux/os_linux.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/os/linux/os_linux.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -114,6 +114,7 @@
static void print_distro_info(outputStream* st);
static void print_libversion_info(outputStream* st);
static void print_proc_sys_info(outputStream* st);
+ static void print_ld_preload_file(outputStream* st);
public:
static bool _stack_is_executable;
--- a/src/hotspot/share/classfile/classLoaderData.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -47,11 +47,10 @@
// the singleton class the_null_class_loader_data().
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.hpp"
-#include "classfile/metadataOnStackMark.hpp"
#include "classfile/moduleEntry.hpp"
#include "classfile/packageEntry.hpp"
#include "classfile/symbolTable.hpp"
@@ -60,9 +59,7 @@
#include "logging/logStream.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/metadataFactory.hpp"
-#include "memory/metaspaceShared.hpp"
#include "memory/resourceArea.hpp"
-#include "memory/universe.hpp"
#include "oops/access.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/oopHandle.inline.hpp"
@@ -72,14 +69,10 @@
#include "runtime/mutex.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/safepoint.hpp"
-#include "runtime/safepointVerifiers.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
-volatile size_t ClassLoaderDataGraph::_num_array_classes = 0;
-volatile size_t ClassLoaderDataGraph::_num_instance_classes = 0;
-
ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL;
void ClassLoaderData::init_null_class_loader_data() {
@@ -345,6 +338,11 @@
for (Klass* k = OrderAccess::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
// Do not filter ArrayKlass oops here...
if (k->is_array_klass() || (k->is_instance_klass() && InstanceKlass::cast(k)->is_loaded())) {
+#ifdef ASSERT
+ oop m = k->java_mirror();
+ assert(m != NULL, "NULL mirror");
+ assert(m->is_a(SystemDictionary::Class_klass()), "invalid mirror");
+#endif
klass_closure->do_klass(k);
}
}
@@ -444,13 +442,6 @@
}
}
-
-void ClassLoaderDataGraph::clear_claimed_marks() {
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
- cld->clear_claimed();
- }
-}
-
void ClassLoaderData::add_class(Klass* k, bool publicize /* true */) {
{
MutexLockerEx ml(metaspace_lock(), Mutex::_no_safepoint_check_flag);
@@ -478,78 +469,6 @@
}
}
-// Class iterator used by the compiler. It gets some number of classes at
-// a safepoint to decay invocation counters on the methods.
-class ClassLoaderDataGraphKlassIteratorStatic {
- ClassLoaderData* _current_loader_data;
- Klass* _current_class_entry;
- public:
-
- ClassLoaderDataGraphKlassIteratorStatic() : _current_loader_data(NULL), _current_class_entry(NULL) {}
-
- InstanceKlass* try_get_next_class() {
- assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
- size_t max_classes = ClassLoaderDataGraph::num_instance_classes();
- assert(max_classes > 0, "should not be called with no instance classes");
- for (size_t i = 0; i < max_classes; ) {
-
- if (_current_class_entry != NULL) {
- Klass* k = _current_class_entry;
- _current_class_entry = _current_class_entry->next_link();
-
- if (k->is_instance_klass()) {
- InstanceKlass* ik = InstanceKlass::cast(k);
- i++; // count all instance classes found
- // Not yet loaded classes are counted in max_classes
- // but only return loaded classes.
- if (ik->is_loaded()) {
- return ik;
- }
- }
- } else {
- // Go to next CLD
- if (_current_loader_data != NULL) {
- _current_loader_data = _current_loader_data->next();
- }
- // Start at the beginning
- if (_current_loader_data == NULL) {
- _current_loader_data = ClassLoaderDataGraph::_head;
- }
-
- _current_class_entry = _current_loader_data->klasses();
- }
- }
- // Should never be reached unless all instance classes have failed or are not fully loaded.
- // Caller handles NULL.
- return NULL;
- }
-
- // If the current class for the static iterator is a class being unloaded or
- // deallocated, adjust the current class.
- void adjust_saved_class(ClassLoaderData* cld) {
- if (_current_loader_data == cld) {
- _current_loader_data = cld->next();
- if (_current_loader_data != NULL) {
- _current_class_entry = _current_loader_data->klasses();
- } // else try_get_next_class will start at the head
- }
- }
-
- void adjust_saved_class(Klass* klass) {
- if (_current_class_entry == klass) {
- _current_class_entry = klass->next_link();
- }
- }
-};
-
-static ClassLoaderDataGraphKlassIteratorStatic static_klass_iterator;
-
-InstanceKlass* ClassLoaderDataGraph::try_get_next_class() {
- assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
- return static_klass_iterator.try_get_next_class();
-}
-
-
void ClassLoaderData::initialize_holder(Handle loader_or_mirror) {
if (loader_or_mirror() != NULL) {
assert(_holder.is_null(), "never replace holders");
@@ -563,7 +482,7 @@
assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
// Adjust global class iterator.
- static_klass_iterator.adjust_saved_class(scratch_class);
+ ClassLoaderDataGraph::adjust_saved_class(scratch_class);
Klass* prev = NULL;
for (Klass* k = _klasses; k != NULL; k = k->next_link()) {
@@ -605,12 +524,13 @@
// if they are not already on the _klasses list.
free_deallocate_list_C_heap_structures();
- // Tell serviceability tools these classes are unloading
+ // Clean up class dependencies and tell serviceability tools
+ // these classes are unloading. Must be called
// after erroneous classes are released.
- classes_do(InstanceKlass::notify_unload_class);
+ classes_do(InstanceKlass::unload_class);
// Clean up global class iterator for compiler
- static_klass_iterator.adjust_saved_class(this);
+ ClassLoaderDataGraph::adjust_saved_class(this);
}
ModuleEntryTable* ClassLoaderData::modules() {
@@ -913,41 +833,6 @@
}
}
-void ClassLoaderDataGraph::clean_deallocate_lists(bool walk_previous_versions) {
- assert(SafepointSynchronize::is_at_safepoint(), "must only be called at safepoint");
- uint loaders_processed = 0;
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
- // is_alive check will be necessary for concurrent class unloading.
- if (cld->is_alive()) {
- // clean metaspace
- if (walk_previous_versions) {
- cld->classes_do(InstanceKlass::purge_previous_versions);
- }
- cld->free_deallocate_list();
- loaders_processed++;
- }
- }
- log_debug(class, loader, data)("clean_deallocate_lists: loaders processed %u %s",
- loaders_processed, walk_previous_versions ? "walk_previous_versions" : "");
-}
-
-void ClassLoaderDataGraph::walk_metadata_and_clean_metaspaces() {
- assert(SafepointSynchronize::is_at_safepoint(), "must only be called at safepoint");
-
- _should_clean_deallocate_lists = false; // assume everything gets cleaned
-
- // Mark metadata seen on the stack so we can delete unreferenced entries.
- // Walk all metadata, including the expensive code cache walk, only for class redefinition.
- // The MetadataOnStackMark walk during redefinition saves previous versions if it finds old methods
- // on the stack or in the code cache, so we only have to repeat the full walk if
- // they were found at that time.
- // TODO: have redefinition clean old methods out of the code cache. They still exist in some places.
- bool walk_all_metadata = InstanceKlass::has_previous_versions_and_reset();
-
- MetadataOnStackMark md_on_stack(walk_all_metadata);
- clean_deallocate_lists(walk_all_metadata);
-}
-
// This is distinct from free_deallocate_list. For class loader data that are
// unloading, this frees the C heap memory for items on the list, and unlinks
// scratch or error classes so that unloading events aren't triggered for these
@@ -1069,523 +954,3 @@
}
return false;
}
-
-
-// GC root of class loader data created.
-ClassLoaderData* ClassLoaderDataGraph::_head = NULL;
-ClassLoaderData* ClassLoaderDataGraph::_unloading = NULL;
-ClassLoaderData* ClassLoaderDataGraph::_saved_unloading = NULL;
-ClassLoaderData* ClassLoaderDataGraph::_saved_head = NULL;
-
-bool ClassLoaderDataGraph::_should_purge = false;
-bool ClassLoaderDataGraph::_should_clean_deallocate_lists = false;
-bool ClassLoaderDataGraph::_safepoint_cleanup_needed = false;
-bool ClassLoaderDataGraph::_metaspace_oom = false;
-
-// Add a new class loader data node to the list. Assign the newly created
-// ClassLoaderData into the java/lang/ClassLoader object as a hidden field
-ClassLoaderData* ClassLoaderDataGraph::add_to_graph(Handle loader, bool is_unsafe_anonymous) {
-
- assert_lock_strong(ClassLoaderDataGraph_lock);
-
- ClassLoaderData* cld;
-
- // First check if another thread beat us to creating the CLD and installing
- // it into the loader while we were waiting for the lock.
- if (!is_unsafe_anonymous && loader.not_null()) {
- cld = java_lang_ClassLoader::loader_data_acquire(loader());
- if (cld != NULL) {
- return cld;
- }
- }
-
- // We mustn't GC until we've installed the ClassLoaderData in the Graph since the CLD
- // contains oops in _handles that must be walked. GC doesn't walk CLD from the
- // loader oop in all collections, particularly young collections.
- NoSafepointVerifier no_safepoints;
-
- cld = new ClassLoaderData(loader, is_unsafe_anonymous);
-
- // First install the new CLD to the Graph.
- cld->set_next(_head);
- _head = cld;
-
- // Next associate with the class_loader.
- if (!is_unsafe_anonymous) {
- // Use OrderAccess, since readers need to get the loader_data only after
- // it's added to the Graph
- java_lang_ClassLoader::release_set_loader_data(loader(), cld);
- }
-
- // Lastly log, if requested
- LogTarget(Trace, class, loader, data) lt;
- if (lt.is_enabled()) {
- ResourceMark rm;
- LogStream ls(lt);
- ls.print("create ");
- cld->print_value_on(&ls);
- ls.cr();
- }
- return cld;
-}
-
-ClassLoaderData* ClassLoaderDataGraph::add(Handle loader, bool is_unsafe_anonymous) {
- MutexLocker ml(ClassLoaderDataGraph_lock);
- ClassLoaderData* loader_data = add_to_graph(loader, is_unsafe_anonymous);
- return loader_data;
-}
-
-void ClassLoaderDataGraph::cld_do(CLDClosure* cl) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->_next) {
- cl->do_cld(cld);
- }
-}
-
-void ClassLoaderDataGraph::cld_unloading_do(CLDClosure* cl) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- // Only walk the head until any clds not purged from prior unloading
- // (CMS doesn't purge right away).
- for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
- assert(cld->is_unloading(), "invariant");
- cl->do_cld(cld);
- }
-}
-
-void ClassLoaderDataGraph::roots_cld_do(CLDClosure* strong, CLDClosure* weak) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->_next) {
- CLDClosure* closure = cld->keep_alive() ? strong : weak;
- if (closure != NULL) {
- closure->do_cld(cld);
- }
- }
-}
-
-void ClassLoaderDataGraph::always_strong_cld_do(CLDClosure* cl) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- if (ClassUnloading) {
- roots_cld_do(cl, NULL);
- } else {
- cld_do(cl);
- }
-}
-
-// Closure for locking and iterating through classes.
-LockedClassesDo::LockedClassesDo(classes_do_func_t f) : _function(f) {
- ClassLoaderDataGraph_lock->lock();
-}
-
-LockedClassesDo::LockedClassesDo() : _function(NULL) {
- // callers provide their own do_klass
- ClassLoaderDataGraph_lock->lock();
-}
-
-LockedClassesDo::~LockedClassesDo() { ClassLoaderDataGraph_lock->unlock(); }
-
-
-// Iterating over the CLDG needs to be locked because
-// unloading can remove entries concurrently soon.
-class ClassLoaderDataGraphIterator : public StackObj {
- ClassLoaderData* _next;
- HandleMark _hm; // clean up handles when this is done.
- Handle _holder;
- Thread* _thread;
-
- void hold_next() {
- if (_next != NULL) {
- _holder = Handle(_thread, _next->holder_phantom());
- }
- }
-public:
- ClassLoaderDataGraphIterator() : _next(ClassLoaderDataGraph::_head) {
- _thread = Thread::current();
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- hold_next();
- }
-
- bool repeat() const {
- return _next != NULL;
- }
-
- ClassLoaderData* get_next() {
- ClassLoaderData* next = _next;
- if (_next != NULL) {
- _next = _next->next();
- hold_next();
- }
- return next;
- }
-};
-
-// These functions assume that the caller has locked the ClassLoaderDataGraph_lock
-// if they are not calling the function from a safepoint.
-void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->classes_do(klass_closure);
- }
-}
-
-void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->classes_do(f);
- }
-}
-
-void ClassLoaderDataGraph::methods_do(void f(Method*)) {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->methods_do(f);
- }
-}
-
-void ClassLoaderDataGraph::modules_do(void f(ModuleEntry*)) {
- assert_locked_or_safepoint(Module_lock);
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->modules_do(f);
- }
-}
-
-void ClassLoaderDataGraph::modules_unloading_do(void f(ModuleEntry*)) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- // Only walk the head until any clds not purged from prior unloading
- // (CMS doesn't purge right away).
- for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
- assert(cld->is_unloading(), "invariant");
- cld->modules_do(f);
- }
-}
-
-void ClassLoaderDataGraph::packages_do(void f(PackageEntry*)) {
- assert_locked_or_safepoint(Module_lock);
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->packages_do(f);
- }
-}
-
-void ClassLoaderDataGraph::packages_unloading_do(void f(PackageEntry*)) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- // Only walk the head until any clds not purged from prior unloading
- // (CMS doesn't purge right away).
- for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
- assert(cld->is_unloading(), "invariant");
- cld->packages_do(f);
- }
-}
-
-void ClassLoaderDataGraph::loaded_classes_do(KlassClosure* klass_closure) {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->loaded_classes_do(klass_closure);
- }
-}
-
-// This case can block but cannot do unloading (called from CDS)
-void ClassLoaderDataGraph::unlocked_loaded_classes_do(KlassClosure* klass_closure) {
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
- cld->loaded_classes_do(klass_closure);
- }
-}
-
-
-void ClassLoaderDataGraph::classes_unloading_do(void f(Klass* const)) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- // Only walk the head until any clds not purged from prior unloading
- // (CMS doesn't purge right away).
- for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
- assert(cld->is_unloading(), "invariant");
- cld->classes_do(f);
- }
-}
-
-#define FOR_ALL_DICTIONARY(X) ClassLoaderDataGraphIterator iter; \
- ClassLoaderData* X; \
- while ((X = iter.get_next()) != NULL) \
- if (X->dictionary() != NULL)
-
-// Walk classes in the loaded class dictionaries in various forms.
-// Only walks the classes defined in this class loader.
-void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
- FOR_ALL_DICTIONARY(cld) {
- cld->dictionary()->classes_do(f);
- }
-}
-
-// Only walks the classes defined in this class loader.
-void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS) {
- FOR_ALL_DICTIONARY(cld) {
- cld->dictionary()->classes_do(f, CHECK);
- }
-}
-
-void ClassLoaderDataGraph::verify_dictionary() {
- FOR_ALL_DICTIONARY(cld) {
- cld->dictionary()->verify();
- }
-}
-
-void ClassLoaderDataGraph::print_dictionary(outputStream* st) {
- FOR_ALL_DICTIONARY(cld) {
- st->print("Dictionary for ");
- cld->print_value_on(st);
- st->cr();
- cld->dictionary()->print_on(st);
- st->cr();
- }
-}
-
-void ClassLoaderDataGraph::print_dictionary_statistics(outputStream* st) {
- FOR_ALL_DICTIONARY(cld) {
- ResourceMark rm;
- stringStream tempst;
- tempst.print("System Dictionary for %s class loader", cld->loader_name_and_id());
- cld->dictionary()->print_table_statistics(st, tempst.as_string());
- }
-}
-
-GrowableArray<ClassLoaderData*>* ClassLoaderDataGraph::new_clds() {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- assert(_head == NULL || _saved_head != NULL, "remember_new_clds(true) not called?");
-
- GrowableArray<ClassLoaderData*>* array = new GrowableArray<ClassLoaderData*>();
-
- // The CLDs in [_head, _saved_head] were all added during last call to remember_new_clds(true);
- ClassLoaderData* curr = _head;
- while (curr != _saved_head) {
- if (!curr->claimed()) {
- array->push(curr);
- LogTarget(Debug, class, loader, data) lt;
- if (lt.is_enabled()) {
- LogStream ls(lt);
- ls.print("found new CLD: ");
- curr->print_value_on(&ls);
- ls.cr();
- }
- }
-
- curr = curr->_next;
- }
-
- return array;
-}
-
-#ifndef PRODUCT
-bool ClassLoaderDataGraph::contains_loader_data(ClassLoaderData* loader_data) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
- for (ClassLoaderData* data = _head; data != NULL; data = data->next()) {
- if (loader_data == data) {
- return true;
- }
- }
-
- return false;
-}
-#endif // PRODUCT
-
-// Move class loader data from main list to the unloaded list for unloading
-// and deallocation later.
-bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-
- // Indicate whether safepoint cleanup is needed.
- _safepoint_cleanup_needed |= do_cleaning;
-
- ClassLoaderData* data = _head;
- ClassLoaderData* prev = NULL;
- bool seen_dead_loader = false;
- uint loaders_processed = 0;
- uint loaders_removed = 0;
-
- // Save previous _unloading pointer for CMS which may add to unloading list before
- // purging and we don't want to rewalk the previously unloaded class loader data.
- _saved_unloading = _unloading;
-
- data = _head;
- while (data != NULL) {
- if (data->is_alive()) {
- prev = data;
- data = data->next();
- loaders_processed++;
- continue;
- }
- seen_dead_loader = true;
- loaders_removed++;
- ClassLoaderData* dead = data;
- dead->unload();
- data = data->next();
- // Remove from loader list.
- // This class loader data will no longer be found
- // in the ClassLoaderDataGraph.
- if (prev != NULL) {
- prev->set_next(data);
- } else {
- assert(dead == _head, "sanity check");
- _head = data;
- }
- dead->set_next(_unloading);
- _unloading = dead;
- }
-
- log_debug(class, loader, data)("do_unloading: loaders processed %u, loaders removed %u", loaders_processed, loaders_removed);
-
- return seen_dead_loader;
-}
-
-// There's at least one dead class loader. Purge refererences of healthy module
-// reads lists and package export lists to modules belonging to dead loaders.
-void ClassLoaderDataGraph::clean_module_and_package_info() {
- assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-
- ClassLoaderData* data = _head;
- while (data != NULL) {
- // Remove entries in the dictionary of live class loader that have
- // initiated loading classes in a dead class loader.
- if (data->dictionary() != NULL) {
- data->dictionary()->do_unloading();
- }
- // Walk a ModuleEntry's reads, and a PackageEntry's exports
- // lists to determine if there are modules on those lists that are now
- // dead and should be removed. A module's life cycle is equivalent
- // to its defining class loader's life cycle. Since a module is
- // considered dead if its class loader is dead, these walks must
- // occur after each class loader's aliveness is determined.
- if (data->packages() != NULL) {
- data->packages()->purge_all_package_exports();
- }
- if (data->modules_defined()) {
- data->modules()->purge_all_module_reads();
- }
- data = data->next();
- }
-}
-
-void ClassLoaderDataGraph::purge() {
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- ClassLoaderData* list = _unloading;
- _unloading = NULL;
- ClassLoaderData* next = list;
- bool classes_unloaded = false;
- while (next != NULL) {
- ClassLoaderData* purge_me = next;
- next = purge_me->next();
- delete purge_me;
- classes_unloaded = true;
- }
- if (classes_unloaded) {
- Metaspace::purge();
- set_metaspace_oom(false);
- }
-}
-
-int ClassLoaderDataGraph::resize_if_needed() {
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- int resized = 0;
- if (Dictionary::does_any_dictionary_needs_resizing()) {
- FOR_ALL_DICTIONARY(cld) {
- if (cld->dictionary()->resize_if_needed()) {
- resized++;
- }
- }
- }
- return resized;
-}
-
-ClassLoaderDataGraphKlassIteratorAtomic::ClassLoaderDataGraphKlassIteratorAtomic()
- : _next_klass(NULL) {
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- ClassLoaderData* cld = ClassLoaderDataGraph::_head;
- Klass* klass = NULL;
-
- // Find the first klass in the CLDG.
- while (cld != NULL) {
- assert_locked_or_safepoint(cld->metaspace_lock());
- klass = cld->_klasses;
- if (klass != NULL) {
- _next_klass = klass;
- return;
- }
- cld = cld->next();
- }
-}
-
-Klass* ClassLoaderDataGraphKlassIteratorAtomic::next_klass_in_cldg(Klass* klass) {
- Klass* next = klass->next_link();
- if (next != NULL) {
- return next;
- }
-
- // No more klasses in the current CLD. Time to find a new CLD.
- ClassLoaderData* cld = klass->class_loader_data();
- assert_locked_or_safepoint(cld->metaspace_lock());
- while (next == NULL) {
- cld = cld->next();
- if (cld == NULL) {
- break;
- }
- next = cld->_klasses;
- }
-
- return next;
-}
-
-Klass* ClassLoaderDataGraphKlassIteratorAtomic::next_klass() {
- Klass* head = _next_klass;
-
- while (head != NULL) {
- Klass* next = next_klass_in_cldg(head);
-
- Klass* old_head = Atomic::cmpxchg(next, &_next_klass, head);
-
- if (old_head == head) {
- return head; // Won the CAS.
- }
-
- head = old_head;
- }
-
- // Nothing more for the iterator to hand out.
- assert(head == NULL, "head is " PTR_FORMAT ", expected not null:", p2i(head));
- return NULL;
-}
-
-ClassLoaderDataGraphMetaspaceIterator::ClassLoaderDataGraphMetaspaceIterator() {
- assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
- _data = ClassLoaderDataGraph::_head;
-}
-
-ClassLoaderDataGraphMetaspaceIterator::~ClassLoaderDataGraphMetaspaceIterator() {}
-
-#ifndef PRODUCT
-// callable from debugger
-extern "C" int print_loader_data_graph() {
- ResourceMark rm;
- ClassLoaderDataGraph::print_on(tty);
- return 0;
-}
-
-void ClassLoaderDataGraph::verify() {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->verify();
- }
-}
-
-void ClassLoaderDataGraph::print_on(outputStream * const out) {
- ClassLoaderDataGraphIterator iter;
- while (iter.repeat()) {
- ClassLoaderData* cld = iter.get_next();
- cld->print_on(out);
- }
-}
-#endif // PRODUCT
--- a/src/hotspot/share/classfile/classLoaderData.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/classLoaderData.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -53,9 +53,8 @@
// ClassLoaderData are stored in the runtime representation of classes,
// and provides iterators for root tracing and other GC operations.
-class ClassLoaderData;
+class ClassLoaderDataGraph;
class JNIMethodBlock;
-class Metadebug;
class ModuleEntry;
class PackageEntry;
class ModuleEntryTable;
@@ -63,136 +62,6 @@
class DictionaryEntry;
class Dictionary;
-// GC root for walking class loader data created
-
-class ClassLoaderDataGraph : public AllStatic {
- friend class ClassLoaderData;
- friend class ClassLoaderDataGraphMetaspaceIterator;
- friend class ClassLoaderDataGraphKlassIteratorAtomic;
- friend class ClassLoaderDataGraphKlassIteratorStatic;
- friend class ClassLoaderDataGraphIterator;
- friend class VMStructs;
- private:
- // All CLDs (except the null CLD) can be reached by walking _head->_next->...
- static ClassLoaderData* _head;
- static ClassLoaderData* _unloading;
- // CMS support.
- static ClassLoaderData* _saved_head;
- static ClassLoaderData* _saved_unloading;
- static bool _should_purge;
-
- // Set if there's anything to purge in the deallocate lists or previous versions
- // during a safepoint after class unloading in a full GC.
- static bool _should_clean_deallocate_lists;
- static bool _safepoint_cleanup_needed;
-
- // OOM has been seen in metaspace allocation. Used to prevent some
- // allocations until class unloading
- static bool _metaspace_oom;
-
- static volatile size_t _num_instance_classes;
- static volatile size_t _num_array_classes;
-
- static ClassLoaderData* add_to_graph(Handle class_loader, bool is_unsafe_anonymous);
- static ClassLoaderData* add(Handle class_loader, bool is_unsafe_anonymous);
-
- public:
- static ClassLoaderData* find_or_create(Handle class_loader);
- static void clean_module_and_package_info();
- static void purge();
- static void clear_claimed_marks();
- // Iteration through CLDG inside a safepoint; GC support
- static void cld_do(CLDClosure* cl);
- static void cld_unloading_do(CLDClosure* cl);
- static void roots_cld_do(CLDClosure* strong, CLDClosure* weak);
- static void always_strong_cld_do(CLDClosure* cl);
- // klass do
- // Walking classes through the ClassLoaderDataGraph include array classes. It also includes
- // classes that are allocated but not loaded, classes that have errors, and scratch classes
- // for redefinition. These classes are removed during the next class unloading.
- // Walking the ClassLoaderDataGraph also includes unsafe anonymous classes.
- static void classes_do(KlassClosure* klass_closure);
- static void classes_do(void f(Klass* const));
- static void methods_do(void f(Method*));
- static void modules_do(void f(ModuleEntry*));
- static void modules_unloading_do(void f(ModuleEntry*));
- static void packages_do(void f(PackageEntry*));
- static void packages_unloading_do(void f(PackageEntry*));
- static void loaded_classes_do(KlassClosure* klass_closure);
- static void unlocked_loaded_classes_do(KlassClosure* klass_closure);
- static void classes_unloading_do(void f(Klass* const));
- static bool do_unloading(bool do_cleaning);
-
- // Expose state to avoid logging overhead in safepoint cleanup tasks.
- static inline bool should_clean_metaspaces_and_reset();
- static void set_should_clean_deallocate_lists() { _should_clean_deallocate_lists = true; }
- static void clean_deallocate_lists(bool purge_previous_versions);
- static void walk_metadata_and_clean_metaspaces();
-
- // dictionary do
- // Iterate over all klasses in dictionary, but
- // just the classes from defining class loaders.
- static void dictionary_classes_do(void f(InstanceKlass*));
- // Added for initialize_itable_for_klass to handle exceptions.
- static void dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS);
-
- // VM_CounterDecay iteration support
- static InstanceKlass* try_get_next_class();
-
- static void verify_dictionary();
- static void print_dictionary(outputStream* st);
- static void print_dictionary_statistics(outputStream* st);
-
- // CMS support.
- static void remember_new_clds(bool remember) { _saved_head = (remember ? _head : NULL); }
- static GrowableArray<ClassLoaderData*>* new_clds();
-
- static void set_should_purge(bool b) { _should_purge = b; }
- static void purge_if_needed() {
- // Only purge the CLDG for CMS if concurrent sweep is complete.
- if (_should_purge) {
- purge();
- // reset for next time.
- set_should_purge(false);
- }
- }
-
- static int resize_if_needed();
-
- static bool has_metaspace_oom() { return _metaspace_oom; }
- static void set_metaspace_oom(bool value) { _metaspace_oom = value; }
-
- static void print_on(outputStream * const out) PRODUCT_RETURN;
- static void print() { print_on(tty); }
- static void verify();
-
- // instance and array class counters
- static inline size_t num_instance_classes();
- static inline size_t num_array_classes();
- static inline void inc_instance_classes(size_t count);
- static inline void dec_instance_classes(size_t count);
- static inline void inc_array_classes(size_t count);
- static inline void dec_array_classes(size_t count);
-
-#ifndef PRODUCT
- static bool contains_loader_data(ClassLoaderData* loader_data);
-#endif
-};
-
-class LockedClassesDo : public KlassClosure {
- typedef void (*classes_do_func_t)(Klass*);
- classes_do_func_t _function;
-public:
- LockedClassesDo(); // For callers who provide their own do_klass
- LockedClassesDo(classes_do_func_t function);
- ~LockedClassesDo();
-
- void do_klass(Klass* k) {
- (*_function)(k);
- }
-};
-
-
// ClassLoaderData class
class ClassLoaderData : public CHeapObj<mtClass> {
@@ -448,31 +317,4 @@
JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
};
-// An iterator that distributes Klasses to parallel worker threads.
-class ClassLoaderDataGraphKlassIteratorAtomic : public StackObj {
- Klass* volatile _next_klass;
- public:
- ClassLoaderDataGraphKlassIteratorAtomic();
- Klass* next_klass();
- private:
- static Klass* next_klass_in_cldg(Klass* klass);
-};
-
-class ClassLoaderDataGraphMetaspaceIterator : public StackObj {
- ClassLoaderData* _data;
- public:
- ClassLoaderDataGraphMetaspaceIterator();
- ~ClassLoaderDataGraphMetaspaceIterator();
- bool repeat() { return _data != NULL; }
- ClassLoaderMetaspace* get_next() {
- assert(_data != NULL, "Should not be NULL in call to the iterator");
- ClassLoaderMetaspace* result = _data->metaspace_or_null();
- _data = _data->next();
- // This result might be NULL for class loaders without metaspace
- // yet. It would be nice to return only non-null results but
- // there is no guarantee that there will be a non-null result
- // down the list so the caller is going to have to check.
- return result;
- }
-};
#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
--- a/src/hotspot/share/classfile/classLoaderData.inline.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/classLoaderData.inline.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -55,54 +55,4 @@
return loader_data;
}
-
-inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader) {
- guarantee(loader() != NULL && oopDesc::is_oop(loader()), "Loader must be oop");
- // Gets the class loader data out of the java/lang/ClassLoader object, if non-null
- // it's already in the loader_data, so no need to add
- ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data_acquire(loader());
- if (loader_data) {
- return loader_data;
- }
- return ClassLoaderDataGraph::add(loader, false);
-}
-
-size_t ClassLoaderDataGraph::num_instance_classes() {
- return _num_instance_classes;
-}
-
-size_t ClassLoaderDataGraph::num_array_classes() {
- return _num_array_classes;
-}
-
-void ClassLoaderDataGraph::inc_instance_classes(size_t count) {
- Atomic::add(count, &_num_instance_classes);
-}
-
-void ClassLoaderDataGraph::dec_instance_classes(size_t count) {
- assert(count <= _num_instance_classes, "Sanity");
- Atomic::sub(count, &_num_instance_classes);
-}
-
-void ClassLoaderDataGraph::inc_array_classes(size_t count) {
- Atomic::add(count, &_num_array_classes);
-}
-
-void ClassLoaderDataGraph::dec_array_classes(size_t count) {
- assert(count <= _num_array_classes, "Sanity");
- Atomic::sub(count, &_num_array_classes);
-}
-
-bool ClassLoaderDataGraph::should_clean_metaspaces_and_reset() {
- // Only clean metaspaces after full GC.
- bool do_cleaning = _safepoint_cleanup_needed;
-#if INCLUDE_JVMTI
- do_cleaning = do_cleaning && (_should_clean_deallocate_lists || InstanceKlass::has_previous_versions());
-#else
- do_cleaning = do_cleaning && _should_clean_deallocate_lists;
-#endif
- _safepoint_cleanup_needed = false; // reset
- return do_cleaning;
-}
-
#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
+#include "classfile/dictionary.hpp"
+#include "classfile/javaClasses.hpp"
+#include "classfile/metadataOnStackMark.hpp"
+#include "classfile/moduleEntry.hpp"
+#include "classfile/packageEntry.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/metaspace.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/mutex.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/safepointVerifiers.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
+
+volatile size_t ClassLoaderDataGraph::_num_array_classes = 0;
+volatile size_t ClassLoaderDataGraph::_num_instance_classes = 0;
+
+void ClassLoaderDataGraph::clear_claimed_marks() {
+ for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
+ cld->clear_claimed();
+ }
+}
+
+// Class iterator used by the compiler. It gets some number of classes at
+// a safepoint to decay invocation counters on the methods.
+class ClassLoaderDataGraphKlassIteratorStatic {
+ ClassLoaderData* _current_loader_data;
+ Klass* _current_class_entry;
+ public:
+
+ ClassLoaderDataGraphKlassIteratorStatic() : _current_loader_data(NULL), _current_class_entry(NULL) {}
+
+ InstanceKlass* try_get_next_class() {
+ assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+ size_t max_classes = ClassLoaderDataGraph::num_instance_classes();
+ assert(max_classes > 0, "should not be called with no instance classes");
+ for (size_t i = 0; i < max_classes; ) {
+
+ if (_current_class_entry != NULL) {
+ Klass* k = _current_class_entry;
+ _current_class_entry = _current_class_entry->next_link();
+
+ if (k->is_instance_klass()) {
+ InstanceKlass* ik = InstanceKlass::cast(k);
+ i++; // count all instance classes found
+ // Not yet loaded classes are counted in max_classes
+ // but only return loaded classes.
+ if (ik->is_loaded()) {
+ return ik;
+ }
+ }
+ } else {
+ // Go to next CLD
+ if (_current_loader_data != NULL) {
+ _current_loader_data = _current_loader_data->next();
+ }
+ // Start at the beginning
+ if (_current_loader_data == NULL) {
+ _current_loader_data = ClassLoaderDataGraph::_head;
+ }
+
+ _current_class_entry = _current_loader_data->klasses();
+ }
+ }
+ // Should never be reached unless all instance classes have failed or are not fully loaded.
+ // Caller handles NULL.
+ return NULL;
+ }
+
+ // If the current class for the static iterator is a class being unloaded or
+ // deallocated, adjust the current class.
+ void adjust_saved_class(ClassLoaderData* cld) {
+ if (_current_loader_data == cld) {
+ _current_loader_data = cld->next();
+ if (_current_loader_data != NULL) {
+ _current_class_entry = _current_loader_data->klasses();
+ } // else try_get_next_class will start at the head
+ }
+ }
+
+ void adjust_saved_class(Klass* klass) {
+ if (_current_class_entry == klass) {
+ _current_class_entry = klass->next_link();
+ }
+ }
+};
+
+static ClassLoaderDataGraphKlassIteratorStatic static_klass_iterator;
+
+InstanceKlass* ClassLoaderDataGraph::try_get_next_class() {
+ assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+ return static_klass_iterator.try_get_next_class();
+}
+
+void ClassLoaderDataGraph::adjust_saved_class(ClassLoaderData* cld) {
+ return static_klass_iterator.adjust_saved_class(cld);
+}
+
+void ClassLoaderDataGraph::adjust_saved_class(Klass* klass) {
+ return static_klass_iterator.adjust_saved_class(klass);
+}
+
+void ClassLoaderDataGraph::clean_deallocate_lists(bool walk_previous_versions) {
+ assert(SafepointSynchronize::is_at_safepoint(), "must only be called at safepoint");
+ uint loaders_processed = 0;
+ for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
+ // is_alive check will be necessary for concurrent class unloading.
+ if (cld->is_alive()) {
+ // clean metaspace
+ if (walk_previous_versions) {
+ cld->classes_do(InstanceKlass::purge_previous_versions);
+ }
+ cld->free_deallocate_list();
+ loaders_processed++;
+ }
+ }
+ log_debug(class, loader, data)("clean_deallocate_lists: loaders processed %u %s",
+ loaders_processed, walk_previous_versions ? "walk_previous_versions" : "");
+}
+
+void ClassLoaderDataGraph::walk_metadata_and_clean_metaspaces() {
+ assert(SafepointSynchronize::is_at_safepoint(), "must only be called at safepoint");
+
+ _should_clean_deallocate_lists = false; // assume everything gets cleaned
+
+ // Mark metadata seen on the stack so we can delete unreferenced entries.
+ // Walk all metadata, including the expensive code cache walk, only for class redefinition.
+ // The MetadataOnStackMark walk during redefinition saves previous versions if it finds old methods
+ // on the stack or in the code cache, so we only have to repeat the full walk if
+ // they were found at that time.
+ // TODO: have redefinition clean old methods out of the code cache. They still exist in some places.
+ bool walk_all_metadata = InstanceKlass::has_previous_versions_and_reset();
+
+ MetadataOnStackMark md_on_stack(walk_all_metadata);
+ clean_deallocate_lists(walk_all_metadata);
+}
+
+// GC root of class loader data created.
+ClassLoaderData* ClassLoaderDataGraph::_head = NULL;
+ClassLoaderData* ClassLoaderDataGraph::_unloading = NULL;
+ClassLoaderData* ClassLoaderDataGraph::_saved_unloading = NULL;
+ClassLoaderData* ClassLoaderDataGraph::_saved_head = NULL;
+
+bool ClassLoaderDataGraph::_should_purge = false;
+bool ClassLoaderDataGraph::_should_clean_deallocate_lists = false;
+bool ClassLoaderDataGraph::_safepoint_cleanup_needed = false;
+bool ClassLoaderDataGraph::_metaspace_oom = false;
+
+// Add a new class loader data node to the list. Assign the newly created
+// ClassLoaderData into the java/lang/ClassLoader object as a hidden field
+ClassLoaderData* ClassLoaderDataGraph::add_to_graph(Handle loader, bool is_unsafe_anonymous) {
+
+ assert_lock_strong(ClassLoaderDataGraph_lock);
+
+ ClassLoaderData* cld;
+
+ // First check if another thread beat us to creating the CLD and installing
+ // it into the loader while we were waiting for the lock.
+ if (!is_unsafe_anonymous && loader.not_null()) {
+ cld = java_lang_ClassLoader::loader_data_acquire(loader());
+ if (cld != NULL) {
+ return cld;
+ }
+ }
+
+ // We mustn't GC until we've installed the ClassLoaderData in the Graph since the CLD
+ // contains oops in _handles that must be walked. GC doesn't walk CLD from the
+ // loader oop in all collections, particularly young collections.
+ NoSafepointVerifier no_safepoints;
+
+ cld = new ClassLoaderData(loader, is_unsafe_anonymous);
+
+ // First install the new CLD to the Graph.
+ cld->set_next(_head);
+ _head = cld;
+
+ // Next associate with the class_loader.
+ if (!is_unsafe_anonymous) {
+ // Use OrderAccess, since readers need to get the loader_data only after
+ // it's added to the Graph
+ java_lang_ClassLoader::release_set_loader_data(loader(), cld);
+ }
+
+ // Lastly log, if requested
+ LogTarget(Trace, class, loader, data) lt;
+ if (lt.is_enabled()) {
+ ResourceMark rm;
+ LogStream ls(lt);
+ ls.print("create ");
+ cld->print_value_on(&ls);
+ ls.cr();
+ }
+ return cld;
+}
+
+ClassLoaderData* ClassLoaderDataGraph::add(Handle loader, bool is_unsafe_anonymous) {
+ MutexLocker ml(ClassLoaderDataGraph_lock);
+ ClassLoaderData* loader_data = add_to_graph(loader, is_unsafe_anonymous);
+ return loader_data;
+}
+
+void ClassLoaderDataGraph::cld_do(CLDClosure* cl) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->_next) {
+ cl->do_cld(cld);
+ }
+}
+
+void ClassLoaderDataGraph::cld_unloading_do(CLDClosure* cl) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ // Only walk the head until any clds not purged from prior unloading
+ // (CMS doesn't purge right away).
+ for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
+ assert(cld->is_unloading(), "invariant");
+ cl->do_cld(cld);
+ }
+}
+
+void ClassLoaderDataGraph::roots_cld_do(CLDClosure* strong, CLDClosure* weak) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->_next) {
+ CLDClosure* closure = cld->keep_alive() ? strong : weak;
+ if (closure != NULL) {
+ closure->do_cld(cld);
+ }
+ }
+}
+
+void ClassLoaderDataGraph::always_strong_cld_do(CLDClosure* cl) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ if (ClassUnloading) {
+ roots_cld_do(cl, NULL);
+ } else {
+ cld_do(cl);
+ }
+}
+
+// Closure for locking and iterating through classes.
+LockedClassesDo::LockedClassesDo(classes_do_func_t f) : _function(f) {
+ ClassLoaderDataGraph_lock->lock();
+}
+
+LockedClassesDo::LockedClassesDo() : _function(NULL) {
+ // callers provide their own do_klass
+ ClassLoaderDataGraph_lock->lock();
+}
+
+LockedClassesDo::~LockedClassesDo() { ClassLoaderDataGraph_lock->unlock(); }
+
+
+// Iterating over the CLDG needs to be locked because
+// unloading can remove entries concurrently soon.
+class ClassLoaderDataGraphIterator : public StackObj {
+ ClassLoaderData* _next;
+ HandleMark _hm; // clean up handles when this is done.
+ Handle _holder;
+ Thread* _thread;
+
+ void hold_next() {
+ if (_next != NULL) {
+ _holder = Handle(_thread, _next->holder_phantom());
+ }
+ }
+public:
+ ClassLoaderDataGraphIterator() : _next(ClassLoaderDataGraph::_head) {
+ _thread = Thread::current();
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ hold_next();
+ }
+
+ bool repeat() const {
+ return _next != NULL;
+ }
+
+ ClassLoaderData* get_next() {
+ ClassLoaderData* next = _next;
+ if (_next != NULL) {
+ _next = _next->next();
+ hold_next();
+ }
+ return next;
+ }
+};
+
+// These functions assume that the caller has locked the ClassLoaderDataGraph_lock
+// if they are not calling the function from a safepoint.
+void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->classes_do(klass_closure);
+ }
+}
+
+void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->classes_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::methods_do(void f(Method*)) {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->methods_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::modules_do(void f(ModuleEntry*)) {
+ assert_locked_or_safepoint(Module_lock);
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->modules_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::modules_unloading_do(void f(ModuleEntry*)) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ // Only walk the head until any clds not purged from prior unloading
+ // (CMS doesn't purge right away).
+ for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
+ assert(cld->is_unloading(), "invariant");
+ cld->modules_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::packages_do(void f(PackageEntry*)) {
+ assert_locked_or_safepoint(Module_lock);
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->packages_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::packages_unloading_do(void f(PackageEntry*)) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ // Only walk the head until any clds not purged from prior unloading
+ // (CMS doesn't purge right away).
+ for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
+ assert(cld->is_unloading(), "invariant");
+ cld->packages_do(f);
+ }
+}
+
+void ClassLoaderDataGraph::loaded_classes_do(KlassClosure* klass_closure) {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->loaded_classes_do(klass_closure);
+ }
+}
+
+// This case can block but cannot do unloading (called from CDS)
+void ClassLoaderDataGraph::unlocked_loaded_classes_do(KlassClosure* klass_closure) {
+ for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
+ cld->loaded_classes_do(klass_closure);
+ }
+}
+
+
+void ClassLoaderDataGraph::classes_unloading_do(void f(Klass* const)) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ // Only walk the head until any clds not purged from prior unloading
+ // (CMS doesn't purge right away).
+ for (ClassLoaderData* cld = _unloading; cld != _saved_unloading; cld = cld->next()) {
+ assert(cld->is_unloading(), "invariant");
+ cld->classes_do(f);
+ }
+}
+
+#define FOR_ALL_DICTIONARY(X) ClassLoaderDataGraphIterator iter; \
+ ClassLoaderData* X; \
+ while ((X = iter.get_next()) != NULL) \
+ if (X->dictionary() != NULL)
+
+// Walk classes in the loaded class dictionaries in various forms.
+// Only walks the classes defined in this class loader.
+void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+ FOR_ALL_DICTIONARY(cld) {
+ cld->dictionary()->classes_do(f);
+ }
+}
+
+// Only walks the classes defined in this class loader.
+void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS) {
+ FOR_ALL_DICTIONARY(cld) {
+ cld->dictionary()->classes_do(f, CHECK);
+ }
+}
+
+void ClassLoaderDataGraph::verify_dictionary() {
+ FOR_ALL_DICTIONARY(cld) {
+ cld->dictionary()->verify();
+ }
+}
+
+void ClassLoaderDataGraph::print_dictionary(outputStream* st) {
+ FOR_ALL_DICTIONARY(cld) {
+ st->print("Dictionary for ");
+ cld->print_value_on(st);
+ st->cr();
+ cld->dictionary()->print_on(st);
+ st->cr();
+ }
+}
+
+void ClassLoaderDataGraph::print_dictionary_statistics(outputStream* st) {
+ FOR_ALL_DICTIONARY(cld) {
+ ResourceMark rm;
+ stringStream tempst;
+ tempst.print("System Dictionary for %s class loader", cld->loader_name_and_id());
+ cld->dictionary()->print_table_statistics(st, tempst.as_string());
+ }
+}
+
+GrowableArray<ClassLoaderData*>* ClassLoaderDataGraph::new_clds() {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ assert(_head == NULL || _saved_head != NULL, "remember_new_clds(true) not called?");
+
+ GrowableArray<ClassLoaderData*>* array = new GrowableArray<ClassLoaderData*>();
+
+ // The CLDs in [_head, _saved_head] were all added during last call to remember_new_clds(true);
+ ClassLoaderData* curr = _head;
+ while (curr != _saved_head) {
+ if (!curr->claimed()) {
+ array->push(curr);
+ LogTarget(Debug, class, loader, data) lt;
+ if (lt.is_enabled()) {
+ LogStream ls(lt);
+ ls.print("found new CLD: ");
+ curr->print_value_on(&ls);
+ ls.cr();
+ }
+ }
+
+ curr = curr->_next;
+ }
+
+ return array;
+}
+
+#ifndef PRODUCT
+bool ClassLoaderDataGraph::contains_loader_data(ClassLoaderData* loader_data) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+ for (ClassLoaderData* data = _head; data != NULL; data = data->next()) {
+ if (loader_data == data) {
+ return true;
+ }
+ }
+
+ return false;
+}
+#endif // PRODUCT
+
+// Move class loader data from main list to the unloaded list for unloading
+// and deallocation later.
+bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+ // Indicate whether safepoint cleanup is needed.
+ _safepoint_cleanup_needed |= do_cleaning;
+
+ ClassLoaderData* data = _head;
+ ClassLoaderData* prev = NULL;
+ bool seen_dead_loader = false;
+ uint loaders_processed = 0;
+ uint loaders_removed = 0;
+
+ // Save previous _unloading pointer for CMS which may add to unloading list before
+ // purging and we don't want to rewalk the previously unloaded class loader data.
+ _saved_unloading = _unloading;
+
+ data = _head;
+ while (data != NULL) {
+ if (data->is_alive()) {
+ prev = data;
+ data = data->next();
+ loaders_processed++;
+ continue;
+ }
+ seen_dead_loader = true;
+ loaders_removed++;
+ ClassLoaderData* dead = data;
+ dead->unload();
+ data = data->next();
+ // Remove from loader list.
+ // This class loader data will no longer be found
+ // in the ClassLoaderDataGraph.
+ if (prev != NULL) {
+ prev->set_next(data);
+ } else {
+ assert(dead == _head, "sanity check");
+ _head = data;
+ }
+ dead->set_next(_unloading);
+ _unloading = dead;
+ }
+
+ log_debug(class, loader, data)("do_unloading: loaders processed %u, loaders removed %u", loaders_processed, loaders_removed);
+
+ return seen_dead_loader;
+}
+
+// There's at least one dead class loader. Purge refererences of healthy module
+// reads lists and package export lists to modules belonging to dead loaders.
+void ClassLoaderDataGraph::clean_module_and_package_info() {
+ assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+ ClassLoaderData* data = _head;
+ while (data != NULL) {
+ // Remove entries in the dictionary of live class loader that have
+ // initiated loading classes in a dead class loader.
+ if (data->dictionary() != NULL) {
+ data->dictionary()->do_unloading();
+ }
+ // Walk a ModuleEntry's reads, and a PackageEntry's exports
+ // lists to determine if there are modules on those lists that are now
+ // dead and should be removed. A module's life cycle is equivalent
+ // to its defining class loader's life cycle. Since a module is
+ // considered dead if its class loader is dead, these walks must
+ // occur after each class loader's aliveness is determined.
+ if (data->packages() != NULL) {
+ data->packages()->purge_all_package_exports();
+ }
+ if (data->modules_defined()) {
+ data->modules()->purge_all_module_reads();
+ }
+ data = data->next();
+ }
+}
+
+void ClassLoaderDataGraph::purge() {
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
+ ClassLoaderData* list = _unloading;
+ _unloading = NULL;
+ ClassLoaderData* next = list;
+ bool classes_unloaded = false;
+ while (next != NULL) {
+ ClassLoaderData* purge_me = next;
+ next = purge_me->next();
+ delete purge_me;
+ classes_unloaded = true;
+ }
+ if (classes_unloaded) {
+ Metaspace::purge();
+ set_metaspace_oom(false);
+ }
+}
+
+int ClassLoaderDataGraph::resize_if_needed() {
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
+ int resized = 0;
+ if (Dictionary::does_any_dictionary_needs_resizing()) {
+ FOR_ALL_DICTIONARY(cld) {
+ if (cld->dictionary()->resize_if_needed()) {
+ resized++;
+ }
+ }
+ }
+ return resized;
+}
+
+ClassLoaderDataGraphKlassIteratorAtomic::ClassLoaderDataGraphKlassIteratorAtomic()
+ : _next_klass(NULL) {
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
+ ClassLoaderData* cld = ClassLoaderDataGraph::_head;
+ Klass* klass = NULL;
+
+ // Find the first klass in the CLDG.
+ while (cld != NULL) {
+ assert_locked_or_safepoint(cld->metaspace_lock());
+ klass = cld->_klasses;
+ if (klass != NULL) {
+ _next_klass = klass;
+ return;
+ }
+ cld = cld->next();
+ }
+}
+
+Klass* ClassLoaderDataGraphKlassIteratorAtomic::next_klass_in_cldg(Klass* klass) {
+ Klass* next = klass->next_link();
+ if (next != NULL) {
+ return next;
+ }
+
+ // No more klasses in the current CLD. Time to find a new CLD.
+ ClassLoaderData* cld = klass->class_loader_data();
+ assert_locked_or_safepoint(cld->metaspace_lock());
+ while (next == NULL) {
+ cld = cld->next();
+ if (cld == NULL) {
+ break;
+ }
+ next = cld->_klasses;
+ }
+
+ return next;
+}
+
+Klass* ClassLoaderDataGraphKlassIteratorAtomic::next_klass() {
+ Klass* head = _next_klass;
+
+ while (head != NULL) {
+ Klass* next = next_klass_in_cldg(head);
+
+ Klass* old_head = Atomic::cmpxchg(next, &_next_klass, head);
+
+ if (old_head == head) {
+ return head; // Won the CAS.
+ }
+
+ head = old_head;
+ }
+
+ // Nothing more for the iterator to hand out.
+ assert(head == NULL, "head is " PTR_FORMAT ", expected not null:", p2i(head));
+ return NULL;
+}
+
+ClassLoaderDataGraphMetaspaceIterator::ClassLoaderDataGraphMetaspaceIterator() {
+ assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");
+ _data = ClassLoaderDataGraph::_head;
+}
+
+ClassLoaderDataGraphMetaspaceIterator::~ClassLoaderDataGraphMetaspaceIterator() {}
+
+ClassLoaderMetaspace* ClassLoaderDataGraphMetaspaceIterator::get_next() {
+ assert(_data != NULL, "Should not be NULL in call to the iterator");
+ ClassLoaderMetaspace* result = _data->metaspace_or_null();
+ _data = _data->next();
+ // This result might be NULL for class loaders without metaspace
+ // yet. It would be nice to return only non-null results but
+ // there is no guarantee that there will be a non-null result
+ // down the list so the caller is going to have to check.
+ return result;
+}
+
+#ifndef PRODUCT
+// callable from debugger
+extern "C" int print_loader_data_graph() {
+ ResourceMark rm;
+ ClassLoaderDataGraph::print_on(tty);
+ return 0;
+}
+
+void ClassLoaderDataGraph::verify() {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->verify();
+ }
+}
+
+void ClassLoaderDataGraph::print_on(outputStream * const out) {
+ ClassLoaderDataGraphIterator iter;
+ while (iter.repeat()) {
+ ClassLoaderData* cld = iter.get_next();
+ cld->print_on(out);
+ }
+}
+#endif // PRODUCT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+
+#include "classfile/classLoaderData.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+
+// GC root for walking class loader data created
+
+class ClassLoaderDataGraph : public AllStatic {
+ friend class ClassLoaderData;
+ friend class ClassLoaderDataGraphMetaspaceIterator;
+ friend class ClassLoaderDataGraphKlassIteratorAtomic;
+ friend class ClassLoaderDataGraphKlassIteratorStatic;
+ friend class ClassLoaderDataGraphIterator;
+ friend class VMStructs;
+ private:
+ // All CLDs (except the null CLD) can be reached by walking _head->_next->...
+ static ClassLoaderData* _head;
+ static ClassLoaderData* _unloading;
+ // CMS support.
+ static ClassLoaderData* _saved_head;
+ static ClassLoaderData* _saved_unloading;
+ static bool _should_purge;
+
+ // Set if there's anything to purge in the deallocate lists or previous versions
+ // during a safepoint after class unloading in a full GC.
+ static bool _should_clean_deallocate_lists;
+ static bool _safepoint_cleanup_needed;
+
+ // OOM has been seen in metaspace allocation. Used to prevent some
+ // allocations until class unloading
+ static bool _metaspace_oom;
+
+ static volatile size_t _num_instance_classes;
+ static volatile size_t _num_array_classes;
+
+ static ClassLoaderData* add_to_graph(Handle class_loader, bool is_unsafe_anonymous);
+ static ClassLoaderData* add(Handle class_loader, bool is_unsafe_anonymous);
+
+ public:
+ static ClassLoaderData* find_or_create(Handle class_loader);
+ static void clean_module_and_package_info();
+ static void purge();
+ static void clear_claimed_marks();
+ // Iteration through CLDG inside a safepoint; GC support
+ static void cld_do(CLDClosure* cl);
+ static void cld_unloading_do(CLDClosure* cl);
+ static void roots_cld_do(CLDClosure* strong, CLDClosure* weak);
+ static void always_strong_cld_do(CLDClosure* cl);
+ // klass do
+ // Walking classes through the ClassLoaderDataGraph include array classes. It also includes
+ // classes that are allocated but not loaded, classes that have errors, and scratch classes
+ // for redefinition. These classes are removed during the next class unloading.
+ // Walking the ClassLoaderDataGraph also includes unsafe anonymous classes.
+ static void classes_do(KlassClosure* klass_closure);
+ static void classes_do(void f(Klass* const));
+ static void methods_do(void f(Method*));
+ static void modules_do(void f(ModuleEntry*));
+ static void modules_unloading_do(void f(ModuleEntry*));
+ static void packages_do(void f(PackageEntry*));
+ static void packages_unloading_do(void f(PackageEntry*));
+ static void loaded_classes_do(KlassClosure* klass_closure);
+ static void unlocked_loaded_classes_do(KlassClosure* klass_closure);
+ static void classes_unloading_do(void f(Klass* const));
+ static bool do_unloading(bool do_cleaning);
+
+ // Expose state to avoid logging overhead in safepoint cleanup tasks.
+ static inline bool should_clean_metaspaces_and_reset();
+ static void set_should_clean_deallocate_lists() { _should_clean_deallocate_lists = true; }
+ static void clean_deallocate_lists(bool purge_previous_versions);
+ static void walk_metadata_and_clean_metaspaces();
+
+ // dictionary do
+ // Iterate over all klasses in dictionary, but
+ // just the classes from defining class loaders.
+ static void dictionary_classes_do(void f(InstanceKlass*));
+ // Added for initialize_itable_for_klass to handle exceptions.
+ static void dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS);
+
+ // VM_CounterDecay iteration support
+ static InstanceKlass* try_get_next_class();
+ static void adjust_saved_class(ClassLoaderData* cld);
+ static void adjust_saved_class(Klass* klass);
+
+ static void verify_dictionary();
+ static void print_dictionary(outputStream* st);
+ static void print_dictionary_statistics(outputStream* st);
+
+ // CMS support.
+ static void remember_new_clds(bool remember) { _saved_head = (remember ? _head : NULL); }
+ static GrowableArray<ClassLoaderData*>* new_clds();
+
+ static void set_should_purge(bool b) { _should_purge = b; }
+ static void purge_if_needed() {
+ // Only purge the CLDG for CMS if concurrent sweep is complete.
+ if (_should_purge) {
+ purge();
+ // reset for next time.
+ set_should_purge(false);
+ }
+ }
+
+ static int resize_if_needed();
+
+ static bool has_metaspace_oom() { return _metaspace_oom; }
+ static void set_metaspace_oom(bool value) { _metaspace_oom = value; }
+
+ static void print_on(outputStream * const out) PRODUCT_RETURN;
+ static void print() { print_on(tty); }
+ static void verify();
+
+ // instance and array class counters
+ static inline size_t num_instance_classes();
+ static inline size_t num_array_classes();
+ static inline void inc_instance_classes(size_t count);
+ static inline void dec_instance_classes(size_t count);
+ static inline void inc_array_classes(size_t count);
+ static inline void dec_array_classes(size_t count);
+
+#ifndef PRODUCT
+ static bool contains_loader_data(ClassLoaderData* loader_data);
+#endif
+};
+
+class LockedClassesDo : public KlassClosure {
+ typedef void (*classes_do_func_t)(Klass*);
+ classes_do_func_t _function;
+public:
+ LockedClassesDo(); // For callers who provide their own do_klass
+ LockedClassesDo(classes_do_func_t function);
+ ~LockedClassesDo();
+
+ void do_klass(Klass* k) {
+ (*_function)(k);
+ }
+};
+
+// An iterator that distributes Klasses to parallel worker threads.
+class ClassLoaderDataGraphKlassIteratorAtomic : public StackObj {
+ Klass* volatile _next_klass;
+ public:
+ ClassLoaderDataGraphKlassIteratorAtomic();
+ Klass* next_klass();
+ private:
+ static Klass* next_klass_in_cldg(Klass* klass);
+};
+
+class ClassLoaderDataGraphMetaspaceIterator : public StackObj {
+ ClassLoaderData* _data;
+ public:
+ ClassLoaderDataGraphMetaspaceIterator();
+ ~ClassLoaderDataGraphMetaspaceIterator();
+ bool repeat() { return _data != NULL; }
+ ClassLoaderMetaspace* get_next();
+};
+#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ */
+
+#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+
+#include "classfile/classLoaderDataGraph.hpp"
+#include "classfile/javaClasses.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
+
+inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader) {
+ guarantee(loader() != NULL && oopDesc::is_oop(loader()), "Loader must be oop");
+ // Gets the class loader data out of the java/lang/ClassLoader object, if non-null
+ // it's already in the loader_data, so no need to add
+ ClassLoaderData* loader_data = java_lang_ClassLoader::loader_data_acquire(loader());
+ if (loader_data) {
+ return loader_data;
+ }
+ return ClassLoaderDataGraph::add(loader, false);
+}
+
+size_t ClassLoaderDataGraph::num_instance_classes() {
+ return _num_instance_classes;
+}
+
+size_t ClassLoaderDataGraph::num_array_classes() {
+ return _num_array_classes;
+}
+
+void ClassLoaderDataGraph::inc_instance_classes(size_t count) {
+ Atomic::add(count, &_num_instance_classes);
+}
+
+void ClassLoaderDataGraph::dec_instance_classes(size_t count) {
+ assert(count <= _num_instance_classes, "Sanity");
+ Atomic::sub(count, &_num_instance_classes);
+}
+
+void ClassLoaderDataGraph::inc_array_classes(size_t count) {
+ Atomic::add(count, &_num_array_classes);
+}
+
+void ClassLoaderDataGraph::dec_array_classes(size_t count) {
+ assert(count <= _num_array_classes, "Sanity");
+ Atomic::sub(count, &_num_array_classes);
+}
+
+bool ClassLoaderDataGraph::should_clean_metaspaces_and_reset() {
+ // Only clean metaspaces after full GC.
+ bool do_cleaning = _safepoint_cleanup_needed;
+#if INCLUDE_JVMTI
+ do_cleaning = do_cleaning && (_should_clean_deallocate_lists || InstanceKlass::has_previous_versions());
+#else
+ do_cleaning = do_cleaning && _should_clean_deallocate_lists;
+#endif
+ _safepoint_cleanup_needed = false; // reset
+ return do_cleaning;
+}
+
+#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
--- a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -26,6 +26,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/classLoaderHierarchyDCmd.hpp"
#include "memory/allocation.hpp"
#include "memory/resourceArea.hpp"
--- a/src/hotspot/share/classfile/classLoaderStats.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/classLoaderStats.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/classLoaderStats.hpp"
#include "oops/oop.inline.hpp"
#include "utilities/globalDefinitions.hpp"
--- a/src/hotspot/share/classfile/loaderConstraints.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/loaderConstraints.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,8 +23,9 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/dictionary.hpp"
-#include "classfile/classLoaderData.inline.hpp"
#include "classfile/loaderConstraints.hpp"
#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
--- a/src/hotspot/share/classfile/systemDictionary.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/classfile/systemDictionary.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -29,6 +29,7 @@
#include "classfile/classFileStream.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/classLoaderExt.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.inline.hpp"
--- a/src/hotspot/share/code/dependencyContext.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/code/dependencyContext.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -218,18 +218,6 @@
return marked;
}
-void DependencyContext::wipe() {
- assert_locked_or_safepoint(CodeCache_lock);
- nmethodBucket* b = dependencies();
- set_dependencies(NULL);
- set_has_stale_entries(false);
- while (b != NULL) {
- nmethodBucket* next = b->next();
- delete b;
- b = next;
- }
-}
-
#ifndef PRODUCT
void DependencyContext::print_dependent_nmethods(bool verbose) {
int idx = 0;
--- a/src/hotspot/share/code/dependencyContext.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/code/dependencyContext.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -141,10 +141,6 @@
void expunge_stale_entries();
- // Unsafe deallocation of nmethodBuckets. Used in IK::release_C_heap_structures
- // to clean up the context possibly containing live entries pointing to unloaded nmethods.
- void wipe();
-
#ifndef PRODUCT
void print_dependent_nmethods(bool verbose);
bool is_dependent_nmethod(nmethod* nm);
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/metadataOnStackMark.hpp"
#include "classfile/stringTable.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/metadataOnStackMark.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "code/codeCache.hpp"
#include "gc/g1/g1BarrierSet.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "gc/g1/g1Analytics.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1ConcurrentMark.inline.hpp"
--- a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
#include "gc/g1/g1FullCollector.hpp"
--- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "gc/g1/g1CollectedHeap.hpp"
#include "gc/g1/g1FullCollector.hpp"
#include "gc/g1/g1FullGCMarker.hpp"
--- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/gc/parallel/pcTasks.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/parallel/pcTasks.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/parallel/parallelScavengeHeap.hpp"
--- a/src/hotspot/share/gc/parallel/psMarkSweep.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
--- a/src/hotspot/share/gc/parallel/psTasks.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/parallel/psTasks.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/parallel/gcTaskManager.hpp"
--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
--- a/src/hotspot/share/gc/shared/cardTableRS.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/shared/cardTableRS.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "gc/shared/cardTableRS.hpp"
#include "gc/shared/genCollectedHeap.hpp"
#include "gc/shared/genOopClosures.hpp"
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/gc/shared/memAllocator.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -34,9 +34,9 @@
// These fascilities are used for allocating, and initializing newly allocated objects.
class MemAllocator: StackObj {
+protected:
class Allocation;
-protected:
CollectedHeap* const _heap;
Thread* const _thread;
Klass* const _klass;
--- a/src/hotspot/share/gc/shared/parallelCleaning.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
#define SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "gc/shared/oopStorageParState.hpp"
#include "gc/shared/stringdedup/stringDedup.hpp"
#include "gc/shared/workgroup.hpp"
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -22,7 +22,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/strongRootsScope.hpp"
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "gc/shared/strongRootsScope.hpp"
#include "jfr/leakprofiler/utilities/unifiedOop.hpp"
--- a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "jfr/leakprofiler/utilities/saveRestore.hpp"
#include "oops/oop.inline.hpp"
--- a/src/hotspot/share/jfr/periodic/jfrModuleEvent.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/periodic/jfrModuleEvent.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,8 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/moduleEntry.hpp"
#include "classfile/packageEntry.hpp"
#include "jfr/jfrEvents.hpp"
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "jvm.h"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/classLoaderStats.hpp"
#include "classfile/javaClasses.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/moduleEntry.hpp"
#include "classfile/packageEntry.hpp"
--- a/src/hotspot/share/memory/heapInspection.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/memory/heapInspection.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/moduleEntry.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.hpp"
--- a/src/hotspot/share/memory/metaspace.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/memory/metaspace.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
-
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "logging/log.hpp"
#include "logging/logStream.hpp"
--- a/src/hotspot/share/memory/metaspaceShared.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/memory/metaspaceShared.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "jvm.h"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/classListParser.hpp"
#include "classfile/classLoaderExt.hpp"
#include "classfile/dictionary.hpp"
--- a/src/hotspot/share/memory/universe.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/memory/universe.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
#include "classfile/classLoader.hpp"
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/oops/instanceKlass.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/oops/instanceKlass.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -686,15 +686,6 @@
return Verifier::verify(this, should_verify_class(), THREAD);
}
-
-// Used exclusively by the shared spaces dump mechanism to prevent
-// classes mapped into the shared regions in new VMs from appearing linked.
-
-void InstanceKlass::unlink_class() {
- assert(is_linked(), "must be linked");
- _init_state = loaded;
-}
-
void InstanceKlass::link_class(TRAPS) {
assert(is_loaded(), "must be loaded");
if (!is_linked()) {
@@ -2300,10 +2291,12 @@
return;
}
- // Unlink the class
- if (is_linked()) {
- unlink_class();
- }
+ // Reset to the 'allocated' state to prevent any premature accessing to
+ // a shared class at runtime while the class is still being loaded and
+ // restored. A class' init_state is set to 'loaded' at runtime when it's
+ // being added to class hierarchy (see SystemDictionary:::add_to_hierarchy()).
+ _init_state = allocated;
+
{
MutexLocker ml(Compile_lock);
init_implementor();
@@ -2350,6 +2343,10 @@
}
void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
+ // SystemDictionary::add_to_hierarchy() sets the init_state to loaded
+ // before the InstanceKlass is added to the SystemDictionary. Make
+ // sure the current state is <loaded.
+ assert(!is_loaded(), "invalid init state");
set_package(loader_data, CHECK);
Klass::restore_unshareable_info(loader_data, protection_domain, CHECK);
@@ -2417,7 +2414,10 @@
}
#endif
-void InstanceKlass::notify_unload_class(InstanceKlass* ik) {
+void InstanceKlass::unload_class(InstanceKlass* ik) {
+ // Release dependencies.
+ ik->dependencies().remove_all_dependents();
+
// notify the debugger
if (JvmtiExport::should_post_class_unload()) {
JvmtiExport::post_class_unload(ik);
@@ -2462,16 +2462,8 @@
FreeHeap(jmeths);
}
- // Release dependencies.
- // It is desirable to use DC::remove_all_dependents() here, but, unfortunately,
- // it is not safe (see JDK-8143408). The problem is that the klass dependency
- // context can contain live dependencies, since there's a race between nmethod &
- // klass unloading. If the klass is dead when nmethod unloading happens, relevant
- // dependencies aren't removed from the context associated with the class (see
- // nmethod::flush_dependencies). It ends up during klass unloading as seemingly
- // live dependencies pointing to unloaded nmethods and causes a crash in
- // DC::remove_all_dependents() when it touches unloaded nmethod.
- dependencies().wipe();
+ assert(_dep_context == DependencyContext::EMPTY,
+ "dependencies should already be cleaned");
#if INCLUDE_JVMTI
// Deallocate breakpoint records
--- a/src/hotspot/share/oops/instanceKlass.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/oops/instanceKlass.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -542,7 +542,6 @@
void initialize(TRAPS);
void link_class(TRAPS);
bool link_class_or_fail(TRAPS); // returns false on failure
- void unlink_class();
void rewrite_class(TRAPS);
void link_methods(TRAPS);
Method* class_initializer() const;
@@ -1180,7 +1179,7 @@
bool on_stack() const { return _constants->on_stack(); }
// callbacks for actions during class unloading
- static void notify_unload_class(InstanceKlass* ik);
+ static void unload_class(InstanceKlass* ik);
static void release_C_heap_structures(InstanceKlass* ik);
// Naming
--- a/src/hotspot/share/oops/klassVtable.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/oops/klassVtable.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "jvm.h"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
--- a/src/hotspot/share/oops/method.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/oops/method.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/systemDictionary.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
#include "memory/resourceArea.hpp"
--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,8 +23,8 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/dictionary.hpp"
-#include "classfile/classLoaderData.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "memory/universe.hpp"
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "aot/aotLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/classFileStream.hpp"
#include "classfile/metadataOnStackMark.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/prims/whitebox.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/prims/whitebox.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -26,7 +26,7 @@
#include <new>
-#include "classfile/classLoaderData.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/modules.hpp"
#include "classfile/protectionDomainCache.hpp"
#include "classfile/stringTable.hpp"
--- a/src/hotspot/share/runtime/arguments.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -542,6 +542,7 @@
{ "CreateMinidumpOnCrash", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() },
{ "MustCallLoadClassInternal", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
{ "UnsyncloadClass", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
+ { "TLABStats", JDK_Version::jdk(12), JDK_Version::undefined(), JDK_Version::undefined() },
// -------------- Obsolete Flags - sorted by expired_in --------------
{ "CheckAssertionStatusDirectives",JDK_Version::undefined(), JDK_Version::jdk(11), JDK_Version::jdk(12) },
@@ -3850,6 +3851,10 @@
UNSUPPORTED_OPTION(UseLargePages);
#endif
+#if defined(AIX)
+ UNSUPPORTED_OPTION(AllocateHeapAt);
+#endif
+
ArgumentsExt::report_unsupported_options();
#ifndef PRODUCT
--- a/src/hotspot/share/runtime/biasedLocking.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/biasedLocking.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "jfr/jfrEvents.hpp"
#include "jfr/support/jfrThreadId.hpp"
#include "logging/log.hpp"
--- a/src/hotspot/share/runtime/compilationPolicy.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/compilationPolicy.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "code/compiledIC.hpp"
#include "code/nmethod.hpp"
#include "code/scopeDesc.hpp"
--- a/src/hotspot/share/runtime/java.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/java.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -26,6 +26,7 @@
#include "jvm.h"
#include "aot/aotLoader.hpp"
#include "classfile/classLoader.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
--- a/src/hotspot/share/runtime/memprofiler.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/memprofiler.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
--- a/src/hotspot/share/runtime/objectMonitor.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/objectMonitor.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -110,7 +110,7 @@
static int Knob_FixedSpin = 0;
static int Knob_PreSpin = 10; // 20-100 likely better
-static volatile int InitDone = 0;
+DEBUG_ONLY(static volatile bool InitDone = false;)
// -----------------------------------------------------------------------------
// Theory of operations -- Monitors lists, thread residency, etc:
@@ -428,7 +428,7 @@
return;
}
- DeferredInitialize();
+ assert(InitDone, "Unexpectedly not initialized");
// We try one round of spinning *before* enqueueing Self.
//
@@ -1102,7 +1102,7 @@
assert(Self->is_Java_thread(), "Must be Java thread!");
JavaThread *jt = (JavaThread *)THREAD;
- DeferredInitialize();
+ assert(InitDone, "Unexpectedly not initialized");
if (THREAD != _owner) {
if (THREAD->is_lock_owned ((address)_owner)) {
@@ -1186,7 +1186,7 @@
assert(Self->is_Java_thread(), "Must be Java thread!");
JavaThread *jt = (JavaThread *)THREAD;
- DeferredInitialize();
+ assert(InitDone, "Unexpectedly not initialized");
// Throw IMSX or IEX.
CHECK_OWNER();
@@ -1888,9 +1888,14 @@
// be protected - like so many things - by the MonitorCache_lock.
void ObjectMonitor::Initialize() {
- static int InitializationCompleted = 0;
- assert(InitializationCompleted == 0, "invariant");
- InitializationCompleted = 1;
+ assert(!InitDone, "invariant");
+
+ if (!os::is_MP()) {
+ Knob_SpinLimit = 0;
+ Knob_PreSpin = 0;
+ Knob_FixedSpin = -1;
+ }
+
if (UsePerfData) {
EXCEPTION_MARK;
#define NEWPERFCOUNTER(n) \
@@ -1913,26 +1918,6 @@
#undef NEWPERFCOUNTER
#undef NEWPERFVARIABLE
}
+
+ DEBUG_ONLY(InitDone = true;)
}
-
-void ObjectMonitor::DeferredInitialize() {
- if (InitDone > 0) return;
- if (Atomic::cmpxchg (-1, &InitDone, 0) != 0) {
- while (InitDone != 1) /* empty */;
- return;
- }
-
- // One-shot global initialization ...
- // The initialization is idempotent, so we don't need locks.
- // In the future consider doing this via os::init_2().
-
- if (!os::is_MP()) {
- Knob_SpinLimit = 0;
- Knob_PreSpin = 0;
- Knob_FixedSpin = -1;
- }
-
- OrderAccess::fence();
- InitDone = 1;
-}
-
--- a/src/hotspot/share/runtime/objectMonitor.hpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/objectMonitor.hpp Mon Oct 01 09:56:45 2018 +0100
@@ -302,7 +302,6 @@
private:
void AddWaiter(ObjectWaiter * waiter);
- static void DeferredInitialize();
void INotify(Thread * Self);
ObjectWaiter * DequeueWaiter();
void DequeueSpecificWaiter(ObjectWaiter * waiter);
--- a/src/hotspot/share/runtime/safepoint.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/safepoint.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
--- a/src/hotspot/share/runtime/vmStructs.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/vmStructs.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -29,6 +29,7 @@
#include "ci/ciObjArrayKlass.hpp"
#include "ci/ciSymbol.hpp"
#include "classfile/compactHashtable.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/dictionary.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/stringTable.hpp"
--- a/src/hotspot/share/runtime/vm_version.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/runtime/vm_version.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -220,6 +220,8 @@
#define HOTSPOT_BUILD_COMPILER "MS VC++ 14.0 (VS2015)"
#elif _MSC_VER == 1912
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.5 (VS2017)"
+ #elif _MSC_VER == 1913
+ #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.6 (VS2017)"
#else
#define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
#endif
--- a/src/hotspot/share/services/heapDumper.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/services/heapDumper.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -24,6 +24,8 @@
#include "precompiled.hpp"
#include "jvm.h"
+#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmSymbols.hpp"
--- a/src/hotspot/share/services/memBaseline.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/src/hotspot/share/services/memBaseline.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.inline.hpp"
#include "memory/allocation.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.inline.hpp"
--- a/src/java.base/share/classes/java/util/Arrays.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/classes/java/util/Arrays.java Mon Oct 01 09:56:45 2018 +0100
@@ -28,6 +28,7 @@
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.util.ArraysSupport;
+import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.concurrent.ForkJoinPool;
import java.util.function.BinaryOperator;
@@ -4288,21 +4289,41 @@
// Misc
/**
- * Returns a fixed-size list backed by the specified array. (Changes to
- * the returned list "write through" to the array.) This method acts
- * as bridge between array-based and collection-based APIs, in
- * combination with {@link Collection#toArray}. The returned list is
- * serializable and implements {@link RandomAccess}.
+ * Returns a fixed-size list backed by the specified array. Changes made to
+ * the array will be visible in the returned list, and changes made to the
+ * list will be visible in the array. The returned list is
+ * {@link Serializable} and implements {@link RandomAccess}.
+ *
+ * <p>The returned list implements the optional {@code Collection} methods, except
+ * those that would change the size of the returned list. Those methods leave
+ * the list unchanged and throw {@link UnsupportedOperationException}.
+ *
+ * @apiNote
+ * This method acts as bridge between array-based and collection-based
+ * APIs, in combination with {@link Collection#toArray}.
+ *
+ * <p>This method provides a way to wrap an existing array:
+ * <pre>{@code
+ * Integer[] numbers = ...
+ * ...
+ * List<Integer> values = Arrays.asList(numbers);
+ * }</pre>
*
* <p>This method also provides a convenient way to create a fixed-size
* list initialized to contain several elements:
- * <pre>
- * List<String> stooges = Arrays.asList("Larry", "Moe", "Curly");
- * </pre>
+ * <pre>{@code
+ * List<String> stooges = Arrays.asList("Larry", "Moe", "Curly");
+ * }</pre>
+ *
+ * <p><em>The list returned by this method is modifiable.</em>
+ * To create an unmodifiable list, use
+ * {@link Collections#unmodifiableList Collections.unmodifiableList}
+ * or <a href="List.html#unmodifiable">Unmodifiable Lists</a>.
*
* @param <T> the class of the objects in the array
* @param a the array by which the list will be backed
* @return a list view of the specified array
+ * @throws NullPointerException if the specified array is {@code null}
*/
@SafeVarargs
@SuppressWarnings("varargs")
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Mon Oct 01 09:56:45 2018 +0100
@@ -957,17 +957,17 @@
@SuppressWarnings("serial")
static final class UniExceptionally<T> extends UniCompletion<T,T> {
Function<? super Throwable, ? extends T> fn;
- UniExceptionally(CompletableFuture<T> dep, CompletableFuture<T> src,
+ UniExceptionally(Executor executor,
+ CompletableFuture<T> dep, CompletableFuture<T> src,
Function<? super Throwable, ? extends T> fn) {
- super(null, dep, src); this.fn = fn;
+ super(executor, dep, src); this.fn = fn;
}
- final CompletableFuture<T> tryFire(int mode) { // never ASYNC
- // assert mode != ASYNC;
+ final CompletableFuture<T> tryFire(int mode) {
CompletableFuture<T> d; CompletableFuture<T> a;
Object r; Function<? super Throwable, ? extends T> f;
if ((d = dep) == null || (f = fn) == null
|| (a = src) == null || (r = a.result) == null
- || !d.uniExceptionally(r, f, this))
+ || !d.uniExceptionally(r, f, mode > 0 ? null : this))
return null;
dep = null; src = null; fn = null;
return d.postFire(a, mode);
@@ -980,11 +980,11 @@
Throwable x;
if (result == null) {
try {
- if (r instanceof AltResult && (x = ((AltResult)r).ex) != null) {
- if (c != null && !c.claim())
- return false;
+ if (c != null && !c.claim())
+ return false;
+ if (r instanceof AltResult && (x = ((AltResult)r).ex) != null)
completeValue(f.apply(x));
- } else
+ else
internalComplete(r);
} catch (Throwable ex) {
completeThrowable(ex);
@@ -994,14 +994,88 @@
}
private CompletableFuture<T> uniExceptionallyStage(
- Function<Throwable, ? extends T> f) {
+ Executor e, Function<Throwable, ? extends T> f) {
if (f == null) throw new NullPointerException();
CompletableFuture<T> d = newIncompleteFuture();
Object r;
if ((r = result) == null)
- unipush(new UniExceptionally<T>(d, this, f));
+ unipush(new UniExceptionally<T>(e, d, this, f));
+ else if (e == null)
+ d.uniExceptionally(r, f, null);
+ else {
+ try {
+ e.execute(new UniExceptionally<T>(null, d, this, f));
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
+ }
+ return d;
+ }
+
+ @SuppressWarnings("serial")
+ static final class UniComposeExceptionally<T> extends UniCompletion<T,T> {
+ Function<Throwable, ? extends CompletionStage<T>> fn;
+ UniComposeExceptionally(Executor executor, CompletableFuture<T> dep,
+ CompletableFuture<T> src,
+ Function<Throwable, ? extends CompletionStage<T>> fn) {
+ super(executor, dep, src); this.fn = fn;
+ }
+ final CompletableFuture<T> tryFire(int mode) {
+ CompletableFuture<T> d; CompletableFuture<T> a;
+ Function<Throwable, ? extends CompletionStage<T>> f;
+ Object r; Throwable x;
+ if ((d = dep) == null || (f = fn) == null
+ || (a = src) == null || (r = a.result) == null)
+ return null;
+ if (d.result == null) {
+ if ((r instanceof AltResult) &&
+ (x = ((AltResult)r).ex) != null) {
+ try {
+ if (mode <= 0 && !claim())
+ return null;
+ CompletableFuture<T> g = f.apply(x).toCompletableFuture();
+ if ((r = g.result) != null)
+ d.completeRelay(r);
+ else {
+ g.unipush(new UniRelay<T,T>(d, g));
+ if (d.result == null)
+ return null;
+ }
+ } catch (Throwable ex) {
+ d.completeThrowable(ex);
+ }
+ }
+ else
+ d.internalComplete(r);
+ }
+ dep = null; src = null; fn = null;
+ return d.postFire(a, mode);
+ }
+ }
+
+ private CompletableFuture<T> uniComposeExceptionallyStage(
+ Executor e, Function<Throwable, ? extends CompletionStage<T>> f) {
+ if (f == null) throw new NullPointerException();
+ CompletableFuture<T> d = newIncompleteFuture();
+ Object r, s; Throwable x;
+ if ((r = result) == null)
+ unipush(new UniComposeExceptionally<T>(e, d, this, f));
+ else if (!(r instanceof AltResult) || (x = ((AltResult)r).ex) == null)
+ d.internalComplete(r);
else
- d.uniExceptionally(r, f, null);
+ try {
+ if (e != null)
+ e.execute(new UniComposeExceptionally<T>(null, d, this, f));
+ else {
+ CompletableFuture<T> g = f.apply(x).toCompletableFuture();
+ if ((s = g.result) != null)
+ d.result = encodeRelay(s);
+ else
+ g.unipush(new UniRelay<T,T>(d, g));
+ }
+ } catch (Throwable ex) {
+ d.result = encodeThrowable(ex);
+ }
return d;
}
@@ -1093,7 +1167,7 @@
Object r, s; Throwable x;
if ((r = result) == null)
unipush(new UniCompose<T,V>(e, d, this, f));
- else if (e == null) {
+ else {
if (r instanceof AltResult) {
if ((x = ((AltResult)r).ex) != null) {
d.result = encodeThrowable(x, r);
@@ -1102,23 +1176,20 @@
r = null;
}
try {
- @SuppressWarnings("unchecked") T t = (T) r;
- CompletableFuture<V> g = f.apply(t).toCompletableFuture();
- if ((s = g.result) != null)
- d.result = encodeRelay(s);
+ if (e != null)
+ e.execute(new UniCompose<T,V>(null, d, this, f));
else {
- g.unipush(new UniRelay<V,V>(d, g));
+ @SuppressWarnings("unchecked") T t = (T) r;
+ CompletableFuture<V> g = f.apply(t).toCompletableFuture();
+ if ((s = g.result) != null)
+ d.result = encodeRelay(s);
+ else
+ g.unipush(new UniRelay<V,V>(d, g));
}
} catch (Throwable ex) {
d.result = encodeThrowable(ex);
}
}
- else
- try {
- e.execute(new UniCompose<T,V>(null, d, this, f));
- } catch (Throwable ex) {
- d.result = encodeThrowable(ex);
- }
return d;
}
@@ -1898,7 +1969,7 @@
* Creates a new complete CompletableFuture with given encoded result.
*/
CompletableFuture(Object r) {
- this.result = r;
+ RESULT.setRelease(this, r);
}
/**
@@ -2285,28 +2356,36 @@
return this;
}
- // not in interface CompletionStage
-
- /**
- * Returns a new CompletableFuture that is completed when this
- * CompletableFuture completes, with the result of the given
- * function of the exception triggering this CompletableFuture's
- * completion when it completes exceptionally; otherwise, if this
- * CompletableFuture completes normally, then the returned
- * CompletableFuture also completes normally with the same value.
- * Note: More flexible versions of this functionality are
- * available using methods {@code whenComplete} and {@code handle}.
- *
- * @param fn the function to use to compute the value of the
- * returned CompletableFuture if this CompletableFuture completed
- * exceptionally
- * @return the new CompletableFuture
- */
public CompletableFuture<T> exceptionally(
Function<Throwable, ? extends T> fn) {
- return uniExceptionallyStage(fn);
+ return uniExceptionallyStage(null, fn);
+ }
+
+ public CompletableFuture<T> exceptionallyAsync(
+ Function<Throwable, ? extends T> fn) {
+ return uniExceptionallyStage(defaultExecutor(), fn);
+ }
+
+ public CompletableFuture<T> exceptionallyAsync(
+ Function<Throwable, ? extends T> fn, Executor executor) {
+ return uniExceptionallyStage(screenExecutor(executor), fn);
}
+ public CompletableFuture<T> exceptionallyCompose(
+ Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return uniComposeExceptionallyStage(null, fn);
+ }
+
+ public CompletableFuture<T> exceptionallyComposeAsync(
+ Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return uniComposeExceptionallyStage(defaultExecutor(), fn);
+ }
+
+ public CompletableFuture<T> exceptionallyComposeAsync(
+ Function<Throwable, ? extends CompletionStage<T>> fn,
+ Executor executor) {
+ return uniComposeExceptionallyStage(screenExecutor(executor), fn);
+ }
/* ------------- Arbitrary-arity constructions -------------- */
--- a/src/java.base/share/classes/java/util/concurrent/CompletionStage.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/classes/java/util/concurrent/CompletionStage.java Mon Oct 01 09:56:45 2018 +0100
@@ -851,6 +851,130 @@
(Function<Throwable, ? extends T> fn);
/**
+ * Returns a new CompletionStage that, when this stage completes
+ * exceptionally, is executed with this stage's exception as the
+ * argument to the supplied function, using this stage's default
+ * asynchronous execution facility. Otherwise, if this stage
+ * completes normally, then the returned stage also completes
+ * normally with the same value.
+ *
+ * @implSpec The default implementation invokes {@link #handle},
+ * relaying to {@link #handleAsync} on exception, then {@link
+ * #thenCompose} for result.
+ *
+ * @param fn the function to use to compute the value of the
+ * returned CompletionStage if this CompletionStage completed
+ * exceptionally
+ * @return the new CompletionStage
+ * @since 12
+ */
+ public default CompletionStage<T> exceptionallyAsync
+ (Function<Throwable, ? extends T> fn) {
+ return handle((r, ex) -> (ex == null)
+ ? this
+ : this.<T>handleAsync((r1, ex1) -> fn.apply(ex1)))
+ .thenCompose(Function.identity());
+ }
+
+ /**
+ * Returns a new CompletionStage that, when this stage completes
+ * exceptionally, is executed with this stage's exception as the
+ * argument to the supplied function, using the supplied Executor.
+ * Otherwise, if this stage completes normally, then the returned
+ * stage also completes normally with the same value.
+ *
+ * @implSpec The default implementation invokes {@link #handle},
+ * relaying to {@link #handleAsync} on exception, then {@link
+ * #thenCompose} for result.
+ *
+ * @param fn the function to use to compute the value of the
+ * returned CompletionStage if this CompletionStage completed
+ * exceptionally
+ * @param executor the executor to use for asynchronous execution
+ * @return the new CompletionStage
+ * @since 12
+ */
+ public default CompletionStage<T> exceptionallyAsync
+ (Function<Throwable, ? extends T> fn, Executor executor) {
+ return handle((r, ex) -> (ex == null)
+ ? this
+ : this.<T>handleAsync((r1, ex1) -> fn.apply(ex1), executor))
+ .thenCompose(Function.identity());
+ }
+
+ /**
+ * Returns a new CompletionStage that, when this stage completes
+ * exceptionally, is composed using the results of the supplied
+ * function applied to this stage's exception.
+ *
+ * @implSpec The default implementation invokes {@link #handle},
+ * invoking the given function on exception, then {@link
+ * #thenCompose} for result.
+ *
+ * @param fn the function to use to compute the returned
+ * CompletionStage if this CompletionStage completed exceptionally
+ * @return the new CompletionStage
+ * @since 12
+ */
+ public default CompletionStage<T> exceptionallyCompose
+ (Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return handle((r, ex) -> (ex == null)
+ ? this
+ : fn.apply(ex))
+ .thenCompose(Function.identity());
+ }
+
+ /**
+ * Returns a new CompletionStage that, when this stage completes
+ * exceptionally, is composed using the results of the supplied
+ * function applied to this stage's exception, using this stage's
+ * default asynchronous execution facility.
+ *
+ * @implSpec The default implementation invokes {@link #handle},
+ * relaying to {@link #handleAsync} on exception, then {@link
+ * #thenCompose} for result.
+ *
+ * @param fn the function to use to compute the returned
+ * CompletionStage if this CompletionStage completed exceptionally
+ * @return the new CompletionStage
+ * @since 12
+ */
+ public default CompletionStage<T> exceptionallyComposeAsync
+ (Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return handle((r, ex) -> (ex == null)
+ ? this
+ : this.handleAsync((r1, ex1) -> fn.apply(ex1))
+ .thenCompose(Function.identity()))
+ .thenCompose(Function.identity());
+ }
+
+ /**
+ * Returns a new CompletionStage that, when this stage completes
+ * exceptionally, is composed using the results of the supplied
+ * function applied to this stage's exception, using the
+ * supplied Executor.
+ *
+ * @implSpec The default implementation invokes {@link #handle},
+ * relaying to {@link #handleAsync} on exception, then {@link
+ * #thenCompose} for result.
+ *
+ * @param fn the function to use to compute the returned
+ * CompletionStage if this CompletionStage completed exceptionally
+ * @param executor the executor to use for asynchronous execution
+ * @return the new CompletionStage
+ * @since 12
+ */
+ public default CompletionStage<T> exceptionallyComposeAsync
+ (Function<Throwable, ? extends CompletionStage<T>> fn,
+ Executor executor) {
+ return handle((r, ex) -> (ex == null)
+ ? this
+ : this.handleAsync((r1, ex1) -> fn.apply(ex1), executor)
+ .thenCompose(Function.identity()))
+ .thenCompose(Function.identity());
+ }
+
+ /**
* Returns a {@link CompletableFuture} maintaining the same
* completion properties as this stage. If this stage is already a
* CompletableFuture, this method may return this stage itself.
--- a/src/java.base/share/classes/module-info.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/classes/module-info.java Mon Oct 01 09:56:45 2018 +0100
@@ -234,7 +234,6 @@
jdk.jconsole,
java.net.http;
exports sun.net.www to
- java.desktop,
java.net.http,
jdk.jartool;
exports sun.net.www.protocol.http to
--- a/src/java.base/share/lib/security/default.policy Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/lib/security/default.policy Mon Oct 01 09:56:45 2018 +0100
@@ -140,10 +140,6 @@
permission java.io.FilePermission "<<ALL FILES>>", "read";
};
-grant codeBase "jrt:/jdk.desktop" {
- permission java.lang.RuntimePermission "accessClassInPackage.com.sun.awt";
-};
-
grant codeBase "jrt:/jdk.dynalink" {
permission java.security.AllPermission;
};
--- a/src/java.base/share/native/libjli/args.c Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/share/native/libjli/args.c Mon Oct 01 09:56:45 2018 +0100
@@ -263,6 +263,8 @@
}
JLI_List_addSubstring(pctx->parts, anchor, nextc - anchor);
pctx->state = IN_ESCAPE;
+ // anchor after backslash character
+ anchor = nextc + 1;
break;
case '\'':
case '"':
--- a/src/java.base/windows/native/libjava/java_props_md.c Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.base/windows/native/libjava/java_props_md.c Mon Oct 01 09:56:45 2018 +0100
@@ -170,6 +170,10 @@
return NULL;
}
+ for (index = 0; index < 5; index++) {
+ elems[index] = NULL;
+ }
+
if (SetupI18nProps(MAKELCID(langID, SORT_DEFAULT),
&(elems[0]), &(elems[1]), &(elems[2]), &(elems[3]), &(elems[4]))) {
@@ -183,15 +187,17 @@
strcat(ret, elems[index]);
}
}
-
- for (index = 0; index < 5; index++) {
- free(elems[index]);
- }
} else {
free(ret);
ret = NULL;
}
+ for (index = 0; index < 5; index++) {
+ if (elems[index] != NULL) {
+ free(elems[index]);
+ }
+ }
+
return ret;
}
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java Mon Oct 01 09:56:45 2018 +0100
@@ -46,6 +46,7 @@
private static native void nativeSetMenuState(final int menu, final boolean visible, final boolean enabled);
private static native void nativeSetDefaultMenuBar(final long menuBarPeer);
+ private static native void nativeActivateDefaultMenuBar(final long menuBarPeer);
static final _AppMenuBarHandler instance = new _AppMenuBarHandler();
static _AppMenuBarHandler getInstance() {
@@ -78,26 +79,18 @@
void setDefaultMenuBar(final JMenuBar menuBar) {
installDefaultMenuBar(menuBar);
- if (menuBar == null) {
- return;
- }
+ }
+ static boolean isMenuBarActivationNeeded() {
// scan the current frames, and see if any are foreground
final Frame[] frames = Frame.getFrames();
for (final Frame frame : frames) {
if (frame.isVisible() && !isFrameMinimized(frame)) {
- return;
+ return false;
}
}
- // if we have no foreground frames, then we have to "kick" the menubar
- final JFrame pingFrame = new JFrame();
- pingFrame.getRootPane().putClientProperty("Window.alpha", Float.valueOf(0.0f));
- pingFrame.setUndecorated(true);
- pingFrame.setVisible(true);
- pingFrame.toFront();
- pingFrame.setVisible(false);
- pingFrame.dispose();
+ return true;
}
static boolean isFrameMinimized(final Frame frame) {
@@ -150,6 +143,11 @@
// grab the pointer to the CMenuBar, and retain it in native
((CMenuBar) peer).execute(_AppMenuBarHandler::nativeSetDefaultMenuBar);
+
+ // if there is no currently active frame, install the default menu bar in the application main menu
+ if (isMenuBarActivationNeeded()) {
+ ((CMenuBar) peer).execute(_AppMenuBarHandler::nativeActivateDefaultMenuBar);
+ }
}
void setAboutMenuItemVisible(final boolean present) {
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -506,12 +506,6 @@
private SparseBitShiftingTwoLayerArray secondLayerCache;
private HashMap<Integer, Float> generalCache;
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- GlyphAdvanceCache() {
- super();
- }
-
public synchronized float get(final int index) {
if (index < 0) {
if (-index < SECOND_LAYER_SIZE) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWButtonPeer.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -81,12 +81,6 @@
@SuppressWarnings("serial")// Safe: outer class is non-serializable.
private final class JButtonDelegate extends JButton {
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- JButtonDelegate() {
- super();
- }
-
@Override
public boolean hasFocus() {
return getTarget().hasFocus();
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -135,12 +135,6 @@
@SuppressWarnings("serial")// Safe: outer class is non-serializable.
private final class JComboBoxDelegate extends JComboBox<String> {
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- JComboBoxDelegate() {
- super();
- }
-
@Override
public boolean hasFocus() {
return getTarget().hasFocus();
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -159,12 +159,6 @@
enableEvents(0xFFFFFFFF);
}
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- DelegateContainer() {
- super();
- }
-
@Override
public boolean isLightweight() {
return false;
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWTextAreaPeer.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -219,12 +219,6 @@
private final class JTextAreaDelegate extends JTextArea {
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- JTextAreaDelegate() {
- super();
- }
-
@Override
public void replaceSelection(String content) {
getDocument().removeDocumentListener(LWTextAreaPeer.this);
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWTextFieldPeer.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,12 +122,6 @@
@SuppressWarnings("serial")// Safe: outer class is non-serializable.
private final class JPasswordFieldDelegate extends JPasswordField {
- // Empty non private constructor was added because access to this
- // class shouldn't be emulated by a synthetic accessor method.
- JPasswordFieldDelegate() {
- super();
- }
-
@Override
public void replaceSelection(String content) {
getDocument().removeDocumentListener(LWTextFieldPeer.this);
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Mon Oct 01 09:56:45 2018 +0100
@@ -165,8 +165,6 @@
: this;
}
}
- // ignore focus "lost" native request as it may mistakenly
- // deactivate active window (see 8001161)
if (globalFocusedWindow == this) {
responder.handleWindowFocusEvent(parentWindowActive, null);
}
@@ -181,4 +179,19 @@
// another window.
return globalFocusedWindow != null ? !globalFocusedWindow.isParentWindowActive() : true;
}
+
+ @Override
+ public void synthesizeWindowActivation(boolean doActivate) {
+ if (isParentWindowActive() != doActivate) {
+ handleWindowFocusEvent(doActivate);
+ }
+ }
+
+ public static void updateGlobalFocusedWindow(CEmbeddedFrame newGlobalFocusedWindow) {
+ synchronized (classLock) {
+ if (newGlobalFocusedWindow.isParentWindowActive()) {
+ globalFocusedWindow = newGlobalFocusedWindow;
+ }
+ }
+ }
}
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java Mon Oct 01 09:56:45 2018 +0100
@@ -147,6 +147,8 @@
@Override
public boolean requestWindowFocus() {
+ CEmbeddedFrame.updateGlobalFocusedWindow(target);
+ target.synthesizeWindowActivation(true);
return true;
}
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Oct 01 09:56:45 2018 +0100
@@ -1205,17 +1205,27 @@
}
private void orderAboveSiblings() {
- // Recursively pop up the windows from the very bottom, (i.e. root owner) so that
- // the windows are ordered above their nearest owner; ancestors of the window,
- // which is going to become 'main window', are placed above their siblings.
CPlatformWindow rootOwner = getRootOwner();
- if (rootOwner.isVisible() && !rootOwner.isIconified()) {
- rootOwner.execute(CWrapper.NSWindow::orderFront);
- }
+
// Do not order child windows of iconified owner.
if (!rootOwner.isIconified()) {
final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor();
- orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target));
+ Window[] windows = windowAccessor.getOwnedWindows(rootOwner.target);
+
+ // No need to order windows if it doesn't own other windows and hence return
+ if (windows.length == 0) {
+ return;
+ }
+
+ // Recursively pop up the windows from the very bottom, (i.e. root owner) so that
+ // the windows are ordered above their nearest owner; ancestors of the window,
+ // which is going to become 'main window', are placed above their siblings.
+ if (rootOwner.isVisible()) {
+ rootOwner.execute(CWrapper.NSWindow::orderFront);
+ }
+
+ // Order child windows.
+ orderAboveSiblingsImpl(windows);
}
}
@@ -1276,6 +1286,21 @@
}
}
+ private Window getOwnerFrameOrDialog(Window window) {
+ Window owner = window.getOwner();
+ while (owner != null && !(owner instanceof Frame || owner instanceof Dialog)) {
+ owner = owner.getOwner();
+ }
+ return owner;
+ }
+
+ private boolean isSimpleWindowOwnedByEmbeddedFrame() {
+ if (peer != null && peer.isSimpleWindow()) {
+ return (getOwnerFrameOrDialog(target) instanceof CEmbeddedFrame);
+ }
+ return false;
+ }
+
// ----------------------------------------------------------------------
// NATIVE CALLBACKS
// ----------------------------------------------------------------------
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m Mon Oct 01 09:56:45 2018 +0100
@@ -537,10 +537,14 @@
}
-(BOOL) isCodePointInUnicodeBlockNeedingIMEvent: (unichar) codePoint {
- if (((codePoint >= 0x3000) && (codePoint <= 0x303F)) ||
+ if ((codePoint == 0x0024) || (codePoint == 0x00A3) ||
+ (codePoint == 0x00A5) ||
+ ((codePoint >= 0x20A3) && (codePoint <= 0x20BF)) ||
+ ((codePoint >= 0x3000) && (codePoint <= 0x303F)) ||
((codePoint >= 0xFF00) && (codePoint <= 0xFFEF))) {
// Code point is in 'CJK Symbols and Punctuation' or
- // 'Halfwidth and Fullwidth Forms' Unicode block.
+ // 'Halfwidth and Fullwidth Forms' Unicode block or
+ // currency symbols unicode
return YES;
}
return NO;
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m Mon Oct 01 09:56:45 2018 +0100
@@ -477,6 +477,21 @@
return isBlocked;
}
+// Test whether window is simple window and owned by embedded frame
+- (BOOL) isSimpleWindowOwnedByEmbeddedFrame {
+ BOOL isSimpleWindowOwnedByEmbeddedFrame = NO;
+
+ JNIEnv *env = [ThreadUtilities getJNIEnv];
+ jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
+ if (platformWindow != NULL) {
+ static JNF_MEMBER_CACHE(jm_isBlocked, jc_CPlatformWindow, "isSimpleWindowOwnedByEmbeddedFrame", "()Z");
+ isSimpleWindowOwnedByEmbeddedFrame = JNFCallBooleanMethod(env, platformWindow, jm_isBlocked) == JNI_TRUE ? YES : NO;
+ (*env)->DeleteLocalRef(env, platformWindow);
+ }
+
+ return isSimpleWindowOwnedByEmbeddedFrame;
+}
+
// Tests whether the corresponding Java platform window is visible or not
+ (BOOL) isJavaPlatformWindowVisible:(NSWindow *)window {
BOOL isVisible = NO;
@@ -543,7 +558,7 @@
// NSWindow overrides
- (BOOL) canBecomeKeyWindow {
AWT_ASSERT_APPKIT_THREAD;
- return self.isEnabled && IS(self.styleBits, SHOULD_BECOME_KEY);
+ return self.isEnabled && (IS(self.styleBits, SHOULD_BECOME_KEY) || [self isSimpleWindowOwnedByEmbeddedFrame]);
}
- (BOOL) canBecomeMainWindow {
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -35,10 +35,10 @@
#import <JavaNativeFoundation/JavaNativeFoundation.h>
#import "CPopupMenu.h"
+#import "CMenuBar.h"
#import "ThreadUtilities.h"
#import "NSApplicationAWT.h"
-
#pragma mark App Menu helpers
// The following is a AWT convention?
@@ -201,11 +201,11 @@
self.fPreferencesMenu = (NSMenuItem*)[appMenu itemWithTag:PREFERENCES_TAG];
self.fAboutMenu = (NSMenuItem*)[appMenu itemAtIndex:0];
-
+
NSDockTile *dockTile = [NSApp dockTile];
self.fProgressIndicator = [[NSProgressIndicator alloc]
initWithFrame:NSMakeRect(3.f, 0.f, dockTile.size.width - 6.f, 20.f)];
-
+
[fProgressIndicator setStyle:NSProgressIndicatorBarStyle];
[fProgressIndicator setIndeterminate:NO];
[[dockTile contentView] addSubview:fProgressIndicator];
@@ -824,3 +824,23 @@
JNF_COCOA_EXIT(env);
}
+
+/*
+ * Class: com_apple_eawt__AppMenuBarHandler
+ * Method: nativeActivateDefaultMenuBar
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeActivateDefaultMenuBar
+(JNIEnv *env, jclass clz, jlong cMenuBarPtr)
+{
+JNF_COCOA_ENTER(env);
+
+ CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr);
+ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
+ if (menu) {
+ [CMenuBar activate:menu modallyDisabled:NO];
+ }
+ }];
+
+JNF_COCOA_EXIT(env);
+}
--- a/src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2008, 2018, 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 com.sun.awt;
-
-import java.awt.*;
-import java.awt.geom.*;
-
-import sun.awt.AWTAccessor;
-
-
-/**
- * Security Warning control interface.
- *
- * This class provides a couple of methods that help a developer relocate
- * the AWT security warning to an appropriate position relative to the current
- * window size. A "top-level window" is an instance of the {@code Window}
- * class (or its descendant, such as {@code JFrame}). The security warning
- * is applied to all windows created by an untrusted code. All such windows
- * have a non-null "warning string" (see {@link Window#getWarningString()}).
- * <p>
- * <b>WARNING</b>: This class is an implementation detail and only meant
- * for limited use outside of the core platform. This API may change
- * drastically between update release, and it may even be
- * removed or be moved to some other packages or classes.
- *
- * @deprecated This class is deprecated, no replacement.
- */
-@Deprecated(since = "11", forRemoval = true)
-public final class SecurityWarning {
-
- /**
- * The SecurityWarning class should not be instantiated
- */
- private SecurityWarning() {
- }
-
- /**
- * Gets the size of the security warning.
- *
- * The returned value is not valid until the peer has been created. Before
- * invoking this method a developer must call the {@link Window#pack()},
- * {@link Window#setVisible}, or some other method that creates the peer.
- *
- * @param window the window to get the security warning size for
- *
- * @throws NullPointerException if the window argument is null
- * @throws IllegalArgumentException if the window is trusted (i.e.
- * the {@code getWarningString()} returns null)
- */
- public static Dimension getSize(Window window) {
- if (window == null) {
- throw new NullPointerException(
- "The window argument should not be null.");
- }
- if (window.getWarningString() == null) {
- throw new IllegalArgumentException(
- "The window must have a non-null warning string.");
- }
- // We don't check for a non-null peer since it may be destroyed
- // after assigning a valid value to the security warning size.
-
- return AWTAccessor.getWindowAccessor().getSecurityWarningSize(window);
- }
-
- /**
- * Sets the position of the security warning.
- * <p>
- * The {@code alignmentX} and {@code alignmentY} arguments specify the
- * origin of the coordinate system used to calculate the position of the
- * security warning. The values must be in the range [0.0f...1.0f]. The
- * {@code 0.0f} value represents the left (top) edge of the rectangular
- * bounds of the window. The {@code 1.0f} value represents the right
- * (bottom) edge of the bounds. Whenever the size of the window changes,
- * the origin of the coordinate system gets relocated accordingly. For
- * convenience a developer may use the {@code Component.*_ALIGNMENT}
- * constants to pass predefined values for these arguments.
- * <p>
- * The {@code point} argument specifies the location of the security
- * warning in the coordinate system described above. If both {@code x} and
- * {@code y} coordinates of the point are equal to zero, the warning will
- * be located right in the origin of the coordinate system. On the other
- * hand, if both {@code alignmentX} and {@code alignmentY} are equal to
- * zero (i.e. the origin of the coordinate system is placed at the top-left
- * corner of the window), then the {@code point} argument represents the
- * absolute location of the security warning relative to the location of
- * the window. The "absolute" in this case means that the position of the
- * security warning is not effected by resizing of the window.
- * <p>
- * Note that the security warning management code guarantees that:
- * <ul>
- * <li>The security warning cannot be located farther than two pixels from
- * the rectangular bounds of the window (see {@link Window#getBounds}), and
- * <li>The security warning is always visible on the screen.
- * </ul>
- * If either of the conditions is violated, the calculated position of the
- * security warning is adjusted by the system to meet both these
- * conditions.
- * <p>
- * The default position of the security warning is in the upper-right
- * corner of the window, two pixels to the right from the right edge. This
- * corresponds to the following arguments passed to this method:
- * <ul>
- * <li>{@code alignmentX = Component.RIGHT_ALIGNMENT}
- * <li>{@code alignmentY = Component.TOP_ALIGNMENT}
- * <li>{@code point = (2, 0)}
- * </ul>
- *
- * @param window the window to set the position of the security warning for
- * @param alignmentX the horizontal origin of the coordinate system
- * @param alignmentY the vertical origin of the coordinate system
- * @param point the position of the security warning in the specified
- * coordinate system
- *
- * @throws NullPointerException if the window argument is null
- * @throws NullPointerException if the point argument is null
- * @throws IllegalArgumentException if the window is trusted (i.e.
- * the {@code getWarningString()} returns null
- * @throws IllegalArgumentException if the alignmentX or alignmentY
- * arguments are not within the range [0.0f ... 1.0f]
- */
- public static void setPosition(Window window, Point2D point,
- float alignmentX, float alignmentY)
- {
- if (window == null) {
- throw new NullPointerException(
- "The window argument should not be null.");
- }
- if (window.getWarningString() == null) {
- throw new IllegalArgumentException(
- "The window must have a non-null warning string.");
- }
- if (point == null) {
- throw new NullPointerException(
- "The point argument must not be null");
- }
- if (alignmentX < 0.0f || alignmentX > 1.0f) {
- throw new IllegalArgumentException(
- "alignmentX must be in the range [0.0f ... 1.0f].");
- }
- if (alignmentY < 0.0f || alignmentY > 1.0f) {
- throw new IllegalArgumentException(
- "alignmentY must be in the range [0.0f ... 1.0f].");
- }
-
- AWTAccessor.getWindowAccessor().setSecurityWarningPosition(window,
- point, alignmentX, alignmentY);
- }
-}
-
--- a/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -547,14 +547,15 @@
getEventDispatcher().addLineMonitor(this);
}
- doIO = true;
-
- // need to set Active and Started
- // note: the current API always requires that
- // Started and Active are set at the same time...
- if (isSource && stoppedWritten) {
- setStarted(true);
- setActive(true);
+ synchronized(lock) {
+ doIO = true;
+ // need to set Active and Started
+ // note: the current API always requires that
+ // Started and Active are set at the same time...
+ if (isSource && stoppedWritten) {
+ setStarted(true);
+ setActive(true);
+ }
}
if (Printer.trace) Printer.trace("<< DirectDL: implStart() succeeded");
@@ -582,10 +583,10 @@
// read/write thread, that's why isStartedRunning()
// cannot be used
doIO = false;
+ setActive(false);
+ setStarted(false);
lock.notifyAll();
}
- setActive(false);
- setStarted(false);
stoppedWritten = false;
if (Printer.trace) Printer.trace(" << DirectDL: implStop() succeeded");
@@ -731,12 +732,14 @@
if ((long)off + (long)len > (long)b.length) {
throw new ArrayIndexOutOfBoundsException(b.length);
}
-
- if (!isActive() && doIO) {
- // this is not exactly correct... would be nicer
- // if the native sub system sent a callback when IO really starts
- setActive(true);
- setStarted(true);
+ synchronized(lock) {
+ if (!isActive() && doIO) {
+ // this is not exactly correct... would be nicer
+ // if the native sub system sent a callback when IO really
+ // starts
+ setActive(true);
+ setStarted(true);
+ }
}
int written = 0;
while (!flushing) {
@@ -957,11 +960,14 @@
if ((long)off + (long)len > (long)b.length) {
throw new ArrayIndexOutOfBoundsException(b.length);
}
- if (!isActive() && doIO) {
- // this is not exactly correct... would be nicer
- // if the native sub system sent a callback when IO really starts
- setActive(true);
- setStarted(true);
+ synchronized(lock) {
+ if (!isActive() && doIO) {
+ // this is not exactly correct... would be nicer
+ // if the native sub system sent a callback when IO really
+ // starts
+ setActive(true);
+ setStarted(true);
+ }
}
int read = 0;
while (doIO && !flushing) {
--- a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -169,18 +169,9 @@
String nm = System.getProperty("java.awt.headless");
if (nm == null) {
- /* No need to ask for DISPLAY when run in a browser */
- if (System.getProperty("javaplugin.version") != null) {
- headless = defaultHeadless = Boolean.FALSE;
- } else {
- String osName = System.getProperty("os.name");
- if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
- System.getProperty("awt.toolkit")))
- {
- headless = defaultHeadless = Boolean.TRUE;
- } else {
- final String display = System.getenv("DISPLAY");
- headless = defaultHeadless =
+ final String osName = System.getProperty("os.name");
+ final String display = System.getenv("DISPLAY");
+ headless = defaultHeadless =
("Linux".equals(osName) ||
"SunOS".equals(osName) ||
"FreeBSD".equals(osName) ||
@@ -188,8 +179,6 @@
"OpenBSD".equals(osName) ||
"AIX".equals(osName)) &&
(display == null || display.trim().isEmpty());
- }
- }
} else {
headless = Boolean.valueOf(nm);
}
--- a/src/java.desktop/share/classes/java/awt/Window.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/java/awt/Window.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -394,16 +394,6 @@
private transient volatile int securityWarningWidth = 0;
private transient volatile int securityWarningHeight = 0;
- /**
- * These fields represent the desired location for the security
- * warning if this window is untrusted.
- * See com.sun.awt.SecurityWarning for more details.
- */
- private transient double securityWarningPointX = 2.0;
- private transient double securityWarningPointY = 0.0;
- private transient float securityWarningAlignmentX = RIGHT_ALIGNMENT;
- private transient float securityWarningAlignmentY = TOP_ALIGNMENT;
-
static {
/* ensure that the necessary native libraries are loaded */
Toolkit.loadLibraries();
@@ -3127,10 +3117,6 @@
this.securityWarningWidth = 0;
this.securityWarningHeight = 0;
- this.securityWarningPointX = 2.0;
- this.securityWarningPointY = 0.0;
- this.securityWarningAlignmentX = RIGHT_ALIGNMENT;
- this.securityWarningAlignmentY = TOP_ALIGNMENT;
deserializeResources(s);
}
@@ -4031,9 +4017,9 @@
private Point2D calculateSecurityWarningPosition(double x, double y,
double w, double h)
{
- // The position according to the spec of SecurityWarning.setPosition()
- double wx = x + w * securityWarningAlignmentX + securityWarningPointX;
- double wy = y + h * securityWarningAlignmentY + securityWarningPointY;
+ // The desired location for the security warning
+ double wx = x + w * RIGHT_ALIGNMENT + 2.0;
+ double wy = y + h * TOP_ALIGNMENT + 0.0;
// First, make sure the warning is not too far from the window bounds
wx = Window.limit(wx,
@@ -4068,33 +4054,12 @@
window.updateWindow();
}
- public Dimension getSecurityWarningSize(Window window) {
- return new Dimension(window.securityWarningWidth,
- window.securityWarningHeight);
- }
-
public void setSecurityWarningSize(Window window, int width, int height)
{
window.securityWarningWidth = width;
window.securityWarningHeight = height;
}
- public void setSecurityWarningPosition(Window window,
- Point2D point, float alignmentX, float alignmentY)
- {
- window.securityWarningPointX = point.getX();
- window.securityWarningPointY = point.getY();
- window.securityWarningAlignmentX = alignmentX;
- window.securityWarningAlignmentY = alignmentY;
-
- synchronized (window.getTreeLock()) {
- WindowPeer peer = (WindowPeer) window.peer;
- if (peer != null) {
- peer.repositionSecurityWarning();
- }
- }
- }
-
public Point2D calculateSecurityWarningPosition(Window window,
double x, double y, double w, double h)
{
--- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1814,12 +1814,6 @@
*/
private static final class DisplayChangedHandler implements
DisplayChangedListener {
- // Empty non private constructor was added because access to this
- // class shouldn't be generated by the compiler using synthetic
- // accessor method
- DisplayChangedHandler() {
- }
-
public void displayChanged() {
scheduleDisplayChanges();
}
--- a/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java Mon Oct 01 09:56:45 2018 +0100
@@ -42,6 +42,8 @@
import javax.swing.UIManager;
import javax.swing.plaf.basic.BasicHTML;
+import jdk.internal.ref.CleanerFactory;
+
/**
* A class which implements an arbitrary border
* with the addition of a String title in a
@@ -759,22 +761,19 @@
private void installPropertyChangeListeners() {
final WeakReference<TitledBorder> weakReference = new WeakReference<TitledBorder>(this);
- final PropertyChangeListener listener = new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if (weakReference.get() == null) {
- UIManager.removePropertyChangeListener(this);
- UIManager.getDefaults().removePropertyChangeListener(this);
- } else {
- String prop = evt.getPropertyName();
- if ("lookAndFeel".equals(prop) || "LabelUI".equals(prop)) {
- label.updateUI();
- }
- }
+ final PropertyChangeListener listener = evt -> {
+ TitledBorder tb = weakReference.get();
+ String prop = evt.getPropertyName();
+ if (tb != null && ("lookAndFeel".equals(prop) || "LabelUI".equals(prop))) {
+ tb.label.updateUI();
}
};
UIManager.addPropertyChangeListener(listener);
UIManager.getDefaults().addPropertyChangeListener(listener);
+ CleanerFactory.cleaner().register(this, () -> {
+ UIManager.removePropertyChangeListener(listener);
+ UIManager.getDefaults().removePropertyChangeListener(listener);
+ });
}
}
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java Mon Oct 01 09:56:45 2018 +0100
@@ -874,7 +874,7 @@
progressString);
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
- return new Point(x + Math.round(width/2 - stringWidth/2),
+ return new Point(x + (int)Math.round(width/2.0 - stringWidth/2.0),
y + ((height +
fontSizer.getAscent() -
fontSizer.getLeading() -
@@ -882,7 +882,7 @@
} else { // VERTICAL
return new Point(x + ((width - fontSizer.getAscent() +
fontSizer.getLeading() + fontSizer.getDescent()) / 2),
- y + Math.round(height/2 - stringWidth/2));
+ y + (int)Math.round(height/2.0 - stringWidth/2.0));
}
}
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTableUI.java Mon Oct 01 09:56:45 2018 +0100
@@ -1872,7 +1872,12 @@
// and if there is any selected rows
if (rMax != (table.getRowCount() - 1) &&
(table.getSelectedRow() == -1)) {
- rMax = rMax - 1;
+ // Do not decrement rMax if rMax becomes
+ // less than or equal to rMin
+ // else cells will not be painted
+ if (rMax - rMin > 1) {
+ rMax = rMax - 1;
+ }
}
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Mon Oct 01 09:56:45 2018 +0100
@@ -2339,18 +2339,26 @@
*/
void drawShape(Graphics g, CSS.Value type, int ax, int ay, int aw,
int ah, float align) {
- // Align to bottom of shape.
- int gap = isLeftToRight ? - (bulletgap + 8) : (aw + bulletgap);
+ final Object origAA = ((Graphics2D) g).getRenderingHint(
+ RenderingHints.KEY_ANTIALIASING);
+ ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ int size = g.getFont().getSize();
+
+ // Position shape to the middle of the html text.
+ int gap = isLeftToRight ? - (bulletgap + size/3) : (aw + bulletgap);
int x = ax + gap;
- int y = Math.max(ay, ay + (int)(align * ah) - 8);
+ int y = Math.max(ay, ay + (int)Math.ceil(ah/2));
if (type == CSS.Value.SQUARE) {
- g.drawRect(x, y, 8, 8);
+ g.drawRect(x, y, size/3, size/3);
} else if (type == CSS.Value.CIRCLE) {
- g.drawOval(x, y, 8, 8);
+ g.drawOval(x, y, size/3, size/3);
} else {
- g.fillOval(x, y, 8, 8);
+ g.fillOval(x, y, size/3, size/3);
}
+ ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ origAA);
}
/**
--- a/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,854 +0,0 @@
-/*
- * Copyright (c) 1995, 2018, 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 sun.applet;
-
-import java.io.BufferedInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FilePermission;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.NoSuchElementException;
-
-import sun.awt.AppContext;
-import sun.awt.SunToolkit;
-import sun.net.www.ParseUtil;
-import sun.security.util.SecurityConstants;
-
-/**
- * This class defines the class loader for loading applet classes and
- * resources. It extends URLClassLoader to search the applet code base
- * for the class or resource after checking any loaded JAR files.
- */
-public class AppletClassLoader extends URLClassLoader {
- private URL base; /* applet code base URL */
- private CodeSource codesource; /* codesource for the base URL */
- private AccessControlContext acc;
- private boolean exceptionStatus = false;
-
- private final Object threadGroupSynchronizer = new Object();
- private final Object grabReleaseSynchronizer = new Object();
-
- private boolean codebaseLookup = true;
- private volatile boolean allowRecursiveDirectoryRead = true;
-
- /*
- * Creates a new AppletClassLoader for the specified base URL.
- */
- protected AppletClassLoader(URL base) {
- super(new URL[0]);
- this.base = base;
- this.codesource =
- new CodeSource(base, (java.security.cert.Certificate[]) null);
- acc = AccessController.getContext();
- }
-
- public void disableRecursiveDirectoryRead() {
- allowRecursiveDirectoryRead = false;
- }
-
-
- /**
- * Set the codebase lookup flag.
- */
- void setCodebaseLookup(boolean codebaseLookup) {
- this.codebaseLookup = codebaseLookup;
- }
-
- /*
- * Returns the applet code base URL.
- */
- URL getBaseURL() {
- return base;
- }
-
- /*
- * Returns the URLs used for loading classes and resources.
- */
- public URL[] getURLs() {
- URL[] jars = super.getURLs();
- URL[] urls = new URL[jars.length + 1];
- System.arraycopy(jars, 0, urls, 0, jars.length);
- urls[urls.length - 1] = base;
- return urls;
- }
-
- /*
- * Adds the specified JAR file to the search path of loaded JAR files.
- * Changed modifier to protected in order to be able to overwrite addJar()
- * in PluginClassLoader.java
- */
- protected void addJar(String name) throws IOException {
- URL url;
- try {
- url = new URL(base, name);
- } catch (MalformedURLException e) {
- throw new IllegalArgumentException("name");
- }
- addURL(url);
- // DEBUG
- //URL[] urls = getURLs();
- //for (int i = 0; i < urls.length; i++) {
- // System.out.println("url[" + i + "] = " + urls[i]);
- //}
- }
-
- /*
- * Override loadClass so that class loading errors can be caught in
- * order to print better error messages.
- */
- public synchronized Class<?> loadClass(String name, boolean resolve)
- throws ClassNotFoundException
- {
- // First check if we have permission to access the package. This
- // should go away once we've added support for exported packages.
- int i = name.lastIndexOf('.');
- if (i != -1) {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkPackageAccess(name.substring(0, i));
- }
- try {
- return super.loadClass(name, resolve);
- } catch (ClassNotFoundException e) {
- throw e;
- } catch (RuntimeException e) {
- throw e;
- } catch (Error e) {
- throw e;
- }
- }
-
- /*
- * Finds the applet class with the specified name. First searches
- * loaded JAR files then the applet code base for the class.
- */
- protected Class<?> findClass(String name) throws ClassNotFoundException {
-
- int index = name.indexOf(';');
- String cookie = "";
- if(index != -1) {
- cookie = name.substring(index, name.length());
- name = name.substring(0, index);
- }
-
- // check loaded JAR files
- try {
- return super.findClass(name);
- } catch (ClassNotFoundException e) {
- }
-
- // Otherwise, try loading the class from the code base URL
-
- // 4668479: Option to turn off codebase lookup in AppletClassLoader
- // during resource requests. [stanley.ho]
- if (codebaseLookup == false)
- throw new ClassNotFoundException(name);
-
-// final String path = name.replace('.', '/').concat(".class").concat(cookie);
- String encodedName = ParseUtil.encodePath(name.replace('.', '/'), false);
- final String path = (new StringBuffer(encodedName)).append(".class").append(cookie).toString();
- try {
- byte[] b = AccessController.doPrivileged(
- new PrivilegedExceptionAction<byte[]>() {
- public byte[] run() throws IOException {
- try {
- URL finalURL = new URL(base, path);
-
- // Make sure the codebase won't be modified
- if (base.getProtocol().equals(finalURL.getProtocol()) &&
- base.getHost().equals(finalURL.getHost()) &&
- base.getPort() == finalURL.getPort()) {
- return getBytes(finalURL);
- }
- else {
- return null;
- }
- } catch (Exception e) {
- return null;
- }
- }
- }, acc);
-
- if (b != null) {
- return defineClass(name, b, 0, b.length, codesource);
- } else {
- throw new ClassNotFoundException(name);
- }
- } catch (PrivilegedActionException e) {
- throw new ClassNotFoundException(name, e.getException());
- }
- }
-
- /**
- * Returns the permissions for the given codesource object.
- * The implementation of this method first calls super.getPermissions,
- * to get the permissions
- * granted by the super class, and then adds additional permissions
- * based on the URL of the codesource.
- * <p>
- * If the protocol is "file"
- * and the path specifies a file, permission is granted to read all files
- * and (recursively) all files and subdirectories contained in
- * that directory. This is so applets with a codebase of
- * file:/blah/some.jar can read in file:/blah/, which is needed to
- * be backward compatible. We also add permission to connect back to
- * the "localhost".
- *
- * @param codesource the codesource
- * @throws NullPointerException if {@code codesource} is {@code null}.
- * @return the permissions granted to the codesource
- */
- protected PermissionCollection getPermissions(CodeSource codesource)
- {
- final PermissionCollection perms = super.getPermissions(codesource);
-
- URL url = codesource.getLocation();
-
- String path = null;
- Permission p;
-
- try {
- p = url.openConnection().getPermission();
- } catch (java.io.IOException ioe) {
- p = null;
- }
-
- if (p instanceof FilePermission) {
- path = p.getName();
- } else if ((p == null) && (url.getProtocol().equals("file"))) {
- path = url.getFile().replace('/', File.separatorChar);
- path = ParseUtil.decode(path);
- }
-
- if (path != null) {
- final String rawPath = path;
- if (!path.endsWith(File.separator)) {
- int endIndex = path.lastIndexOf(File.separatorChar);
- if (endIndex != -1) {
- path = path.substring(0, endIndex + 1) + "-";
- perms.add(new FilePermission(path,
- SecurityConstants.FILE_READ_ACTION));
- }
- }
- final File f = new File(rawPath);
- final boolean isDirectory = f.isDirectory();
- // grant codebase recursive read permission
- // this should only be granted to non-UNC file URL codebase and
- // the codesource path must either be a directory, or a file
- // that ends with .jar or .zip
- if (allowRecursiveDirectoryRead && (isDirectory ||
- rawPath.toLowerCase().endsWith(".jar") ||
- rawPath.toLowerCase().endsWith(".zip"))) {
-
- Permission bperm;
- try {
- bperm = base.openConnection().getPermission();
- } catch (java.io.IOException ioe) {
- bperm = null;
- }
- if (bperm instanceof FilePermission) {
- String bpath = bperm.getName();
- if (bpath.endsWith(File.separator)) {
- bpath += "-";
- }
- perms.add(new FilePermission(bpath,
- SecurityConstants.FILE_READ_ACTION));
- } else if ((bperm == null) && (base.getProtocol().equals("file"))) {
- String bpath = base.getFile().replace('/', File.separatorChar);
- bpath = ParseUtil.decode(bpath);
- if (bpath.endsWith(File.separator)) {
- bpath += "-";
- }
- perms.add(new FilePermission(bpath, SecurityConstants.FILE_READ_ACTION));
- }
-
- }
- }
- return perms;
- }
-
- /*
- * Returns the contents of the specified URL as an array of bytes.
- */
- private static byte[] getBytes(URL url) throws IOException {
- URLConnection uc = url.openConnection();
- if (uc instanceof java.net.HttpURLConnection) {
- java.net.HttpURLConnection huc = (java.net.HttpURLConnection) uc;
- int code = huc.getResponseCode();
- if (code >= java.net.HttpURLConnection.HTTP_BAD_REQUEST) {
- throw new IOException("open HTTP connection failed.");
- }
- }
- int len = uc.getContentLength();
-
- // Fixed #4507227: Slow performance to load
- // class and resources. [stanleyh]
- //
- // Use buffered input stream [stanleyh]
- InputStream in = new BufferedInputStream(uc.getInputStream());
-
- byte[] b;
- try {
- b = in.readAllBytes();
- if (len != -1 && b.length != len)
- throw new EOFException("Expected:" + len + ", read:" + b.length);
- } finally {
- in.close();
- }
- return b;
- }
-
- // Object for synchronization around getResourceAsStream()
- private Object syncResourceAsStream = new Object();
- private Object syncResourceAsStreamFromJar = new Object();
-
- // Flag to indicate getResourceAsStream() is in call
- private boolean resourceAsStreamInCall = false;
- private boolean resourceAsStreamFromJarInCall = false;
-
- /**
- * Returns an input stream for reading the specified resource.
- *
- * The search order is described in the documentation for {@link
- * #getResource(String)}.<p>
- *
- * @param name the resource name
- * @return an input stream for reading the resource, or {@code null}
- * if the resource could not be found
- * @since 1.1
- */
- public InputStream getResourceAsStream(String name)
- {
-
- if (name == null) {
- throw new NullPointerException("name");
- }
-
- try
- {
- InputStream is = null;
-
- // Fixed #4507227: Slow performance to load
- // class and resources. [stanleyh]
- //
- // The following is used to avoid calling
- // AppletClassLoader.findResource() in
- // super.getResourceAsStream(). Otherwise,
- // unnecessary connection will be made.
- //
- synchronized(syncResourceAsStream)
- {
- resourceAsStreamInCall = true;
-
- // Call super class
- is = super.getResourceAsStream(name);
-
- resourceAsStreamInCall = false;
- }
-
- // 4668479: Option to turn off codebase lookup in AppletClassLoader
- // during resource requests. [stanley.ho]
- if (codebaseLookup == true && is == null)
- {
- // If resource cannot be obtained,
- // try to download it from codebase
- URL url = new URL(base, ParseUtil.encodePath(name, false));
- is = url.openStream();
- }
-
- return is;
- }
- catch (Exception e)
- {
- return null;
- }
- }
-
-
- /**
- * Returns an input stream for reading the specified resource from the
- * the loaded jar files.
- *
- * The search order is described in the documentation for {@link
- * #getResource(String)}.<p>
- *
- * @param name the resource name
- * @return an input stream for reading the resource, or {@code null}
- * if the resource could not be found
- * @since 1.1
- */
- public InputStream getResourceAsStreamFromJar(String name) {
-
- if (name == null) {
- throw new NullPointerException("name");
- }
-
- try {
- InputStream is = null;
- synchronized(syncResourceAsStreamFromJar) {
- resourceAsStreamFromJarInCall = true;
- // Call super class
- is = super.getResourceAsStream(name);
- resourceAsStreamFromJarInCall = false;
- }
-
- return is;
- } catch (Exception e) {
- return null;
- }
- }
-
-
- /*
- * Finds the applet resource with the specified name. First checks
- * loaded JAR files then the applet code base for the resource.
- */
- public URL findResource(String name) {
- // check loaded JAR files
- URL url = super.findResource(name);
-
- // 6215746: Disable META-INF/* lookup from codebase in
- // applet/plugin classloader. [stanley.ho]
- if (name.startsWith("META-INF/"))
- return url;
-
- // 4668479: Option to turn off codebase lookup in AppletClassLoader
- // during resource requests. [stanley.ho]
- if (codebaseLookup == false)
- return url;
-
- if (url == null)
- {
- //#4805170, if it is a call from Applet.getImage()
- //we should check for the image only in the archives
- boolean insideGetResourceAsStreamFromJar = false;
- synchronized(syncResourceAsStreamFromJar) {
- insideGetResourceAsStreamFromJar = resourceAsStreamFromJarInCall;
- }
-
- if (insideGetResourceAsStreamFromJar) {
- return null;
- }
-
- // Fixed #4507227: Slow performance to load
- // class and resources. [stanleyh]
- //
- // Check if getResourceAsStream is called.
- //
- boolean insideGetResourceAsStream = false;
-
- synchronized(syncResourceAsStream)
- {
- insideGetResourceAsStream = resourceAsStreamInCall;
- }
-
- // If getResourceAsStream is called, don't
- // trigger the following code. Otherwise,
- // unnecessary connection will be made.
- //
- if (insideGetResourceAsStream == false)
- {
- // otherwise, try the code base
- try {
- url = new URL(base, ParseUtil.encodePath(name, false));
- // check if resource exists
- if(!resourceExists(url))
- url = null;
- } catch (Exception e) {
- // all exceptions, including security exceptions, are caught
- url = null;
- }
- }
- }
- return url;
- }
-
-
- private boolean resourceExists(URL url) {
- // Check if the resource exists.
- // It almost works to just try to do an openConnection() but
- // HttpURLConnection will return true on HTTP_BAD_REQUEST
- // when the requested name ends in ".html", ".htm", and ".txt"
- // and we want to be able to handle these
- //
- // Also, cannot just open a connection for things like FileURLConnection,
- // because they succeed when connecting to a nonexistent file.
- // So, in those cases we open and close an input stream.
- boolean ok = true;
- try {
- URLConnection conn = url.openConnection();
- if (conn instanceof java.net.HttpURLConnection) {
- java.net.HttpURLConnection hconn =
- (java.net.HttpURLConnection) conn;
-
- // To reduce overhead, using http HEAD method instead of GET method
- hconn.setRequestMethod("HEAD");
-
- int code = hconn.getResponseCode();
- if (code == java.net.HttpURLConnection.HTTP_OK) {
- return true;
- }
- if (code >= java.net.HttpURLConnection.HTTP_BAD_REQUEST) {
- return false;
- }
- } else {
- /**
- * Fix for #4182052 - stanleyh
- *
- * The same connection should be reused to avoid multiple
- * HTTP connections
- */
-
- // our best guess for the other cases
- InputStream is = conn.getInputStream();
- is.close();
- }
- } catch (Exception ex) {
- ok = false;
- }
- return ok;
- }
-
- /*
- * Returns an enumeration of all the applet resources with the specified
- * name. First checks loaded JAR files then the applet code base for all
- * available resources.
- */
- @Override
- public Enumeration<URL> findResources(String name) throws IOException {
-
- final Enumeration<URL> e = super.findResources(name);
-
- // 6215746: Disable META-INF/* lookup from codebase in
- // applet/plugin classloader. [stanley.ho]
- if (name.startsWith("META-INF/"))
- return e;
-
- // 4668479: Option to turn off codebase lookup in AppletClassLoader
- // during resource requests. [stanley.ho]
- if (codebaseLookup == false)
- return e;
-
- URL u = new URL(base, ParseUtil.encodePath(name, false));
- if (!resourceExists(u)) {
- u = null;
- }
-
- final URL url = u;
- return new Enumeration<URL>() {
- private boolean done;
- public URL nextElement() {
- if (!done) {
- if (e.hasMoreElements()) {
- return e.nextElement();
- }
- done = true;
- if (url != null) {
- return url;
- }
- }
- throw new NoSuchElementException();
- }
- public boolean hasMoreElements() {
- return !done && (e.hasMoreElements() || url != null);
- }
- };
- }
-
- /*
- * Load and resolve the file specified by the applet tag CODE
- * attribute. The argument can either be the relative path
- * of the class file itself or just the name of the class.
- */
- Class<?> loadCode(String name) throws ClassNotFoundException {
- // first convert any '/' or native file separator to .
- name = name.replace('/', '.');
- name = name.replace(File.separatorChar, '.');
-
- // deal with URL rewriting
- String cookie = null;
- int index = name.indexOf(';');
- if(index != -1) {
- cookie = name.substring(index, name.length());
- name = name.substring(0, index);
- }
-
- // save that name for later
- String fullName = name;
- // then strip off any suffixes
- if (name.endsWith(".class") || name.endsWith(".java")) {
- name = name.substring(0, name.lastIndexOf('.'));
- }
- try {
- if(cookie != null)
- name = (new StringBuffer(name)).append(cookie).toString();
- return loadClass(name);
- } catch (ClassNotFoundException e) {
- }
- // then if it didn't end with .java or .class, or in the
- // really pathological case of a class named class or java
- if(cookie != null)
- fullName = (new StringBuffer(fullName)).append(cookie).toString();
-
- return loadClass(fullName);
- }
-
- /*
- * The threadgroup that the applets loaded by this classloader live
- * in. In the sun.* implementation of applets, the security manager's
- * (AppletSecurity) getThreadGroup returns the thread group of the
- * first applet on the stack, which is the applet's thread group.
- */
- private AppletThreadGroup threadGroup;
- private AppContext appContext;
-
- public ThreadGroup getThreadGroup() {
- synchronized (threadGroupSynchronizer) {
- if (threadGroup == null || threadGroup.isDestroyed()) {
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- threadGroup = new AppletThreadGroup(base + "-threadGroup");
- // threadGroup.setDaemon(true);
- // threadGroup is now destroyed by AppContext.dispose()
-
- // Create the new AppContext from within a Thread belonging
- // to the newly created ThreadGroup, and wait for the
- // creation to complete before returning from this method.
- AppContextCreator creatorThread = new AppContextCreator(threadGroup);
-
- // Since this thread will later be used to launch the
- // applet's AWT-event dispatch thread and we want the applet
- // code executing the AWT callbacks to use their own class
- // loader rather than the system class loader, explicitly
- // set the context class loader to the AppletClassLoader.
- creatorThread.setContextClassLoader(AppletClassLoader.this);
-
- creatorThread.start();
- try {
- synchronized(creatorThread.syncObject) {
- while (!creatorThread.created) {
- creatorThread.syncObject.wait();
- }
- }
- } catch (InterruptedException e) { }
- appContext = creatorThread.appContext;
- return null;
- }
- });
- }
- return threadGroup;
- }
- }
-
- /*
- * Get the AppContext, if any, corresponding to this AppletClassLoader.
- */
- public AppContext getAppContext() {
- return appContext;
- }
-
- int usageCount = 0;
-
- /**
- * Grab this AppletClassLoader and its ThreadGroup/AppContext, so they
- * won't be destroyed.
- */
-public void grab() {
- synchronized(grabReleaseSynchronizer) {
- usageCount++;
- }
- getThreadGroup(); // Make sure ThreadGroup/AppContext exist
- }
-
- protected void setExceptionStatus()
- {
- exceptionStatus = true;
- }
-
- public boolean getExceptionStatus()
- {
- return exceptionStatus;
- }
-
- /**
- * Release this AppletClassLoader and its ThreadGroup/AppContext.
- * If nothing else has grabbed this AppletClassLoader, its ThreadGroup
- * and AppContext will be destroyed.
- *
- * Because this method may destroy the AppletClassLoader's ThreadGroup,
- * this method should NOT be called from within the AppletClassLoader's
- * ThreadGroup.
- *
- * Changed modifier to protected in order to be able to overwrite this
- * function in PluginClassLoader.java
- */
- protected void release() {
-
- AppContext tempAppContext = null;
-
- synchronized(grabReleaseSynchronizer) {
- if (usageCount > 1) {
- --usageCount;
- } else {
- synchronized(threadGroupSynchronizer) {
- tempAppContext = resetAppContext();
- }
- }
- }
-
- // Dispose appContext outside any sync block to
- // prevent potential deadlock.
- if (tempAppContext != null) {
- try {
- tempAppContext.dispose(); // nuke the world!
- } catch (IllegalThreadStateException e) { }
- }
- }
-
- /*
- * reset classloader's AppContext and ThreadGroup
- * This method is for subclass PluginClassLoader to
- * reset superclass's AppContext and ThreadGroup but do
- * not dispose the AppContext. PluginClassLoader does not
- * use UsageCount to decide whether to dispose AppContext
- *
- * @return previous AppContext
- */
- protected AppContext resetAppContext() {
- AppContext tempAppContext = null;
-
- synchronized(threadGroupSynchronizer) {
- // Store app context in temp variable
- tempAppContext = appContext;
- usageCount = 0;
- appContext = null;
- threadGroup = null;
- }
- return tempAppContext;
- }
-
-
- // Hash map to store applet compatibility info
- private HashMap<String, Boolean> jdk11AppletInfo = new HashMap<>();
- private HashMap<String, Boolean> jdk12AppletInfo = new HashMap<>();
-
- /**
- * Set applet target level as JDK 1.1.
- *
- * @param clazz Applet class.
- * @param bool true if JDK is targeted for JDK 1.1;
- * false otherwise.
- */
- void setJDK11Target(Class<?> clazz, boolean bool)
- {
- jdk11AppletInfo.put(clazz.toString(), Boolean.valueOf(bool));
- }
-
- /**
- * Set applet target level as JDK 1.2.
- *
- * @param clazz Applet class.
- * @param bool true if JDK is targeted for JDK 1.2;
- * false otherwise.
- */
- void setJDK12Target(Class<?> clazz, boolean bool)
- {
- jdk12AppletInfo.put(clazz.toString(), Boolean.valueOf(bool));
- }
-
- /**
- * Determine if applet is targeted for JDK 1.1.
- *
- * @param clazz Applet class.
- * @return TRUE if applet is targeted for JDK 1.1;
- * FALSE if applet is not;
- * null if applet is unknown.
- */
- Boolean isJDK11Target(Class<?> clazz)
- {
- return jdk11AppletInfo.get(clazz.toString());
- }
-
- /**
- * Determine if applet is targeted for JDK 1.2.
- *
- * @param clazz Applet class.
- * @return TRUE if applet is targeted for JDK 1.2;
- * FALSE if applet is not;
- * null if applet is unknown.
- */
- Boolean isJDK12Target(Class<?> clazz)
- {
- return jdk12AppletInfo.get(clazz.toString());
- }
-}
-
-/*
- * The AppContextCreator class is used to create an AppContext from within
- * a Thread belonging to the new AppContext's ThreadGroup. To wait for
- * this operation to complete before continuing, wait for the notifyAll()
- * operation on the syncObject to occur.
- */
-class AppContextCreator extends Thread {
- Object syncObject = new Object();
- AppContext appContext = null;
- volatile boolean created = false;
-
- /**
- * Must call the 5-args super-class constructor to erase locals.
- */
- private AppContextCreator() {
- throw new UnsupportedOperationException("Must erase locals");
- }
-
- AppContextCreator(ThreadGroup group) {
- super(group, null, "AppContextCreator", 0, false);
- }
-
- public void run() {
- appContext = SunToolkit.createNewAppContext();
- created = true;
- synchronized(syncObject) {
- syncObject.notifyAll();
- }
- } // run()
-
-} // class AppContextCreator
--- a/src/java.desktop/share/classes/sun/applet/AppletSecurity.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,421 +0,0 @@
-/*
- * Copyright (c) 1995, 2018, 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 sun.applet;
-
-import java.io.File;
-import java.io.FilePermission;
-import java.io.IOException;
-import java.io.FileDescriptor;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.net.SocketPermission;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-import java.security.*;
-import java.lang.reflect.*;
-import jdk.internal.misc.JavaNetURLClassLoaderAccess;
-import jdk.internal.misc.JavaSecurityAccess;
-import jdk.internal.misc.SharedSecrets;
-import sun.awt.AWTSecurityManager;
-import sun.awt.AppContext;
-import sun.awt.AWTPermissions;
-import sun.security.util.SecurityConstants;
-
-import static java.lang.StackWalker.*;
-import static java.lang.StackWalker.Option.*;
-
-
-/**
- * This class defines an applet security policy
- *
- */
-public
-class AppletSecurity extends AWTSecurityManager {
- private static final JavaNetURLClassLoaderAccess JNUCLA
- = SharedSecrets.getJavaNetURLClassLoaderAccess();
- private static final JavaSecurityAccess JSA = SharedSecrets.getJavaSecurityAccess();
-
- /**
- * Construct and initialize.
- */
- public AppletSecurity() {
- reset();
- }
-
- // Cache to store known restricted packages
- private HashSet<String> restrictedPackages = new HashSet<>();
-
- /**
- * Reset from Properties
- */
- public void reset()
- {
- // Clear cache
- restrictedPackages.clear();
-
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run()
- {
- // Enumerate system properties
- Enumeration<?> e = System.getProperties().propertyNames();
-
- while (e.hasMoreElements())
- {
- String name = (String) e.nextElement();
-
- if (name != null && name.startsWith("package.restrict.access."))
- {
- String value = System.getProperty(name);
-
- if (value != null && value.equalsIgnoreCase("true"))
- {
- String pkg = name.substring(24);
-
- // Cache restricted packages
- restrictedPackages.add(pkg);
- }
- }
- }
- return null;
- }
- });
- }
-
- private static final StackWalker walker =
- AccessController.doPrivileged(
- (PrivilegedAction<StackWalker>) () ->
- StackWalker.getInstance(RETAIN_CLASS_REFERENCE));
- /**
- * Returns the class loader of the most recently executing method from
- * a class defined using a non-system class loader. A non-system
- * class loader is defined as being a class loader that is not equal to
- * the system class loader (as returned
- * by {@link ClassLoader#getSystemClassLoader}) or one of its ancestors.
- * <p>
- * This method will return
- * <code>null</code> in the following three cases:
- * <ol>
- * <li>All methods on the execution stack are from classes
- * defined using the system class loader or one of its ancestors.
- *
- * <li>All methods on the execution stack up to the first
- * "privileged" caller
- * (see {@link java.security.AccessController#doPrivileged})
- * are from classes
- * defined using the system class loader or one of its ancestors.
- *
- * <li> A call to <code>checkPermission</code> with
- * <code>java.security.AllPermission</code> does not
- * result in a SecurityException.
- * </ol>
- *
- * NOTE: This is an implementation of the SecurityManager.currentClassLoader
- * method that uses StackWalker. SecurityManager.currentClassLoader
- * has been removed from SE. This is a temporary workaround which is
- * only needed while applets are still supported.
- *
- * @return the class loader of the most recent occurrence on the stack
- * of a method from a class defined using a non-system class
- * loader.
- */
- private static ClassLoader currentClassLoader() {
- StackFrame f =
- walker.walk(s -> s.takeWhile(AppletSecurity::isNonPrivileged)
- .filter(AppletSecurity::isNonSystemFrame)
- .findFirst())
- .orElse(null);
-
- SecurityManager sm = System.getSecurityManager();
- if (f != null && sm != null) {
- try {
- sm.checkPermission(new AllPermission());
- } catch (SecurityException se) {
- return f.getDeclaringClass().getClassLoader();
- }
- }
- return null;
- }
-
- /**
- * Returns true if the StackFrame is not AccessController.doPrivileged.
- */
- private static boolean isNonPrivileged(StackFrame f) {
- // possibly other doPrivileged variants
- Class<?> c = f.getDeclaringClass();
- return c == AccessController.class &&
- f.getMethodName().equals("doPrivileged");
- }
-
- /**
- * Returns true if the StackFrame is not from a class defined by the
- * system class loader or one of its ancestors.
- */
- private static boolean isNonSystemFrame(StackFrame f) {
- ClassLoader loader = ClassLoader.getSystemClassLoader();
- ClassLoader ld = f.getDeclaringClass().getClassLoader();
- if (ld == null || ld == loader) return false;
-
- while ((loader = loader.getParent()) != null) {
- if (ld == loader)
- return false;
- }
- return true;
- }
-
- /**
- * get the current (first) instance of an AppletClassLoader on the stack.
- */
- private AppletClassLoader currentAppletClassLoader()
- {
- // try currentClassLoader first
- ClassLoader loader = currentClassLoader();
-
- if ((loader == null) || (loader instanceof AppletClassLoader))
- return (AppletClassLoader)loader;
-
- // if that fails, get all the classes on the stack and check them.
- Class<?>[] context = getClassContext();
- for (int i = 0; i < context.length; i++) {
- loader = context[i].getClassLoader();
- if (loader instanceof AppletClassLoader)
- return (AppletClassLoader)loader;
- }
-
- /*
- * fix bug # 6433620 the logic here is : try to find URLClassLoader from
- * class context, check its AccessControlContext to see if
- * AppletClassLoader is in stack when it's created. for this kind of
- * URLClassLoader, return the AppContext associated with the
- * AppletClassLoader.
- */
- for (int i = 0; i < context.length; i++) {
- final ClassLoader currentLoader = context[i].getClassLoader();
-
- if (currentLoader instanceof URLClassLoader) {
- URLClassLoader ld = (URLClassLoader)currentLoader;
- loader = AccessController.doPrivileged(
- new PrivilegedAction<ClassLoader>() {
- public ClassLoader run() {
-
- AccessControlContext acc = null;
- ProtectionDomain[] pds = null;
-
- try {
- acc = JNUCLA.getAccessControlContext(ld);
- if (acc == null) {
- return null;
- }
-
- pds = JSA.getProtectDomains(acc);
- if (pds == null) {
- return null;
- }
- } catch (Exception e) {
- throw new UnsupportedOperationException(e);
- }
-
- for (int i=0; i<pds.length; i++) {
- ClassLoader cl = pds[i].getClassLoader();
-
- if (cl instanceof AppletClassLoader) {
- return cl;
- }
- }
-
- return null;
- }
- });
-
- if (loader != null) {
- return (AppletClassLoader) loader;
- }
- }
- }
-
- // if that fails, try the context class loader
- loader = Thread.currentThread().getContextClassLoader();
- if (loader instanceof AppletClassLoader)
- return (AppletClassLoader)loader;
-
- // no AppletClassLoaders on the stack
- return (AppletClassLoader)null;
- }
-
- /**
- * Returns true if this threadgroup is in the applet's own thread
- * group. This will return false if there is no current class
- * loader.
- */
- protected boolean inThreadGroup(ThreadGroup g) {
- if (currentAppletClassLoader() == null)
- return false;
- else
- return getThreadGroup().parentOf(g);
- }
-
- /**
- * Returns true of the threadgroup of thread is in the applet's
- * own threadgroup.
- */
- protected boolean inThreadGroup(Thread thread) {
- return inThreadGroup(thread.getThreadGroup());
- }
-
- /**
- * Applets are not allowed to manipulate threads outside
- * applet thread groups. However a terminated thread no longer belongs
- * to any group.
- */
- public void checkAccess(Thread t) {
- /* When multiple applets is reloaded simultaneously, there will be
- * multiple invocations to this method from plugin's SecurityManager.
- * This method should not be synchronized to avoid deadlock when
- * a page with multiple applets is reloaded
- */
- if ((t.getState() != Thread.State.TERMINATED) && !inThreadGroup(t)) {
- checkPermission(SecurityConstants.MODIFY_THREAD_PERMISSION);
- }
- }
-
- private boolean inThreadGroupCheck = false;
-
- /**
- * Applets are not allowed to manipulate thread groups outside
- * applet thread groups.
- */
- public synchronized void checkAccess(ThreadGroup g) {
- if (inThreadGroupCheck) {
- // if we are in a recursive check, it is because
- // inThreadGroup is calling appletLoader.getThreadGroup
- // in that case, only do the super check, as appletLoader
- // has a begin/endPrivileged
- checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
- } else {
- try {
- inThreadGroupCheck = true;
- if (!inThreadGroup(g)) {
- checkPermission(SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
- }
- } finally {
- inThreadGroupCheck = false;
- }
- }
- }
-
-
- /**
- * Throws a {@code SecurityException} if the
- * calling thread is not allowed to access the package specified by
- * the argument.
- * <p>
- * This method is used by the {@code loadClass} method of class
- * loaders.
- * <p>
- * The {@code checkPackageAccess} method for class
- * {@code SecurityManager} calls
- * {@code checkPermission} with the
- * {@code RuntimePermission("accessClassInPackage."+ pkgname)}
- * permission.
- *
- * @param pkgname the package name.
- * @exception SecurityException if the caller does not have
- * permission to access the specified package.
- * @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)
- */
- public void checkPackageAccess(final String pkgname) {
-
- // first see if the VM-wide policy allows access to this package
- super.checkPackageAccess(pkgname);
-
- // now check the list of restricted packages
- for (Iterator<String> iter = restrictedPackages.iterator(); iter.hasNext();)
- {
- String pkg = iter.next();
-
- // Prevent matching "sun" and "sunir" even if they
- // starts with similar beginning characters
- //
- if (pkgname.equals(pkg) || pkgname.startsWith(pkg + "."))
- {
- checkPermission(new java.lang.RuntimePermission
- ("accessClassInPackage." + pkgname));
- }
- }
- }
-
- /**
- * Returns the thread group of the applet. We consult the classloader
- * if there is one.
- */
- public ThreadGroup getThreadGroup() {
- /* If any applet code is on the execution stack, we return
- that applet's ThreadGroup. Otherwise, we use the default
- behavior. */
- AppletClassLoader appletLoader = currentAppletClassLoader();
- ThreadGroup loaderGroup = (appletLoader == null) ? null
- : appletLoader.getThreadGroup();
- if (loaderGroup != null) {
- return loaderGroup;
- } else {
- return super.getThreadGroup();
- }
- } // getThreadGroup()
-
- /**
- * Get the AppContext corresponding to the current context.
- * The default implementation returns null, but this method
- * may be overridden by various SecurityManagers
- * (e.g. AppletSecurity) to index AppContext objects by the
- * calling context.
- *
- * @return the AppContext corresponding to the current context.
- * @see sun.awt.AppContext
- * @see java.lang.SecurityManager
- * @since 1.2.1
- */
- public AppContext getAppContext() {
- AppletClassLoader appletLoader = currentAppletClassLoader();
-
- if (appletLoader == null) {
- return null;
- } else {
- AppContext context = appletLoader.getAppContext();
-
- // context == null when some thread in applet thread group
- // has not been destroyed in AppContext.dispose()
- if (context == null) {
- throw new SecurityException("Applet classloader has invalid AppContext");
- }
-
- return context;
- }
- }
-
-} // class AppletSecurity
--- a/src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1995, 1997, 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 sun.applet;
-
-/**
- * This class defines an applet thread group.
- *
- * @author Arthur van Hoff
- */
-public class AppletThreadGroup extends ThreadGroup {
-
- /**
- * Constructs a new thread group for an applet.
- * The parent of this new group is the thread
- * group of the currently running thread.
- *
- * @param name the name of the new thread group.
- */
- public AppletThreadGroup(String name) {
- this(Thread.currentThread().getThreadGroup(), name);
- }
-
- /**
- * Creates a new thread group for an applet.
- * The parent of this new group is the specified
- * thread group.
- *
- * @param parent the parent thread group.
- * @param name the name of the new thread group.
- * @exception NullPointerException if the thread group argument is
- * {@code null}.
- * @exception SecurityException if the current thread cannot create a
- * thread in the specified thread group.
- * @see java.lang.SecurityException
- * @since 1.1.1
- */
- public AppletThreadGroup(ThreadGroup parent, String name) {
- super(parent, name);
- setMaxPriority(Thread.NORM_PRIORITY - 1);
- }
-}
--- a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -295,20 +295,11 @@
*/
void updateWindow(Window window);
- /** Get the size of the security warning.
- */
- Dimension getSecurityWarningSize(Window w);
-
/**
* Set the size of the security warning.
*/
void setSecurityWarningSize(Window w, int width, int height);
- /** Set the position of the security warning.
- */
- void setSecurityWarningPosition(Window w, Point2D point,
- float alignmentX, float alignmentY);
-
/** Request to recalculate the new position of the security warning for
* the given window size/location as reported by the native system.
*/
--- a/src/java.desktop/share/classes/sun/awt/HToolkit.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2011, 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 sun.awt;
-
-import java.awt.*;
-import java.awt.datatransfer.Clipboard;
-import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragGestureRecognizer;
-import java.awt.dnd.DragSource;
-import java.awt.im.InputMethodHighlight;
-import java.awt.im.spi.InputMethodDescriptor;
-import java.awt.image.ColorModel;
-import java.awt.peer.FramePeer;
-import java.awt.peer.KeyboardFocusManagerPeer;
-import java.awt.peer.SystemTrayPeer;
-import java.awt.peer.TrayIconPeer;
-import java.util.Map;
-import java.util.Properties;
-
-/*
- * HToolkit is a platform independent Toolkit used
- * with the HeadlessToolkit. It is primarily used
- * in embedded JRE's that do not have sun/awt/X11 classes.
- */
-public final class HToolkit extends SunToolkit implements ComponentFactory {
-
- private static final KeyboardFocusManagerPeer kfmPeer = new KeyboardFocusManagerPeer() {
- @Override
- public void setCurrentFocusedWindow(Window win) {}
- @Override
- public Window getCurrentFocusedWindow() { return null; }
- @Override
- public void setCurrentFocusOwner(Component comp) {}
- @Override
- public Component getCurrentFocusOwner() { return null; }
- @Override
- public void clearGlobalFocusOwner(Window activeWindow) {}
- };
-
- public HToolkit() {
- }
-
- /*
- * Component peer objects - unsupported.
- */
-
- @Override
- public FramePeer createLightweightFrame(LightweightFrame target)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public KeyboardFocusManagerPeer getKeyboardFocusManagerPeer() {
- // See 6833019.
- return kfmPeer;
- }
-
- @Override
- public TrayIconPeer createTrayIcon(TrayIcon target)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public SystemTrayPeer createSystemTray(SystemTray target)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public boolean isTraySupported() {
- return false;
- }
-
- public GlobalCursorManager getGlobalCursorManager()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- /*
- * Headless toolkit - unsupported.
- */
- @Override
- protected void loadSystemColors(int[] systemColors)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public ColorModel getColorModel()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public int getScreenResolution()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public Map<java.awt.font.TextAttribute, ?> mapInputMethodHighlight(
- InputMethodHighlight highlight)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- @Deprecated(since = "10")
- public int getMenuShortcutKeyMask()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public int getMenuShortcutKeyMaskEx()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public boolean getLockingKeyState(int keyCode)
- throws UnsupportedOperationException {
- throw new HeadlessException();
- }
-
- @Override
- public void setLockingKeyState(int keyCode, boolean on)
- throws UnsupportedOperationException {
- throw new HeadlessException();
- }
-
- @Override
- public Cursor createCustomCursor(Image cursor, Point hotSpot, String name)
- throws IndexOutOfBoundsException, HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public Dimension getBestCursorSize(int preferredWidth, int preferredHeight)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public int getMaximumCursorColors()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public <T extends DragGestureRecognizer> T
- createDragGestureRecognizer(Class<T> abstractRecognizerClass,
- DragSource ds, Component c,
- int srcActions, DragGestureListener dgl)
- {
- return null;
- }
-
- @Override
- public Dimension getScreenSize()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public Insets getScreenInsets(GraphicsConfiguration gc)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public void setDynamicLayout(boolean dynamic)
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- protected boolean isDynamicLayoutSet()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public boolean isDynamicLayoutActive()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- @Override
- public Clipboard getSystemClipboard()
- throws HeadlessException {
- throw new HeadlessException();
- }
-
- /*
- * Printing
- */
- @Override
- public PrintJob getPrintJob(Frame frame, String jobtitle,
- JobAttributes jobAttributes,
- PageAttributes pageAttributes) {
- if (frame != null) {
- // Should never happen
- throw new HeadlessException();
- }
- throw new IllegalArgumentException(
- "PrintJob not supported in a headless environment");
- }
-
- @Override
- public PrintJob getPrintJob(Frame frame, String doctitle, Properties props)
- {
- if (frame != null) {
- // Should never happen
- throw new HeadlessException();
- }
- throw new IllegalArgumentException(
- "PrintJob not supported in a headless environment");
- }
-
- /*
- * Headless toolkit - supported.
- */
-
- @Override
- public void sync() {
- // Do nothing
- }
-
- @Override
- protected boolean syncNativeQueue(final long timeout) {
- return false;
- }
-
- @Override
- public void beep() {
- // Send alert character
- System.out.write(0x07);
- }
-
- /*
- * Modality
- */
- @Override
- public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
- return false;
- }
-
- @Override
- public boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType exclusionType) {
- return false;
- }
-
- @Override
- public boolean isDesktopSupported() {
- return false;
- }
-
- @Override
- public boolean isTaskbarSupported() {
- return false;
- }
-
- public boolean isWindowOpacityControlSupported() {
- return false;
- }
-
- @Override
- public boolean isWindowShapingSupported() {
- return false;
- }
-
- @Override
- public boolean isWindowTranslucencySupported() {
- return false;
- }
-
- @Override
- public void grab(Window w) { }
-
- @Override
- public void ungrab(Window w) { }
-
- protected boolean syncNativeQueue() { return false; }
-
- @Override
- public InputMethodDescriptor getInputMethodAdapterDescriptor()
- throws AWTException
- {
- return (InputMethodDescriptor)null;
- }
-}
--- a/src/java.desktop/share/classes/sun/font/CMap.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/font/CMap.java Mon Oct 01 09:56:45 2018 +0100
@@ -566,6 +566,7 @@
char getGlyph(int charCode) {
+ final int origCharCode = charCode;
int index = 0;
char glyphCode = 0;
@@ -637,8 +638,8 @@
}
}
}
- if (glyphCode != 0) {
- //System.err.println("cc="+Integer.toHexString((int)charCode) + " gc="+(int)glyphCode);
+ if (glyphCode == 0) {
+ glyphCode = getFormatCharGlyph(origCharCode);
}
return glyphCode;
}
@@ -804,6 +805,7 @@
}
char getGlyph(int charCode) {
+ final int origCharCode = charCode;
int controlGlyph = getControlCodeGlyph(charCode, true);
if (controlGlyph >= 0) {
return (char)controlGlyph;
@@ -859,7 +861,7 @@
return glyphCode;
}
}
- return 0;
+ return getFormatCharGlyph(origCharCode);
}
}
@@ -883,6 +885,7 @@
}
char getGlyph(int charCode) {
+ final int origCharCode = charCode;
int controlGlyph = getControlCodeGlyph(charCode, true);
if (controlGlyph >= 0) {
return (char)controlGlyph;
@@ -894,7 +897,7 @@
charCode -= firstCode;
if (charCode < 0 || charCode >= entryCount) {
- return 0;
+ return getFormatCharGlyph(origCharCode);
} else {
return glyphIdArray[charCode];
}
@@ -1032,6 +1035,7 @@
}
char getGlyph(int charCode) {
+ final int origCharCode = charCode;
int controlGlyph = getControlCodeGlyph(charCode, false);
if (controlGlyph >= 0) {
return (char)controlGlyph;
@@ -1057,7 +1061,7 @@
(startGlyphID[range] + (charCode - startCharCode[range]));
}
- return 0;
+ return getFormatCharGlyph(origCharCode);
}
}
@@ -1079,16 +1083,21 @@
case 0x000a:
case 0x000d: return CharToGlyphMapper.INVISIBLE_GLYPH_ID;
}
- } else if (charCode >= 0x200c) {
+ } else if (noSurrogates && charCode >= 0xFFFF) {
+ return 0;
+ }
+ return -1;
+ }
+
+ final char getFormatCharGlyph(int charCode) {
+ if (charCode >= 0x200c) {
if ((charCode <= 0x200f) ||
(charCode >= 0x2028 && charCode <= 0x202e) ||
(charCode >= 0x206a && charCode <= 0x206f)) {
- return CharToGlyphMapper.INVISIBLE_GLYPH_ID;
- } else if (noSurrogates && charCode >= 0xFFFF) {
- return 0;
+ return (char)CharToGlyphMapper.INVISIBLE_GLYPH_ID;
}
}
- return -1;
+ return 0;
}
static class UVS {
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -2740,7 +2740,7 @@
new java.security.PrivilegedAction<Object>() {
public Object run() {
SecurityManager sm = System.getSecurityManager();
- return sm instanceof sun.applet.AppletSecurity;
+ return sm instanceof sun.awt.AWTSecurityManager;
}
});
return appletSM.booleanValue();
--- a/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java Mon Oct 01 09:56:45 2018 +0100
@@ -35,6 +35,7 @@
import java.lang.ref.SoftReference;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Locale;
+import java.util.WeakHashMap;
/*
* different ways to do this
@@ -148,17 +149,30 @@
this.key = key;
}
+ static WeakHashMap<Font2D, Boolean> aatInfo = new WeakHashMap<>();
+
private boolean isAAT(Font2D font) {
+ Boolean aatObj;
+ synchronized (aatInfo) {
+ aatObj = aatInfo.get(font);
+ }
+ if (aatObj != null) {
+ return aatObj.booleanValue();
+ }
+ boolean aat = false;
if (font instanceof TrueTypeFont) {
TrueTypeFont ttf = (TrueTypeFont)font;
- return ttf.getDirectoryEntry(TrueTypeFont.morxTag) != null ||
+ aat = ttf.getDirectoryEntry(TrueTypeFont.morxTag) != null ||
ttf.getDirectoryEntry(TrueTypeFont.mortTag) != null;
} else if (font instanceof PhysicalFont) {
PhysicalFont pf = (PhysicalFont)font;
- return pf.getTableBytes(TrueTypeFont.morxTag) != null ||
+ aat = pf.getTableBytes(TrueTypeFont.morxTag) != null ||
pf.getTableBytes(TrueTypeFont.mortTag) != null;
}
- return false;
+ synchronized (aatInfo) {
+ aatInfo.put(font, Boolean.valueOf(aat));
+ }
+ return aat;
}
public void layout(FontStrikeDesc desc, float[] mat, float ptSize, int gmask,
--- a/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java Mon Oct 01 09:56:45 2018 +0100
@@ -31,6 +31,7 @@
import java.awt.geom.Path2D;
import java.awt.geom.PathIterator;
import java.security.AccessController;
+import java.util.Arrays;
import sun.awt.geom.PathConsumer2D;
import static sun.java2d.marlin.MarlinUtils.logInfo;
import sun.java2d.ReentrantContextProvider;
@@ -334,7 +335,6 @@
int dashLen = -1;
boolean recycleDashes = false;
- double scale = 1.0d;
double[] dashesD = null;
// Ensure converting dashes to double precision:
@@ -375,7 +375,7 @@
// a*b == -c*d && a*a+c*c == b*b+d*d. In the actual check below, we
// leave a bit of room for error.
if (nearZero(a*b + c*d) && nearZero(a*a + c*c - (b*b + d*d))) {
- scale = Math.sqrt(a*a + c*c);
+ final double scale = Math.sqrt(a*a + c*c);
if (dashesD != null) {
for (int i = 0; i < dashLen; i++) {
@@ -427,7 +427,7 @@
pc2d = transformerPC2D.deltaTransformConsumer(pc2d, strokerat);
// stroker will adjust the clip rectangle (width / miter limit):
- pc2d = rdrCtx.stroker.init(pc2d, width, caps, join, miterlimit, scale,
+ pc2d = rdrCtx.stroker.init(pc2d, width, caps, join, miterlimit,
(dashesD == null));
// Curve Monotizer:
@@ -834,10 +834,26 @@
// Define the initial clip bounds:
final double[] clipRect = rdrCtx.clipRect;
- clipRect[0] = clip.getLoY();
- clipRect[1] = clip.getLoY() + clip.getHeight();
- clipRect[2] = clip.getLoX();
- clipRect[3] = clip.getLoX() + clip.getWidth();
+ // Adjust the clipping rectangle with the renderer offsets
+ final double rdrOffX = DRenderer.RDR_OFFSET_X;
+ final double rdrOffY = DRenderer.RDR_OFFSET_Y;
+
+ // add a small rounding error:
+ final double margin = 1e-3d;
+
+ clipRect[0] = clip.getLoY()
+ - margin + rdrOffY;
+ clipRect[1] = clip.getLoY() + clip.getHeight()
+ + margin + rdrOffY;
+ clipRect[2] = clip.getLoX()
+ - margin + rdrOffX;
+ clipRect[3] = clip.getLoX() + clip.getWidth()
+ + margin + rdrOffX;
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (clip): "
+ + Arrays.toString(rdrCtx.clipRect));
+ }
// Enable clipping:
rdrCtx.doClip = true;
--- a/src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/DRendererContext.java Mon Oct 01 09:56:45 2018 +0100
@@ -85,6 +85,8 @@
boolean closedPath = false;
// clip rectangle (ymin, ymax, xmin, xmax):
final double[] clipRect = new double[4];
+ // clip inverse scale (mean) to adjust length checks
+ double clipInvScale = 0.0d;
// CurveBasicMonotonizer instance
final CurveBasicMonotonizer monotonizer;
// CurveClipSplitter instance
@@ -105,7 +107,6 @@
final PathConsumer2DAdapter p2dAdapter = new PathConsumer2DAdapter();
-
/**
* Constructor
*
@@ -162,6 +163,7 @@
stroking = 0;
doClip = false;
closedPath = false;
+ clipInvScale = 0.0d;
// if context is maked as DIRTY:
if (dirty) {
--- a/src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/DStroker.java Mon Oct 01 09:56:45 2018 +0100
@@ -139,7 +139,6 @@
* <code>JOIN_MITER</code>, <code>JOIN_ROUND</code> or
* <code>JOIN_BEVEL</code>.
* @param miterLimit the desired miter limit
- * @param scale scaling factor applied to clip boundaries
* @param subdivideCurves true to indicate to subdivide curves, false if dasher does
* @return this instance
*/
@@ -148,7 +147,6 @@
final int capStyle,
final int joinStyle,
final double miterLimit,
- final double scale,
final boolean subdivideCurves)
{
this.out = pc2d;
@@ -169,7 +167,6 @@
if (rdrCtx.doClip) {
// Adjust the clipping rectangle with the stroker margin (miter limit, width)
- double rdrOffX = 0.0d, rdrOffY = 0.0d;
double margin = lineWidth2;
if (capStyle == CAP_SQUARE) {
@@ -178,23 +175,21 @@
if ((joinStyle == JOIN_MITER) && (margin < limit)) {
margin = limit;
}
- if (scale != 1.0d) {
- margin *= scale;
- rdrOffX = scale * DRenderer.RDR_OFFSET_X;
- rdrOffY = scale * DRenderer.RDR_OFFSET_Y;
- }
- // add a small rounding error:
- margin += 1e-3d;
// bounds as half-open intervals: minX <= x < maxX and minY <= y < maxY
// adjust clip rectangle (ymin, ymax, xmin, xmax):
final double[] _clipRect = rdrCtx.clipRect;
- _clipRect[0] -= margin - rdrOffY;
- _clipRect[1] += margin + rdrOffY;
- _clipRect[2] -= margin - rdrOffX;
- _clipRect[3] += margin + rdrOffX;
+ _clipRect[0] -= margin;
+ _clipRect[1] += margin;
+ _clipRect[2] -= margin;
+ _clipRect[3] += margin;
this.clipRect = _clipRect;
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (stroker): "
+ + Arrays.toString(rdrCtx.clipRect));
+ }
+
// initialize curve splitter here for stroker & dasher:
if (DO_CLIP_SUBDIVIDER) {
subdivide = subdivideCurves;
@@ -304,13 +299,9 @@
// If it is >=0, we know that abs(ext) is <= 90 degrees, so we only
// need 1 curve to approximate the circle section that joins omx,omy
// and mx,my.
- final int numCurves = (cosext >= 0.0d) ? 1 : 2;
-
- switch (numCurves) {
- case 1:
+ if (cosext >= 0.0d) {
drawBezApproxForArc(cx, cy, omx, omy, mx, my, rev);
- break;
- case 2:
+ } else {
// we need to split the arc into 2 arcs spanning the same angle.
// The point we want will be one of the 2 intersections of the
// perpendicular bisector of the chord (omx,omy)->(mx,my) and the
@@ -339,8 +330,6 @@
}
drawBezApproxForArc(cx, cy, omx, omy, mmx, mmy, rev);
drawBezApproxForArc(cx, cy, mmx, mmy, mx, my, rev);
- break;
- default:
}
}
--- a/src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/DTransformingPathConsumer2D.java Mon Oct 01 09:56:45 2018 +0100
@@ -119,44 +119,56 @@
// Scale only
if (rdrCtx.doClip) {
// adjust clip rectangle (ymin, ymax, xmin, xmax):
- adjustClipScale(rdrCtx.clipRect, mxx, myy);
+ rdrCtx.clipInvScale = adjustClipScale(rdrCtx.clipRect,
+ mxx, myy);
}
return dt_DeltaScaleFilter.init(out, mxx, myy);
}
} else {
if (rdrCtx.doClip) {
// adjust clip rectangle (ymin, ymax, xmin, xmax):
- adjustClipInverseDelta(rdrCtx.clipRect, mxx, mxy, myx, myy);
+ rdrCtx.clipInvScale = adjustClipInverseDelta(rdrCtx.clipRect,
+ mxx, mxy, myx, myy);
}
return dt_DeltaTransformFilter.init(out, mxx, mxy, myx, myy);
}
}
- private static void adjustClipOffset(final double[] clipRect) {
- clipRect[0] += Renderer.RDR_OFFSET_Y;
- clipRect[1] += Renderer.RDR_OFFSET_Y;
- clipRect[2] += Renderer.RDR_OFFSET_X;
- clipRect[3] += Renderer.RDR_OFFSET_X;
+ private static double adjustClipScale(final double[] clipRect,
+ final double mxx, final double myy)
+ {
+ // Adjust the clipping rectangle (iv_DeltaScaleFilter):
+ final double scaleY = 1.0d / myy;
+ clipRect[0] *= scaleY;
+ clipRect[1] *= scaleY;
+
+ if (clipRect[1] < clipRect[0]) {
+ double tmp = clipRect[0];
+ clipRect[0] = clipRect[1];
+ clipRect[1] = tmp;
+ }
+
+ final double scaleX = 1.0d / mxx;
+ clipRect[2] *= scaleX;
+ clipRect[3] *= scaleX;
+
+ if (clipRect[3] < clipRect[2]) {
+ double tmp = clipRect[2];
+ clipRect[2] = clipRect[3];
+ clipRect[3] = tmp;
+ }
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (ClipScale): "
+ + Arrays.toString(clipRect));
+ }
+ return 0.5d * (Math.abs(scaleX) + Math.abs(scaleY));
}
- private static void adjustClipScale(final double[] clipRect,
- final double mxx, final double myy)
+ private static double adjustClipInverseDelta(final double[] clipRect,
+ final double mxx, final double mxy,
+ final double myx, final double myy)
{
- adjustClipOffset(clipRect);
-
- // Adjust the clipping rectangle (iv_DeltaScaleFilter):
- clipRect[0] /= myy;
- clipRect[1] /= myy;
- clipRect[2] /= mxx;
- clipRect[3] /= mxx;
- }
-
- private static void adjustClipInverseDelta(final double[] clipRect,
- final double mxx, final double mxy,
- final double myx, final double myy)
- {
- adjustClipOffset(clipRect);
-
// Adjust the clipping rectangle (iv_DeltaTransformFilter):
final double det = mxx * myy - mxy * myx;
final double imxx = myy / det;
@@ -198,6 +210,16 @@
clipRect[1] = ymax;
clipRect[2] = xmin;
clipRect[3] = xmax;
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (ClipInverseDelta): "
+ + Arrays.toString(clipRect));
+ }
+
+ final double scaleX = Math.sqrt(imxx * imxx + imxy * imxy);
+ final double scaleY = Math.sqrt(imyx * imyx + imyy * imyy);
+
+ return 0.5d * (scaleX + scaleY);
}
DPathConsumer2D inverseDeltaTransformConsumer(DPathConsumer2D out,
@@ -215,7 +237,7 @@
if (mxx == 1.0d && myy == 1.0d) {
return out;
} else {
- return iv_DeltaScaleFilter.init(out, 1.0d/mxx, 1.0d/myy);
+ return iv_DeltaScaleFilter.init(out, 1.0d / mxx, 1.0d / myy);
}
} else {
final double det = mxx * myy - mxy * myx;
@@ -532,19 +554,6 @@
PathClipFilter init(final DPathConsumer2D out) {
this.out = out;
- // Adjust the clipping rectangle with the renderer offsets
- final double rdrOffX = DRenderer.RDR_OFFSET_X;
- final double rdrOffY = DRenderer.RDR_OFFSET_Y;
-
- // add a small rounding error:
- final double margin = 1e-3d;
-
- final double[] _clipRect = this.clipRect;
- _clipRect[0] -= margin - rdrOffY;
- _clipRect[1] += margin + rdrOffY;
- _clipRect[2] -= margin - rdrOffX;
- _clipRect[3] += margin + rdrOffX;
-
if (MarlinConst.DO_CLIP_SUBDIVIDER) {
// adjust padded clip rectangle:
curveSplitter.init();
@@ -867,6 +876,11 @@
private static final int MAX_N_CURVES = 3 * 4;
+ private final DRendererContext rdrCtx;
+
+ // scaled length threshold:
+ private double minLength;
+
// clip rectangle (ymin, ymax, xmin, xmax):
final double[] clipRect;
@@ -884,12 +898,23 @@
private final DCurve curve;
CurveClipSplitter(final DRendererContext rdrCtx) {
+ this.rdrCtx = rdrCtx;
this.clipRect = rdrCtx.clipRect;
this.curve = rdrCtx.curve;
}
void init() {
this.init_clipRectPad = true;
+
+ if (DO_CHECK_LENGTH) {
+ this.minLength = (this.rdrCtx.clipInvScale == 0.0d) ? LEN_TH
+ : (LEN_TH * this.rdrCtx.clipInvScale);
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("CurveClipSplitter.minLength = "
+ + minLength);
+ }
+ }
}
private void initPaddedClip() {
@@ -906,7 +931,7 @@
if (TRACE) {
MarlinUtils.logInfo("clip: X [" + _clipRectPad[2] + " .. " + _clipRectPad[3] +"] "
- + "Y ["+ _clipRectPad[0] + " .. " + _clipRectPad[1] +"]");
+ + "Y [" + _clipRectPad[0] + " .. " + _clipRectPad[1] +"]");
}
}
@@ -919,7 +944,7 @@
MarlinUtils.logInfo("divLine P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ")");
}
- if (DO_CHECK_LENGTH && DHelpers.fastLineLen(x0, y0, x1, y1) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && DHelpers.fastLineLen(x0, y0, x1, y1) <= minLength) {
return false;
}
@@ -940,7 +965,7 @@
MarlinUtils.logInfo("divQuad P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ") P2(" + x2 + ", " + y2 + ")");
}
- if (DO_CHECK_LENGTH && DHelpers.fastQuadLen(x0, y0, x1, y1, x2, y2) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && DHelpers.fastQuadLen(x0, y0, x1, y1, x2, y2) <= minLength) {
return false;
}
@@ -963,7 +988,7 @@
MarlinUtils.logInfo("divCurve P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ") P2(" + x2 + ", " + y2 + ") P3(" + x3 + ", " + y3 + ")");
}
- if (DO_CHECK_LENGTH && DHelpers.fastCurvelen(x0, y0, x1, y1, x2, y2, x3, y3) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && DHelpers.fastCurvelen(x0, y0, x1, y1, x2, y2, x3, y3) <= minLength) {
return false;
}
@@ -991,8 +1016,8 @@
outCodeOR, clipRectPad);
if (TRACE) {
- MarlinUtils.logInfo("nSplits: "+ nSplits);
- MarlinUtils.logInfo("subTs: "+Arrays.toString(Arrays.copyOfRange(subTs, 0, nSplits)));
+ MarlinUtils.logInfo("nSplits: " + nSplits);
+ MarlinUtils.logInfo("subTs: " + Arrays.toString(Arrays.copyOfRange(subTs, 0, nSplits)));
}
if (nSplits == 0) {
// only curve support shortcut
@@ -1010,7 +1035,7 @@
for (int i = 0, off = 0; i <= nSplits; i++, off += type) {
if (TRACE) {
- MarlinUtils.logInfo("Part Curve "+Arrays.toString(Arrays.copyOfRange(mid, off, off + type)));
+ MarlinUtils.logInfo("Part Curve " + Arrays.toString(Arrays.copyOfRange(mid, off, off + type)));
}
emitCurrent(type, mid, off, out);
}
--- a/src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinConst.java Mon Oct 01 09:56:45 2018 +0100
@@ -82,11 +82,11 @@
static final boolean DO_CLIP_SUBDIVIDER = MarlinProperties.isDoClipSubdivider();
- // flag to enable logs related bounds checks
+ // flag to enable logs related to bounds checks
static final boolean DO_LOG_BOUNDS = ENABLE_LOGS && false;
- // flag to enable float precision correction
- static final boolean DO_FIX_FLOAT_PREC = true;
+ // flag to enable logs related to clip rect
+ static final boolean DO_LOG_CLIP = ENABLE_LOGS && false;
// Initial Array sizing (initial context capacity) ~ 450K
--- a/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java Mon Oct 01 09:56:45 2018 +0100
@@ -31,6 +31,7 @@
import java.awt.geom.Path2D;
import java.awt.geom.PathIterator;
import java.security.AccessController;
+import java.util.Arrays;
import static sun.java2d.marlin.MarlinUtils.logInfo;
import sun.awt.geom.PathConsumer2D;
import sun.java2d.ReentrantContextProvider;
@@ -333,7 +334,6 @@
int dashLen = -1;
boolean recycleDashes = false;
- float scale = 1.0f;
if (at != null && !at.isIdentity()) {
final double a = at.getScaleX();
@@ -366,7 +366,7 @@
// a*b == -c*d && a*a+c*c == b*b+d*d. In the actual check below, we
// leave a bit of room for error.
if (nearZero(a*b + c*d) && nearZero(a*a + c*c - (b*b + d*d))) {
- scale = (float) Math.sqrt(a*a + c*c);
+ final float scale = (float) Math.sqrt(a*a + c*c);
if (dashes != null) {
recycleDashes = true;
@@ -421,7 +421,7 @@
pc2d = transformerPC2D.deltaTransformConsumer(pc2d, strokerat);
// stroker will adjust the clip rectangle (width / miter limit):
- pc2d = rdrCtx.stroker.init(pc2d, width, caps, join, miterlimit, scale,
+ pc2d = rdrCtx.stroker.init(pc2d, width, caps, join, miterlimit,
(dashes == null));
// Curve Monotizer:
@@ -831,10 +831,26 @@
// Define the initial clip bounds:
final float[] clipRect = rdrCtx.clipRect;
- clipRect[0] = clip.getLoY();
- clipRect[1] = clip.getLoY() + clip.getHeight();
- clipRect[2] = clip.getLoX();
- clipRect[3] = clip.getLoX() + clip.getWidth();
+ // Adjust the clipping rectangle with the renderer offsets
+ final float rdrOffX = Renderer.RDR_OFFSET_X;
+ final float rdrOffY = Renderer.RDR_OFFSET_Y;
+
+ // add a small rounding error:
+ final float margin = 1e-3f;
+
+ clipRect[0] = clip.getLoY()
+ - margin + rdrOffY;
+ clipRect[1] = clip.getLoY() + clip.getHeight()
+ + margin + rdrOffY;
+ clipRect[2] = clip.getLoX()
+ - margin + rdrOffX;
+ clipRect[3] = clip.getLoX() + clip.getWidth()
+ + margin + rdrOffX;
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (clip): "
+ + Arrays.toString(rdrCtx.clipRect));
+ }
// Enable clipping:
rdrCtx.doClip = true;
--- a/src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/RendererContext.java Mon Oct 01 09:56:45 2018 +0100
@@ -85,6 +85,8 @@
boolean closedPath = false;
// clip rectangle (ymin, ymax, xmin, xmax):
final float[] clipRect = new float[4];
+ // clip inverse scale (mean) to adjust length checks
+ float clipInvScale = 0.0f;
// CurveBasicMonotonizer instance
final CurveBasicMonotonizer monotonizer;
// CurveClipSplitter instance
@@ -159,6 +161,7 @@
stroking = 0;
doClip = false;
closedPath = false;
+ clipInvScale = 0.0f;
// if context is maked as DIRTY:
if (dirty) {
--- a/src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/Stroker.java Mon Oct 01 09:56:45 2018 +0100
@@ -141,7 +141,6 @@
* <code>JOIN_MITER</code>, <code>JOIN_ROUND</code> or
* <code>JOIN_BEVEL</code>.
* @param miterLimit the desired miter limit
- * @param scale scaling factor applied to clip boundaries
* @param subdivideCurves true to indicate to subdivide curves, false if dasher does
* @return this instance
*/
@@ -150,7 +149,6 @@
final int capStyle,
final int joinStyle,
final float miterLimit,
- final float scale,
final boolean subdivideCurves)
{
this.out = pc2d;
@@ -171,7 +169,6 @@
if (rdrCtx.doClip) {
// Adjust the clipping rectangle with the stroker margin (miter limit, width)
- float rdrOffX = 0.0f, rdrOffY = 0.0f;
float margin = lineWidth2;
if (capStyle == CAP_SQUARE) {
@@ -180,23 +177,21 @@
if ((joinStyle == JOIN_MITER) && (margin < limit)) {
margin = limit;
}
- if (scale != 1.0f) {
- margin *= scale;
- rdrOffX = scale * Renderer.RDR_OFFSET_X;
- rdrOffY = scale * Renderer.RDR_OFFSET_Y;
- }
- // add a small rounding error:
- margin += 1e-3f;
// bounds as half-open intervals: minX <= x < maxX and minY <= y < maxY
// adjust clip rectangle (ymin, ymax, xmin, xmax):
final float[] _clipRect = rdrCtx.clipRect;
- _clipRect[0] -= margin - rdrOffY;
- _clipRect[1] += margin + rdrOffY;
- _clipRect[2] -= margin - rdrOffX;
- _clipRect[3] += margin + rdrOffX;
+ _clipRect[0] -= margin;
+ _clipRect[1] += margin;
+ _clipRect[2] -= margin;
+ _clipRect[3] += margin;
this.clipRect = _clipRect;
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (stroker): "
+ + Arrays.toString(rdrCtx.clipRect));
+ }
+
// initialize curve splitter here for stroker & dasher:
if (DO_CLIP_SUBDIVIDER) {
subdivide = subdivideCurves;
@@ -306,13 +301,9 @@
// If it is >=0, we know that abs(ext) is <= 90 degrees, so we only
// need 1 curve to approximate the circle section that joins omx,omy
// and mx,my.
- final int numCurves = (cosext >= 0.0f) ? 1 : 2;
-
- switch (numCurves) {
- case 1:
+ if (cosext >= 0.0f) {
drawBezApproxForArc(cx, cy, omx, omy, mx, my, rev);
- break;
- case 2:
+ } else {
// we need to split the arc into 2 arcs spanning the same angle.
// The point we want will be one of the 2 intersections of the
// perpendicular bisector of the chord (omx,omy)->(mx,my) and the
@@ -341,8 +332,6 @@
}
drawBezApproxForArc(cx, cy, omx, omy, mmx, mmy, rev);
drawBezApproxForArc(cx, cy, mmx, mmy, mx, my, rev);
- break;
- default:
}
}
--- a/src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/TransformingPathConsumer2D.java Mon Oct 01 09:56:45 2018 +0100
@@ -120,44 +120,56 @@
// Scale only
if (rdrCtx.doClip) {
// adjust clip rectangle (ymin, ymax, xmin, xmax):
- adjustClipScale(rdrCtx.clipRect, mxx, myy);
+ rdrCtx.clipInvScale = adjustClipScale(rdrCtx.clipRect,
+ mxx, myy);
}
return dt_DeltaScaleFilter.init(out, mxx, myy);
}
} else {
if (rdrCtx.doClip) {
// adjust clip rectangle (ymin, ymax, xmin, xmax):
- adjustClipInverseDelta(rdrCtx.clipRect, mxx, mxy, myx, myy);
+ rdrCtx.clipInvScale = adjustClipInverseDelta(rdrCtx.clipRect,
+ mxx, mxy, myx, myy);
}
return dt_DeltaTransformFilter.init(out, mxx, mxy, myx, myy);
}
}
- private static void adjustClipOffset(final float[] clipRect) {
- clipRect[0] += Renderer.RDR_OFFSET_Y;
- clipRect[1] += Renderer.RDR_OFFSET_Y;
- clipRect[2] += Renderer.RDR_OFFSET_X;
- clipRect[3] += Renderer.RDR_OFFSET_X;
+ private static float adjustClipScale(final float[] clipRect,
+ final float mxx, final float myy)
+ {
+ // Adjust the clipping rectangle (iv_DeltaScaleFilter):
+ final float scaleY = 1.0f / myy;
+ clipRect[0] *= scaleY;
+ clipRect[1] *= scaleY;
+
+ if (clipRect[1] < clipRect[0]) {
+ float tmp = clipRect[0];
+ clipRect[0] = clipRect[1];
+ clipRect[1] = tmp;
+ }
+
+ final float scaleX = 1.0f / mxx;
+ clipRect[2] *= scaleX;
+ clipRect[3] *= scaleX;
+
+ if (clipRect[3] < clipRect[2]) {
+ float tmp = clipRect[2];
+ clipRect[2] = clipRect[3];
+ clipRect[3] = tmp;
+ }
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (ClipScale): "
+ + Arrays.toString(clipRect));
+ }
+ return 0.5f * (Math.abs(scaleX) + Math.abs(scaleY));
}
- private static void adjustClipScale(final float[] clipRect,
- final float mxx, final float myy)
+ private static float adjustClipInverseDelta(final float[] clipRect,
+ final float mxx, final float mxy,
+ final float myx, final float myy)
{
- adjustClipOffset(clipRect);
-
- // Adjust the clipping rectangle (iv_DeltaScaleFilter):
- clipRect[0] /= myy;
- clipRect[1] /= myy;
- clipRect[2] /= mxx;
- clipRect[3] /= mxx;
- }
-
- private static void adjustClipInverseDelta(final float[] clipRect,
- final float mxx, final float mxy,
- final float myx, final float myy)
- {
- adjustClipOffset(clipRect);
-
// Adjust the clipping rectangle (iv_DeltaTransformFilter):
final float det = mxx * myy - mxy * myx;
final float imxx = myy / det;
@@ -199,6 +211,16 @@
clipRect[1] = ymax;
clipRect[2] = xmin;
clipRect[3] = xmax;
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("clipRect (ClipInverseDelta): "
+ + Arrays.toString(clipRect));
+ }
+
+ final float scaleX = (float) Math.sqrt(imxx * imxx + imxy * imxy);
+ final float scaleY = (float) Math.sqrt(imyx * imyx + imyy * imyy);
+
+ return 0.5f * (scaleX + scaleY);
}
PathConsumer2D inverseDeltaTransformConsumer(PathConsumer2D out,
@@ -216,7 +238,7 @@
if (mxx == 1.0f && myy == 1.0f) {
return out;
} else {
- return iv_DeltaScaleFilter.init(out, 1.0f/mxx, 1.0f/myy);
+ return iv_DeltaScaleFilter.init(out, 1.0f / mxx, 1.0f / myy);
}
} else {
final float det = mxx * myy - mxy * myx;
@@ -533,19 +555,6 @@
PathClipFilter init(final PathConsumer2D out) {
this.out = out;
- // Adjust the clipping rectangle with the renderer offsets
- final float rdrOffX = Renderer.RDR_OFFSET_X;
- final float rdrOffY = Renderer.RDR_OFFSET_Y;
-
- // add a small rounding error:
- final float margin = 1e-3f;
-
- final float[] _clipRect = this.clipRect;
- _clipRect[0] -= margin - rdrOffY;
- _clipRect[1] += margin + rdrOffY;
- _clipRect[2] -= margin - rdrOffX;
- _clipRect[3] += margin + rdrOffX;
-
if (MarlinConst.DO_CLIP_SUBDIVIDER) {
// adjust padded clip rectangle:
curveSplitter.init();
@@ -868,6 +877,11 @@
private static final int MAX_N_CURVES = 3 * 4;
+ private final RendererContext rdrCtx;
+
+ // scaled length threshold:
+ private float minLength;
+
// clip rectangle (ymin, ymax, xmin, xmax):
final float[] clipRect;
@@ -885,12 +899,23 @@
private final Curve curve;
CurveClipSplitter(final RendererContext rdrCtx) {
+ this.rdrCtx = rdrCtx;
this.clipRect = rdrCtx.clipRect;
this.curve = rdrCtx.curve;
}
void init() {
this.init_clipRectPad = true;
+
+ if (DO_CHECK_LENGTH) {
+ this.minLength = (this.rdrCtx.clipInvScale == 0.0f) ? LEN_TH
+ : (LEN_TH * this.rdrCtx.clipInvScale);
+
+ if (MarlinConst.DO_LOG_CLIP) {
+ MarlinUtils.logInfo("CurveClipSplitter.minLength = "
+ + minLength);
+ }
+ }
}
private void initPaddedClip() {
@@ -907,7 +932,7 @@
if (TRACE) {
MarlinUtils.logInfo("clip: X [" + _clipRectPad[2] + " .. " + _clipRectPad[3] +"] "
- + "Y ["+ _clipRectPad[0] + " .. " + _clipRectPad[1] +"]");
+ + "Y [" + _clipRectPad[0] + " .. " + _clipRectPad[1] +"]");
}
}
@@ -920,7 +945,7 @@
MarlinUtils.logInfo("divLine P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ")");
}
- if (DO_CHECK_LENGTH && Helpers.fastLineLen(x0, y0, x1, y1) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && Helpers.fastLineLen(x0, y0, x1, y1) <= minLength) {
return false;
}
@@ -941,7 +966,7 @@
MarlinUtils.logInfo("divQuad P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ") P2(" + x2 + ", " + y2 + ")");
}
- if (DO_CHECK_LENGTH && Helpers.fastQuadLen(x0, y0, x1, y1, x2, y2) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && Helpers.fastQuadLen(x0, y0, x1, y1, x2, y2) <= minLength) {
return false;
}
@@ -964,7 +989,7 @@
MarlinUtils.logInfo("divCurve P0(" + x0 + ", " + y0 + ") P1(" + x1 + ", " + y1 + ") P2(" + x2 + ", " + y2 + ") P3(" + x3 + ", " + y3 + ")");
}
- if (DO_CHECK_LENGTH && Helpers.fastCurvelen(x0, y0, x1, y1, x2, y2, x3, y3) <= LEN_TH) {
+ if (DO_CHECK_LENGTH && Helpers.fastCurvelen(x0, y0, x1, y1, x2, y2, x3, y3) <= minLength) {
return false;
}
@@ -992,8 +1017,8 @@
outCodeOR, clipRectPad);
if (TRACE) {
- MarlinUtils.logInfo("nSplits: "+ nSplits);
- MarlinUtils.logInfo("subTs: "+Arrays.toString(Arrays.copyOfRange(subTs, 0, nSplits)));
+ MarlinUtils.logInfo("nSplits: " + nSplits);
+ MarlinUtils.logInfo("subTs: " + Arrays.toString(Arrays.copyOfRange(subTs, 0, nSplits)));
}
if (nSplits == 0) {
// only curve support shortcut
@@ -1011,7 +1036,7 @@
for (int i = 0, off = 0; i <= nSplits; i++, off += type) {
if (TRACE) {
- MarlinUtils.logInfo("Part Curve "+Arrays.toString(Arrays.copyOfRange(mid, off, off + type)));
+ MarlinUtils.logInfo("Part Curve " + Arrays.toString(Arrays.copyOfRange(mid, off, off + type)));
}
emitCurrent(type, mid, off, out);
}
--- a/src/java.desktop/share/classes/sun/java2d/marlin/Version.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/java2d/marlin/Version.java Mon Oct 01 09:56:45 2018 +0100
@@ -27,7 +27,7 @@
public final class Version {
- private static final String VERSION = "marlin-0.9.1-Unsafe-OpenJDK";
+ private static final String VERSION = "marlin-0.9.1.1-Unsafe-OpenJDK";
public static String getVersion() {
return VERSION;
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Mon Oct 01 09:56:45 2018 +0100
@@ -895,17 +895,16 @@
}
protected PageFormat getPageFormatFromAttributes() {
- if (attributes == null || attributes.isEmpty()) {
+ Pageable pageable = null;
+ if (attributes == null || attributes.isEmpty() ||
+ !((pageable = getPageable()) instanceof OpenBook)) {
return null;
}
PageFormat newPf = attributeToPageFormat(
getPrintService(), attributes);
PageFormat oldPf = null;
- Pageable pageable = getPageable();
- if ((pageable != null) &&
- (pageable instanceof OpenBook) &&
- ((oldPf = pageable.getPageFormat(0)) != null)) {
+ if ((oldPf = pageable.getPageFormat(0)) != null) {
// If orientation, media, imageable area attributes are not in
// "attributes" set, then use respective values of the existing
// page format "oldPf".
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Mon Oct 01 09:56:45 2018 +0100
@@ -679,7 +679,6 @@
int error, imageSize;
UInt16 width, height;
GlyphInfo *glyphInfo;
- int glyph_index;
int renderFlags = FT_LOAD_RENDER, target;
FT_GlyphSlot ftglyph;
@@ -720,8 +719,6 @@
}
renderFlags |= target;
- glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
if (error) {
//do not destroy scaler yet.
@@ -958,7 +955,6 @@
FTScalerContext *context, FTScalerInfo* scalerInfo,
jint glyphCode, jfloat xpos, jfloat ypos) {
int renderFlags;
- int glyph_index;
FT_Error error;
FT_GlyphSlot ftglyph;
@@ -974,8 +970,6 @@
renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
- glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
if (error) {
return NULL;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java Mon Oct 01 09:56:45 2018 +0100
@@ -281,8 +281,9 @@
ColorData cdata = adata.get_color_data(0);
int num_colors = cdata.get_awt_numICMcolors();
for (int i = 0; i < buf.length; i++) {
- buf[i] = (buf[i] >= num_colors) ?
- 0 : cdata.get_awt_icmLUT2Colors(buf[i]);
+ int b = Byte.toUnsignedInt(buf[i]);
+ buf[i] = (b >= num_colors) ?
+ 0 : cdata.get_awt_icmLUT2Colors(b);
}
bytes = Native.toData(buf);
} else if (srcBuf instanceof DataBufferInt) {
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -215,6 +215,12 @@
static long awt_defaultFg; // Pixel
private static XMouseInfoPeer xPeer;
+ /**
+ * Should we check "_NET_WM_STRUT/_NET_WM_STRUT_PARTIAL" during insets
+ * calculation.
+ */
+ private static Boolean checkSTRUT;
+
static {
initSecurityWarning();
if (GraphicsEnvironment.isHeadless()) {
@@ -826,13 +832,26 @@
}
/*
- * If we're running in non-Xinerama environment and the current
- * window manager supports _NET protocol then the screen insets
- * are calculated using _NET_WM_WORKAREA property of the root
- * window.
- * Otherwise, i. e. if Xinerama is on or _NET_WM_WORKAREA is
- * not set, we try to calculate the insets ourselves using
- * getScreenInsetsManually method.
+ * If the current window manager supports _NET protocol then the screen
+ * insets are calculated using _NET_WORKAREA property of the root window.
+ * <p>
+ * Note that _NET_WORKAREA is a rectangular area and it does not work
+ * well in the Xinerama mode.
+ * <p>
+ * We will trust the part of this rectangular area only if it starts at the
+ * requested graphics configuration. Below is an example when the
+ * _NET_WORKAREA intersects with the requested graphics configuration but
+ * produces wrong result.
+ *
+ * //<-x1,y1///////
+ * // // ////////////////
+ * // SCREEN1 // // SCREEN2 //
+ * // ********** // // x2,y2->//
+ * //////////////// // //
+ * ////////////////
+ *
+ * When two screens overlap and the first contains a dock(*****), then
+ * _NET_WORKAREA may start at point x1,y1 and end at point x2,y2.
*/
@Override
public Insets getScreenInsets(GraphicsConfiguration gc)
@@ -846,30 +865,33 @@
XToolkit.awtLock();
try
{
- X11GraphicsConfig x11gc = (X11GraphicsConfig)gc;
- X11GraphicsDevice x11gd = x11gc.getDevice();
- long root = XlibUtil.getRootWindow(x11gd.getScreen());
+ X11GraphicsEnvironment x11ge = (X11GraphicsEnvironment)
+ GraphicsEnvironment.getLocalGraphicsEnvironment();
+ X11GraphicsConfig x11gc = (X11GraphicsConfig) gc;
+ long root = XlibUtil.getRootWindow(x11gc.getDevice().getScreen());
int scale = x11gc.getScale();
- Rectangle rootBounds = XlibUtil.getWindowGeometry(root, scale);
-
- X11GraphicsEnvironment x11ge = (X11GraphicsEnvironment)
- GraphicsEnvironment.getLocalGraphicsEnvironment();
- if (!x11ge.runningXinerama())
- {
- Insets screenInsets = getInsets(root, rootBounds, scale);
- if (screenInsets != null) return screenInsets;
+ if (x11ge.runningXinerama() && checkSTRUT()) {
+ // implementation based on _NET_WM_STRUT/_NET_WM_STRUT_PARTIAL
+ Rectangle rootBounds = XlibUtil.getWindowGeometry(root, scale);
+ Insets insets = getScreenInsetsManually(root, rootBounds,
+ gc.getBounds(), scale);
+ if ((insets.left | insets.top | insets.bottom | insets.right) != 0
+ || rootBounds == null) {
+ return insets;
+ }
}
-
- Insets insets = getScreenInsetsManually(root, rootBounds,
- gc.getBounds(), scale);
- if ((insets.left | insets.top | insets.bottom | insets.right) == 0
- && rootBounds != null ) {
- root = XlibWrapper.RootWindow(XToolkit.getDisplay(),
- x11gd.getScreen());
- Insets screenInsets = getInsets(root, rootBounds, scale);
- if (screenInsets != null) return screenInsets;
+ Rectangle workArea = XToolkit.getWorkArea(root, scale);
+ Rectangle screen = gc.getBounds();
+ if (workArea != null && screen.contains(workArea.getLocation())) {
+ workArea = workArea.intersection(screen);
+ int top = workArea.y - screen.y;
+ int left = workArea.x - screen.x;
+ int bottom = screen.height - workArea.height - top;
+ int right = screen.width - workArea.width - left;
+ return new Insets(top, left, bottom, right);
}
- return insets;
+ // Note that it is better to return zeros than inadequate values
+ return new Insets(0, 0, 0, 0);
}
finally
{
@@ -877,14 +899,16 @@
}
}
- private Insets getInsets(long root, Rectangle rootBounds, int scale) {
- Rectangle workArea = XToolkit.getWorkArea(root, scale);
- if (workArea == null) {
- return null;
+ /**
+ * Returns the value of "sun.awt.X11.checkSTRUT" property. Default value is
+ * {@code false}.
+ */
+ private static boolean checkSTRUT() {
+ if (checkSTRUT == null) {
+ checkSTRUT = AccessController.doPrivileged(
+ new GetBooleanAction("sun.awt.X11.checkSTRUT"));
}
- return new Insets(workArea.y, workArea.x,
- rootBounds.height - workArea.height - workArea.y,
- rootBounds.width - workArea.width - workArea.x);
+ return checkSTRUT;
}
/*
@@ -893,6 +917,14 @@
* hints' values to screen insets.
*
* This method should be called under XToolkit.awtLock()
+ *
+ * This method is unused by default because of two reasons:
+ * - Iteration over windows may be extremely slow, and execution of
+ * getScreenInsets() can be x100 slower than in one monitor config.
+ * - _NET_WM_STRUT/_NET_WM_STRUT_PARTIAL are hints for the applications.
+ * WM should take into account these hints when "_NET_WORKAREA" is
+ * calculated, but the system panels do not necessarily contain these
+ * hints(Gnome 3 for example).
*/
private Insets getScreenInsetsManually(long root, Rectangle rootBounds,
Rectangle screenBounds, int scale)
--- a/src/java.desktop/unix/legal/xwindows.md Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/unix/legal/xwindows.md Mon Oct 01 09:56:45 2018 +0100
@@ -125,61 +125,6 @@
_____________________________
-Copyright notice for HPkeysym.h:
-/*
-
-Copyright 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-_____________________________________
-
Copyright notice in keysym2ucs.h:
Copyright 1987, 1994, 1998 The Open Group
--- a/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
- */
-/* $Xorg: HPkeysym.h,v 1.4 2000/08/18 04:05:43 coskrey Exp $ */
-/*
-
-Copyright 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-*/
-
-#ifndef _HPKEYSYM_H
-
-#define _HPKEYSYM_H
-
-#define hpXK_ClearLine 0x1000FF6F
-#define hpXK_InsertLine 0x1000FF70
-#define hpXK_DeleteLine 0x1000FF71
-#define hpXK_InsertChar 0x1000FF72
-#define hpXK_DeleteChar 0x1000FF73
-#define hpXK_BackTab 0x1000FF74
-#define hpXK_KP_BackTab 0x1000FF75
-#define hpXK_Modelock1 0x1000FF48
-#define hpXK_Modelock2 0x1000FF49
-#define hpXK_Reset 0x1000FF6C
-#define hpXK_System 0x1000FF6D
-#define hpXK_User 0x1000FF6E
-#define hpXK_mute_acute 0x100000A8
-#define hpXK_mute_grave 0x100000A9
-#define hpXK_mute_asciicircum 0x100000AA
-#define hpXK_mute_diaeresis 0x100000AB
-#define hpXK_mute_asciitilde 0x100000AC
-#define hpXK_lira 0x100000AF
-#define hpXK_guilder 0x100000BE
-#define hpXK_Ydiaeresis 0x100000EE
-#define hpXK_IO 0x100000EE
-#define hpXK_longminus 0x100000F6
-#define hpXK_block 0x100000FC
-
-
-#ifndef _OSF_Keysyms
-#define _OSF_Keysyms
-
-#define osfXK_Copy 0x1004FF02
-#define osfXK_Cut 0x1004FF03
-#define osfXK_Paste 0x1004FF04
-#define osfXK_BackTab 0x1004FF07
-#define osfXK_BackSpace 0x1004FF08
-#define osfXK_Clear 0x1004FF0B
-#define osfXK_Escape 0x1004FF1B
-#define osfXK_AddMode 0x1004FF31
-#define osfXK_PrimaryPaste 0x1004FF32
-#define osfXK_QuickPaste 0x1004FF33
-#define osfXK_PageLeft 0x1004FF40
-#define osfXK_PageUp 0x1004FF41
-#define osfXK_PageDown 0x1004FF42
-#define osfXK_PageRight 0x1004FF43
-#define osfXK_Activate 0x1004FF44
-#define osfXK_MenuBar 0x1004FF45
-#define osfXK_Left 0x1004FF51
-#define osfXK_Up 0x1004FF52
-#define osfXK_Right 0x1004FF53
-#define osfXK_Down 0x1004FF54
-#define osfXK_EndLine 0x1004FF57
-#define osfXK_BeginLine 0x1004FF58
-#define osfXK_EndData 0x1004FF59
-#define osfXK_BeginData 0x1004FF5A
-#define osfXK_PrevMenu 0x1004FF5B
-#define osfXK_NextMenu 0x1004FF5C
-#define osfXK_PrevField 0x1004FF5D
-#define osfXK_NextField 0x1004FF5E
-#define osfXK_Select 0x1004FF60
-#define osfXK_Insert 0x1004FF63
-#define osfXK_Undo 0x1004FF65
-#define osfXK_Menu 0x1004FF67
-#define osfXK_Cancel 0x1004FF69
-#define osfXK_Help 0x1004FF6A
-#define osfXK_SelectAll 0x1004FF71
-#define osfXK_DeselectAll 0x1004FF72
-#define osfXK_Reselect 0x1004FF73
-#define osfXK_Extend 0x1004FF74
-#define osfXK_Restore 0x1004FF78
-#define osfXK_Delete 0x1004FFFF
-
-#endif /* _OSF_Keysyms */
-
-
-/**************************************************************
- * The use of the following macros is deprecated.
- * They are listed below only for backwards compatibility.
- */
-#define XK_Reset 0x1000FF6C
-#define XK_System 0x1000FF6D
-#define XK_User 0x1000FF6E
-#define XK_ClearLine 0x1000FF6F
-#define XK_InsertLine 0x1000FF70
-#define XK_DeleteLine 0x1000FF71
-#define XK_InsertChar 0x1000FF72
-#define XK_DeleteChar 0x1000FF73
-#define XK_BackTab 0x1000FF74
-#define XK_KP_BackTab 0x1000FF75
-#define XK_Ext16bit_L 0x1000FF76
-#define XK_Ext16bit_R 0x1000FF77
-#define XK_mute_acute 0x100000a8
-#define XK_mute_grave 0x100000a9
-#define XK_mute_asciicircum 0x100000aa
-#define XK_mute_diaeresis 0x100000ab
-#define XK_mute_asciitilde 0x100000ac
-#define XK_lira 0x100000af
-#define XK_guilder 0x100000be
-#ifndef XK_Ydiaeresis
-#define XK_Ydiaeresis 0x100000ee
-#endif
-#define XK_IO 0x100000ee
-#define XK_longminus 0x100000f6
-#define XK_block 0x100000fc
-
-#endif /* _HPKEYSYM_H */
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c Wed Sep 26 18:11:00 2018 +0100
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c Mon Oct 01 09:56:45 2018 +0100
@@ -54,17 +54,12 @@
#include <X11/Sunkeysym.h> /* Sun vendor-specific */
#include <X11/ap_keysym.h> /* Apollo (HP) vendor-specific */
/*
- * #include <X11/HPkeysym.h> HP vendor-specific
- * I checked HPkeysym.h into the workspace because although
- * I think it will ship with X11R6.4.2 (and later) on Linux,
- * it doesn't seem to be in Solaris 9 Update 2.
- *
- * This is done not only for the hp keysyms, but also to
+ * HPKeysym.h is used not only for the hp keysyms, but also to
* give us the osf keysyms that are also defined in HPkeysym.h.
* However, HPkeysym.h is missing a couple of osf keysyms,
* so I have #defined them below.
*/
-#include "HPkeysym.h" /* HP vendor-specific */
+#include <X11/HPkeysym.h> /* HP vendor-specific */
#include "java_awt_event_KeyEvent.h"
#include "java_awt_event_InputEvent.h"
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java Mon Oct 01 09:56:45 2018 +0100
@@ -433,7 +433,9 @@
SYSTEM_MODULE(Flags.SYSTEM_MODULE),
DEPRECATED_ANNOTATION(Flags.DEPRECATED_ANNOTATION),
DEPRECATED_REMOVAL(Flags.DEPRECATED_REMOVAL),
- HAS_RESOURCE(Flags.HAS_RESOURCE);
+ HAS_RESOURCE(Flags.HAS_RESOURCE),
+ POTENTIALLY_AMBIGUOUS(Flags.POTENTIALLY_AMBIGUOUS),
+ ANONCONSTR_BASED(Flags.ANONCONSTR_BASED);
Flag(long flag) {
this.value = flag;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java Mon Oct 01 09:56:45 2018 +0100
@@ -166,10 +166,10 @@
res = EnumSet.allOf(AnalyzerMode.class);
}
for (AnalyzerMode mode : values()) {
- if (modes.contains(mode.opt)) {
+ if (modes.contains("-" + mode.opt) || !mode.feature.allowedInSource(source)) {
+ res.remove(mode);
+ } else if (modes.contains(mode.opt)) {
res.add(mode);
- } else if (modes.contains("-" + mode.opt) || !mode.feature.allowedInSource(source)) {
- res.remove(mode);
}
}
return res;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Mon Oct 01 09:56:45 2018 +0100
@@ -2689,12 +2689,14 @@
*/
@Override
public void visitLambda(final JCLambda that) {
+ boolean wrongContext = false;
if (pt().isErroneous() || (pt().hasTag(NONE) && pt() != Type.recoveryType)) {
if (pt().hasTag(NONE) && (env.info.enclVar == null || !env.info.enclVar.type.isErroneous())) {
//lambda only allowed in assignment or method invocation/cast context
log.error(that.pos(), Errors.UnexpectedLambda);
}
resultInfo = recoveryInfo;
+ wrongContext = true;
}
//create an environment for attribution of the lambda expression
final Env<AttrContext> localEnv = lambdaEnv(that, env);
@@ -2811,7 +2813,8 @@
checkAccessibleTypes(that, localEnv, resultInfo.checkContext.inferenceContext(), lambdaType, currentTarget);
}
- result = check(that, currentTarget, KindSelector.VAL, resultInfo);
+ result = wrongContext ? that.type = types.createErrorType(pt())
+ : check(that, currentTarget, KindSelector.VAL, resultInfo);
} catch (Types.FunctionDescriptorLookupError ex) {
JCDiagnostic cause = ex.getDiagnostic();
resultInfo.checkContext.report(that, cause);
@@ -5343,23 +5346,12 @@
}
@Override
- public void visitLambda(JCLambda that) {
- super.visitLambda(that);
- if (that.target == null) {
- that.target = syms.unknownType;
- }
- }
-
- @Override
public void visitReference(JCMemberReference that) {
super.visitReference(that);
if (that.sym == null) {
that.sym = new MethodSymbol(0, names.empty, dummyMethodType(),
syms.noSymbol);
}
- if (that.target == null) {
- that.target = syms.unknownType;
- }
}
}
// </editor-fold>
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/Main.java Mon Oct 01 09:56:45 2018 +0100
@@ -50,6 +50,9 @@
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -182,7 +185,7 @@
public void run(String[] runtimeArgs, String[] args) throws Fault, InvocationTargetException {
Path file = getFile(args);
- Context context = new Context();
+ Context context = new Context(file.toAbsolutePath());
String mainClassName = compile(file, getJavacOpts(runtimeArgs), context);
String[] appArgs = Arrays.copyOfRange(args, 1, args.length);
@@ -193,7 +196,7 @@
* Returns the path for the filename found in the first of an array of arguments.
*
* @param args the array
- * @return the path
+ * @return the path, as given in the array of args
* @throws Fault if there is a problem determining the path, or if the file does not exist
*/
private Path getFile(String[] args) throws Fault {
@@ -396,6 +399,7 @@
*/
private void execute(String mainClassName, String[] appArgs, Context context)
throws Fault, InvocationTargetException {
+ System.setProperty("jdk.launcher.sourcefile", context.file.toString());
ClassLoader cl = context.getClassLoader(ClassLoader.getSystemClassLoader());
try {
Class<?> appClass = Class.forName(mainClassName, true, cl);
@@ -478,14 +482,19 @@
* a class loader.
*/
private static class Context {
- private Map<String, byte[]> inMemoryClasses = new HashMap<>();
+ private final Path file;
+ private final Map<String, byte[]> inMemoryClasses = new HashMap<>();
+
+ Context(Path file) {
+ this.file = file;
+ }
JavaFileManager getFileManager(StandardJavaFileManager delegate) {
return new MemoryFileManager(inMemoryClasses, delegate);
}
ClassLoader getClassLoader(ClassLoader parent) {
- return new MemoryClassLoader(inMemoryClasses, parent);
+ return new MemoryClassLoader(inMemoryClasses, parent, file);
}
}
@@ -546,9 +555,22 @@
*/
private final Map<String, byte[]> sourceFileClasses;
- MemoryClassLoader(Map<String, byte[]> sourceFileClasses, ClassLoader parent) {
+ /**
+ * A minimal protection domain, specifying a code source of the source file itself,
+ * used for classes found in the source file and defined by this loader.
+ */
+ private final ProtectionDomain domain;
+
+ MemoryClassLoader(Map<String, byte[]> sourceFileClasses, ClassLoader parent, Path file) {
super(parent);
this.sourceFileClasses = sourceFileClasses;
+ CodeSource codeSource;
+ try {
+ codeSource = new CodeSource(file.toUri().toURL(), (CodeSigner[]) null);
+ } catch (MalformedURLException e) {
+ codeSource = null;
+ }
+ domain = new ProtectionDomain(codeSource, null, this, null);
}
/**
@@ -632,7 +654,7 @@
if (bytes == null) {
throw new ClassNotFoundException(name);
}
- return defineClass(name, bytes, 0, bytes.length);
+ return defineClass(name, bytes, 0, bytes.length, domain);
}
@Override
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Mon Oct 01 09:56:45 2018 +0100
@@ -328,7 +328,7 @@
ENCODING("-encoding", "opt.arg.encoding", "opt.encoding", STANDARD, FILEMANAGER),
- SOURCE("-source", "opt.arg.release", "opt.source", STANDARD, BASIC) {
+ SOURCE("--source -source", "opt.arg.release", "opt.source", STANDARD, BASIC) {
@Override
public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
Source source = Source.lookup(operand);
@@ -349,7 +349,7 @@
}
},
- TARGET("-target", "opt.arg.release", "opt.target", STANDARD, BASIC) {
+ TARGET("--target -target", "opt.arg.release", "opt.target", STANDARD, BASIC) {
@Override
public void process(OptionHelper helper, String option, String operand) throws InvalidValueException {
Target target = Target.lookup(operand);
--- a/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java Mon Oct 01 09:56:45 2018 +0100
@@ -380,8 +380,8 @@
String platformString = compOpts.get("--release");
if (platformString != null) {
- if (compOpts.isSet("-source")) {
- usageError("main.release.bootclasspath.conflict", "-source");
+ if (compOpts.isSet(Option.SOURCE.primaryName)) {
+ usageError("main.release.bootclasspath.conflict", Option.SOURCE.primaryName);
}
if (fileManagerOpts.containsKey(Option.BOOT_CLASS_PATH)) {
usageError("main.release.bootclasspath.conflict", Option.BOOT_CLASS_PATH.getPrimaryName());
--- a/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Mon Oct 01 09:56:45 2018 +0100
@@ -174,6 +174,13 @@
SOURCE("-source", true) {
@Override
public void process(Helper helper, String arg) {
+ helper.setCompilerOpt("--source", arg);
+ }
+ },
+
+ SOURCE2("--source", true) {
+ @Override
+ public void process(Helper helper, String arg) {
helper.setCompilerOpt(opt, arg);
}
},
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Mon Oct 01 09:56:45 2018 +0100
@@ -146,7 +146,7 @@
}
},
- SOURCE("-source", STANDARD, true) {
+ SOURCE("--source -source", STANDARD, true) {
@Override
public void process(Helper helper, String arg) throws InvalidValueException {
Option.SOURCE.process(helper.getOptionHelper(), primaryName, arg);
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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,8 +44,8 @@
* {@link #startListening} may allow
* multiple target VM to become connected.
*
- * @return <code>true</code> if multiple connections are supported;
- * <code>false</code> otherwise.
+ * @return {@code true} if multiple connections are supported;
+ * {@code false} otherwise.
*/
boolean supportsMultipleConnections();
@@ -70,7 +70,7 @@
* {@link #accept} (using the same argument map as is passed to this
* method).
* <p>
- * If <code>arguments</code> contains addressing information. and
+ * If {@code arguments} contains addressing information and
* only one connection will be accepted, the {@link #accept accept} method
* can be called immediately without calling this method.
*
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/GenericListeningConnector.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -113,8 +113,8 @@
throw new IllegalConnectorArgumentsException("Already listening",
new ArrayList<>(args.keySet()));
}
-
listener = transportService.startListening(address);
+ updateArgumentMapIfRequired(args, listener);
listenMap.put(args, listener);
return listener.address();
}
@@ -183,4 +183,9 @@
public Transport transport() {
return transport;
}
+
+ protected void updateArgumentMapIfRequired(
+ Map<String, ? extends Connector.Argument> args, TransportService.ListenKey listener) {
+ }
+
}
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SocketListeningConnector.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -30,6 +30,7 @@
import com.sun.jdi.connect.Connector;
import com.sun.jdi.connect.IllegalConnectorArgumentsException;
import com.sun.jdi.connect.Transport;
+import com.sun.jdi.connect.spi.TransportService;
/*
* A ListeningConnector that uses the SocketTransportService
@@ -92,4 +93,21 @@
public String description() {
return getString("socket_listening.description");
}
+
+ // If the port is auto detected update the argument map with the bound port number.
+ @Override
+ protected void updateArgumentMapIfRequired(
+ Map<String, ? extends Connector.Argument> args, TransportService.ListenKey listener) {
+ if (isWildcardPort(args)) {
+ String[] address = listener.address().split(":");
+ if (address.length > 1) {
+ args.get(ARG_PORT).setValue(address[1]);
+ }
+ }
+ }
+
+ private boolean isWildcardPort(Map<String, ? extends Connector.Argument> args) {
+ String port = args.get(ARG_PORT).value();
+ return port.isEmpty() || Integer.valueOf(port) == 0;
+ }
}
--- a/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java Wed Sep 26 18:11:00 2018 +0100
+++ b/src/jdk.unsupported/share/classes/sun/reflect/ReflectionFactory.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -29,14 +29,9 @@
import java.lang.invoke.MethodHandle;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.Permission;
-import java.security.ProtectionDomain;
import java.security.PrivilegedAction;
-import jdk.internal.misc.SharedSecrets;
-import jdk.internal.misc.JavaSecurityAccess;
/**
* ReflectionFactory supports custom serialization.
@@ -145,66 +140,6 @@
}
/**
- * Invokes the supplied constructor, adding the provided protection domains
- * to the invocation stack before invoking {@code Constructor::newInstance}.
- * If no {@linkplain System#getSecurityManager() security manager} is present,
- * or no domains are provided, then this method simply calls
- * {@code cons.newInstance()}. Otherwise, it invokes the provided constructor
- * with privileges at the intersection of the current context and the provided
- * protection domains.
- *
- * @param cons A constructor obtained from {@code
- * newConstructorForSerialization} or {@code
- * newConstructorForExternalization}.
- * @param domains An array of protection domains that limit the privileges
- * with which the constructor is invoked. Can be {@code null}
- * or empty, in which case privileges are only limited by the
- * {@linkplain AccessController#getContext() current context}.
- *
- * @return A new object built from the provided constructor.
- *
- * @throws NullPointerException if {@code cons} is {@code null}.
- * @throws InstantiationException if thrown by {@code cons.newInstance()}.
- * @throws InvocationTargetException if thrown by {@code cons.newInstance()}.
- * @throws IllegalAccessException if thrown by {@code cons.newInstance()}.
- */
- public final Object newInstanceForSerialization(Constructor<?> cons,
- ProtectionDomain[] domains)
- throws InstantiationException, InvocationTargetException, IllegalAccessException
- {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null || domains == null || domains.length == 0) {
- return cons.newInstance();
- } else {
- JavaSecurityAccess jsa = SharedSecrets.getJavaSecurityAccess();
- PrivilegedAction<?> pea = () -> {
- try {
- return cons.newInstance();
- } catch (InstantiationException
- | InvocationTargetException
- | IllegalAccessException x) {
- throw new UndeclaredThrowableException(x);
- }
- }; // Can't use PrivilegedExceptionAction with jsa
- try {
- return jsa.doIntersectionPrivilege(pea,
- AccessController.getContext(),
- new AccessControlContext(domains));
- } catch (UndeclaredThrowableException x) {
- Throwable cause = x.getCause();
- if (cause instanceof InstantiationException)
- throw (InstantiationException) cause;
- if (cause instanceof InvocationTargetException)
- throw (InvocationTargetException) cause;
- if (cause instanceof IllegalAccessException)
- throw (IllegalAccessException) cause;
- // not supposed to happen
- throw x;
- }
- }
- }
-
- /**
* Returns a direct MethodHandle for the {@code readObjectNoData} method on
* a Serializable class.
* The first argument of {@link MethodHandle#invoke} is the serializable
--- a/test/hotspot/gtest/code/test_dependencyContext.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/gtest/code/test_dependencyContext.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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 @@
}
~TestDependencyContext() {
- dependencies().wipe();
+ wipe();
CodeCache_lock->unlock();
}
@@ -63,6 +63,18 @@
return ctx.find_stale_entries();
}
#endif
+
+ void wipe() {
+ DependencyContext ctx(&_dependency_context);
+ nmethodBucket* b = ctx.dependencies();
+ ctx.set_dependencies(NULL);
+ ctx.set_has_stale_entries(false);
+ while (b != NULL) {
+ nmethodBucket* next = b->next();
+ delete b;
+ b = next;
+ }
+ }
};
static void test_remove_dependent_nmethod(int id, bool delete_immediately) {
--- a/test/hotspot/jtreg/ProblemList-graal.txt Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/ProblemList-graal.txt Mon Oct 01 09:56:45 2018 +0100
@@ -175,7 +175,7 @@
org.graalvm.compiler.replacements.test.classfile.RedefineIntrinsicTest 8205081
org.graalvm.compiler.core.test.deopt.CompiledMethodTest 8202955
-org.graalvm.compiler.core.test.CountedLoopTest 8199885
+org.graalvm.compiler.core.test.CountedLoopTest 8211179
org.graalvm.compiler.debug.test.DebugContextTest 8203504
org.graalvm.compiler.hotspot.test.GraalOSRTest 8206947
--- a/test/hotspot/jtreg/compiler/graalunit/CoreTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -25,7 +25,7 @@
* @test
* @summary
* @requires vm.opt.final.EnableJVMCI == true
- *
+ * @requires !vm.graal.enabled
* @modules jdk.internal.vm.compiler
*
* @library /test/lib /compiler/graalunit /
--- a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt Mon Oct 01 09:56:45 2018 +0100
@@ -6,7 +6,7 @@
AsmSparc org.graalvm.compiler.asm.sparc.test
CoreAmd64 org.graalvm.compiler.core.amd64.test
CoreSparc org.graalvm.compiler.core.sparc.test @requires vm.simpleArch == "sparcv9"
-Core org.graalvm.compiler.core.test
+Core org.graalvm.compiler.core.test @requires !vm.graal.enabled
Debug org.graalvm.compiler.debug.test
Graph org.graalvm.compiler.graph.test @requires vm.graal.enabled
HotspotAmd64 org.graalvm.compiler.hotspot.amd64.test
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAt.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAt.java Mon Oct 01 09:56:45 2018 +0100
@@ -24,7 +24,7 @@
/* @test TestAllocateHeapAt.java
* @key gc
* @summary Test to check allocation of Java Heap with AllocateHeapAt option
- * @requires vm.gc != "Z"
+ * @requires vm.gc != "Z" & os.family != "aix"
* @library /test/lib
* @modules java.base/jdk.internal.misc
*/
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtError.java Mon Oct 01 09:56:45 2018 +0100
@@ -24,7 +24,7 @@
/* @test TestAllocateHeapAtError.java
* @key gc
* @summary Test to check correct handling of non-existent directory passed to AllocateHeapAt option
- * @requires vm.gc != "Z"
+ * @requires vm.gc != "Z" & os.family != "aix"
* @library /test/lib
* @modules java.base/jdk.internal.misc
*/
--- a/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java Mon Oct 01 09:56:45 2018 +0100
@@ -26,7 +26,7 @@
* @summary Test to check allocation of Java Heap with AllocateHeapAt option. Has multiple sub-tests to cover different code paths.
* @library /test/lib
* @modules java.base/jdk.internal.misc
- * @requires vm.bits == "64" & vm.gc != "Z"
+ * @requires vm.bits == "64" & vm.gc != "Z" & os.family != "aix"
*/
import jdk.test.lib.JDKToolFinder;
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithAllocateHeapAt.java Mon Oct 01 09:56:45 2018 +0100
@@ -28,7 +28,7 @@
* @test TestGCBasherWithAllocateHeapAt
* @key gc stress
* @requires vm.gc.G1
- * @requires vm.flavor == "server" & !vm.emulatedClient
+ * @requires vm.flavor == "server" & !vm.emulatedClient & os.family != "aix"
* @summary Stress Java heap allocation with AllocateHeapAt flag using GC basher.
* @run main/othervm/timeout=500 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC -XX:AllocateHeapAt=. TestGCBasherWithAllocateHeapAt 120000
*/
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Mon Oct 01 09:56:45 2018 +0100
@@ -46,6 +46,7 @@
{"InitialRAMFraction", "64"},
{"AssumeMP", "false"},
{"UseMembar", "true"},
+ {"TLABStats", "false"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},
--- a/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/runtime/appcds/GraalWithLimitedMetaspace.java Mon Oct 01 09:56:45 2018 +0100
@@ -87,7 +87,6 @@
static void dumpLoadedClasses(String[] expectedClasses) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-XX:DumpLoadedClassList=" + CLASSLIST_FILE,
// trigger JVMCI runtime init so that JVMCI classes will be
// included in the classlist
@@ -95,7 +94,7 @@
"-cp",
TESTJAR,
TESTNAME,
- TEST_OUT));
+ TEST_OUT);
OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-loaded-classes")
.shouldHaveExitValue(0)
@@ -113,7 +112,6 @@
static void dumpArchive() throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-cp",
TESTJAR,
"-XX:SharedClassListFile=" + CLASSLIST_FILE,
@@ -121,7 +119,7 @@
"-Xlog:cds",
"-Xshare:dump",
"-XX:MetaspaceSize=12M",
- "-XX:MaxMetaspaceSize=12M"));
+ "-XX:MaxMetaspaceSize=12M");
OutputAnalyzer output = TestCommon.executeAndLog(pb, "dump-archive");
int exitValue = output.getExitValue();
--- a/test/hotspot/jtreg/runtime/appcds/TestCommon.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/runtime/appcds/TestCommon.java Mon Oct 01 09:56:45 2018 +0100
@@ -110,10 +110,6 @@
return createArchive(opts);
}
- public static String[] makeCommandLineForAppCDS(String... args) throws Exception {
- return args;
- }
-
// Create AppCDS archive using appcds options
public static OutputAnalyzer createArchive(AppCDSOptions opts)
throws Exception {
@@ -143,7 +139,7 @@
for (String s : opts.suffix) cmd.add(s);
String[] cmdLine = cmd.toArray(new String[cmd.size()]);
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, makeCommandLineForAppCDS(cmdLine));
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmdLine);
return executeAndLog(pb, "dump");
}
@@ -169,7 +165,7 @@
for (String s : opts.suffix) cmd.add(s);
String[] cmdLine = cmd.toArray(new String[cmd.size()]);
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, makeCommandLineForAppCDS(cmdLine));
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmdLine);
return executeAndLog(pb, "exec");
}
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SharedStringsBasic.java Mon Oct 01 09:56:45 2018 +0100
@@ -49,24 +49,22 @@
TestCommon.getSourceFile("SharedStringsBasic.txt").toString();
ProcessBuilder dumpPb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-cp", appJar,
"-XX:SharedArchiveConfigFile=" + sharedArchiveConfigFile,
"-XX:SharedArchiveFile=./SharedStringsBasic.jsa",
"-Xshare:dump",
- "-Xlog:cds,cds+hashtables"));
+ "-Xlog:cds,cds+hashtables");
TestCommon.executeAndLog(dumpPb, "dump")
.shouldContain("Shared string table stats")
.shouldHaveExitValue(0);
ProcessBuilder runPb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-cp", appJar,
"-XX:SharedArchiveFile=./SharedStringsBasic.jsa",
"-Xshare:auto",
"-showversion",
- "HelloString"));
+ "HelloString");
TestCommon.executeAndLog(runPb, "run").shouldHaveExitValue(0);
}
--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java Mon Oct 01 09:56:45 2018 +0100
@@ -44,21 +44,19 @@
// SharedBaseAddress=0 puts the archive at a very high address on solaris,
// which provokes the crash.
ProcessBuilder dumpPb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5",
"-cp", ".",
"-XX:SharedBaseAddress=0", "-XX:SharedArchiveFile=./SysDictCrash.jsa",
"-Xshare:dump",
- "-showversion", "-Xlog:cds,cds+hashtables"));
+ "-showversion", "-Xlog:cds,cds+hashtables");
TestCommon.checkDump(TestCommon.executeAndLog(dumpPb, "dump"));
ProcessBuilder runPb = ProcessTools.createJavaProcessBuilder(true,
- TestCommon.makeCommandLineForAppCDS(
"-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5",
"-XX:SharedArchiveFile=./SysDictCrash.jsa",
"-Xshare:on",
- "-version"));
+ "-version");
TestCommon.checkExec(TestCommon.executeAndLog(runPb, "exec"));
}
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java Mon Oct 01 09:56:45 2018 +0100
@@ -79,6 +79,7 @@
CDSTestUtils.createArchiveAndCheck(opts);
String[] jArgs = {
+ "-Xmx512m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:SharedArchiveFile=" + SHARED_ARCHIVE_NAME,
"-XX:+CreateCoredumpOnCrash",
--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java Mon Oct 01 09:56:45 2018 +0100
@@ -123,6 +123,7 @@
try {
List<String> vmArgs = new ArrayList<String>();
vmArgs.add("-XX:+UsePerfData");
+ vmArgs.add("-Xmx512m");
vmArgs.addAll(Utils.getVmOptions());
theApp = new LingeredAppWithInvokeDynamic();
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java Mon Oct 01 09:56:45 2018 +0100
@@ -87,7 +87,7 @@
static void test(String type) throws Throwable {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, "-XX:+CreateCoredumpOnCrash",
- "-XX:MaxMetaspaceSize=64m", "-XX:+CrashOnOutOfMemoryError",
+ "-Xmx512m", "-XX:MaxMetaspaceSize=64m", "-XX:+CrashOnOutOfMemoryError",
TestJmapCore.class.getName(), type);
boolean useDefaultUlimit = useDefaultUlimit();
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java Mon Oct 01 09:56:45 2018 +0100
@@ -61,9 +61,9 @@
* @run driver jdk.test.lib.FileInstaller . .
* @build nsk.jdb.exclude.exclude001.exclude001
* nsk.jdb.exclude.exclude001.exclude001a
- * @run main/othervm/timeout=420 PropertyResolvingWrapper nsk.jdb.exclude.exclude001.exclude001
+ * @run main/othervm/timeout=600 PropertyResolvingWrapper nsk.jdb.exclude.exclude001.exclude001
* -arch=${os.family}-${os.simpleArch}
- * -waittime=7
+ * -waittime=10
* -debugee.vmkind=java
* -transport.address=dynamic
* -jdb=${test.jdk}/bin/jdb
@@ -129,7 +129,7 @@
oldExclude = reply[0];
for (int testCase = 0; testCase < exclude001a.numThreads; testCase++) {
-
+ String expectedPrompt = MYTHREAD + "-" + testCase + "[1]";
reply = jdb.receiveReplyFor(JdbCommand.cont);
if (jdb.isAtBreakpoint(reply, LAST_BREAK)) {
@@ -153,14 +153,14 @@
reply = jdb.receiveReplyFor(JdbCommand.exclude + "javax.*,sun.*,com.sun.*,jdk.*");
break;
case 2: // allow sun.*
- reply = jdb.receiveReplyFor(JdbCommand.exclude + "java.*,javax.*,com.sun.*,jdk.");
+ reply = jdb.receiveReplyFor(JdbCommand.exclude + "java.*,javax.*,com.sun.*,jdk.*");
break;
}
reply = jdb.receiveReplyFor(JdbCommand.trace + "methods " + threads[0]);
while (true) {
- reply = jdb.receiveReplyFor(JdbCommand.cont);
+ reply = jdb.receiveReplyForWithMessageWait(JdbCommand.cont, expectedPrompt);
grep = new Paragrep(reply);
count = grep.find(JAVA_CORE_METHOD);
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -174,6 +174,23 @@
return JNI_OK;
}
+JNIEXPORT jboolean JNICALL
+Java_nsk_jvmti_scenarios_hotswap_HS203_hs203t003_hs203t003_isSuspended(JNIEnv * jni,
+ jclass clas,
+ jthread thread) {
+ jboolean retvalue;
+ jint state;
+ retvalue = JNI_FALSE;
+ if ( ! NSK_JVMTI_VERIFY( NSK_CPP_STUB3(GetThreadState, jvmti, thread, &state) ) ) {
+ nsk_printf(" Agent :: Error while getting thread state.\n");
+ nsk_jvmti_agentFailed();
+ } else {
+ if ( state & JVMTI_THREAD_STATE_SUSPENDED) {
+ retvalue = JNI_TRUE;
+ }
+ }
+ return retvalue;
+}
JNIEXPORT jboolean JNICALL
Java_nsk_jvmti_scenarios_hotswap_HS203_hs203t003_hs203t003_popThreadFrame(JNIEnv * jni,
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.java Mon Oct 01 09:56:45 2018 +0100
@@ -62,7 +62,8 @@
public class hs203t003 extends RedefineAgent {
public native boolean popThreadFrame(Thread thread);
- public native boolean resumeThread(Thread thread);
+ public native boolean isSuspended(Thread thread);
+ public native boolean resumeThread(Thread thread);
public hs203t003(String[] arg) {
@@ -82,10 +83,10 @@
MyThread mt = new MyThread();
try {
mt.start();
- // check if we can can pop the thread.
- // we can not do redefine/pop frame on run method.
+ // Check if we can can pop the thread.
+ // We can not do redefine/pop frame on run method.
while (!MyThread.resume.get());
- // sleep for some few secs to get redefined.
+ // Sleep for some few secs to get redefined.
while (!isRedefined()) {
if (!agentStatus()) {
System.out.println("Failed to redefine class");
@@ -93,10 +94,26 @@
}
Thread.sleep(100);
}
- popThreadFrame(mt); // pop the frame.
- resumeThread(mt); // resume the thread.
+ // Wait for the thread to be suspended.
+ while (!isSuspended(mt)) {
+ if (!agentStatus()) {
+ System.out.println("Failed to suspend thread");
+ return passed;
+ }
+ Thread.sleep(100);
+ }
+ // Pop the frame.
+ if (!popThreadFrame(mt)) {
+ System.out.println("Failed to pop a frame = "
+ + mt.threadState);
+ }
+ // Resume the thread.
+ if(!resumeThread(mt)) {
+ System.out.println("Failed to resume the thread = "
+ + mt.threadState);
+ }
+ // Wait till the other thread completes its execution.
mt.join();
- // wait till the other thread completes its execution.
System.out.println("Thread state after popping/redefining = "
+ mt.threadState);
} catch(Exception ie) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -29,31 +29,27 @@
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
return 2
#define CALL_STATIC_VOID_NOPARAM(_class, _methodName)\
GET_STATIC_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallStaticVoidMethod, env,\
- _class, method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method)))\
return 2
#define GET_STATIC_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetStaticMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetStaticMethodID(_class, _methodName, _sig)) != NULL))\
return 2
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetMethodID(_class, _methodName, _sig)) != NULL))\
return 2
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method)))\
return 2
JNIEXPORT jint JNICALL
@@ -71,18 +67,13 @@
if (returnToJava) {
GET_METHOD_ID(method, threadClass, "recursionJava", "(II)V");
if (!NSK_JNI_VERIFY_VOID(env,
- NSK_CPP_STUB5(CallIntMethod, env, obj,
- method, maxDepth,
- currentDepth))) {
+ env->CallIntMethod(obj, method, maxDepth, currentDepth))) {
return 1;
}
} else {
GET_METHOD_ID(method, threadClass, "recursionNative", "(IIZ)I");
if (!NSK_JNI_VERIFY_VOID(env,
- NSK_CPP_STUB6(CallIntMethod, env, obj,
- method, maxDepth,
- currentDepth,
- returnToJava))) {
+ env->CallIntMethod(obj, method, maxDepth, currentDepth, returnToJava))) {
return 1;
}
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -31,131 +31,121 @@
#define FIND_CLASS(_class, _className)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(FindClass, env, _className)) != NULL))\
+ env->FindClass(_className)) != NULL))\
return
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
return
#define GET_STATIC_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetStaticFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetStaticFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_STATIC_OBJ_FIELD(_value, _class, _fieldName, _fieldSig)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetStaticObjectField, env, _class, \
- field)
+ _value = env->GetStaticObjectField(_class, field)
#define GET_STATIC_BOOL_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "Z");\
- _value = NSK_CPP_STUB3(GetStaticBooleanField, env, _class, field)
+ _value = env->GetStaticBooleanField(_class, field)
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_INT_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetIntField, env, _obj, field)
+ _value = env->GetIntField(_obj, field)
#define GET_BOOL_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "Z");\
- _value = NSK_CPP_STUB3(GetBooleanField, env, _obj, field)
+ _value = env->GetBooleanField(_obj, field)
#define GET_LONG_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "J");\
- _value = NSK_CPP_STUB3(GetLongField, env, _obj, field)
+ _value = env->GetLongField(_obj, field)
#define GET_STATIC_INT_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetStaticIntField, env, _class, field)
+ _value = env->GetStaticIntField(_class, field)
#define SET_INT_FIELD(_obj, _class, _fieldName, _newValue)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- NSK_CPP_STUB4(SetIntField, env, _obj, field, _newValue)
+ env->SetIntField(_obj, field, _newValue)
#define GET_OBJ_FIELD(_value, _obj, _class, _fieldName, _fieldSig)\
GET_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetObjectField, env, _obj, field)
+ _value = env->GetObjectField(_obj, field)
#define GET_ARR_ELEMENT(_arr, _index)\
- NSK_CPP_STUB3(GetObjectArrayElement, env, _arr, _index)
+ env->GetObjectArrayElement(_arr, _index)
#define SET_ARR_ELEMENT(_arr, _index, _newValue)\
- NSK_CPP_STUB4(SetObjectArrayElement, env, _arr, _index, _newValue)
+ env->SetObjectArrayElement(_arr, _index, _newValue)
#define GET_STATIC_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetStaticMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetStaticMethodID(_class, _methodName, _sig)) != NULL))\
return
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetMethodID(_class, _methodName, _sig)) != NULL))\
return
#define CALL_STATIC_VOID_NOPARAM(_class, _methodName)\
GET_STATIC_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallStaticVoidMethod, env,\
- _class, method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method)))\
return
#define CALL_STATIC_VOID(_class, _methodName, _sig, _param)\
GET_STATIC_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallStaticVoidMethod, env,\
- _class, method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method, _param)))\
return
#define CALL_STATIC_OBJ(_value, _class, _methodName, _sig, _param)\
GET_STATIC_METHOD_ID(method, _class, _methodName, _sig);\
- _value = NSK_CPP_STUB4(CallStaticObjectMethod, env, _class, method, _param)
+ _value = env->CallStaticObjectMethod(_class, method, _param)
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method)))\
return
#define CALL_VOID(_obj, _class, _methodName, _sig, _param)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallVoidMethod, env, _obj,\
- method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method, _param)))\
return
#define CALL_VOID2(_obj, _class, _methodName, _sig, _param1, _param2)\
GET_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB5(CallVoidMethod, env, _obj, \
- method, _param1, _param2)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method, _param1, _param2)))\
return
#define CALL_INT_NOPARAM(_value, _obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()I");\
- _value = NSK_CPP_STUB3(CallIntMethod, env, _obj, method)
+ _value = env->CallIntMethod(_obj, method)
#define NEW_OBJ(_obj, _class, _constructorName, _sig, _params)\
GET_METHOD_ID(method, _class, _constructorName, _sig);\
if (!NSK_JNI_VERIFY(env, (_obj = \
- NSK_CPP_STUB4(NewObject, env, _class, method, _params)) != NULL))\
+ env->NewObject(_class, method, _params)) != NULL))\
return
#define MONITOR_ENTER(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorEnter, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorEnter(x) == 0)
#define MONITOR_EXIT(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorExit, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorExit(x) == 0)
#define TRACE(msg)\
GET_OBJ_FIELD(logger, obj, threadClass, "logger", "Lnsk/share/Log$Logger;");\
- jmsg = NSK_CPP_STUB2(NewStringUTF, env, msg);\
+ jmsg = env->NewStringUTF(msg);\
CALL_VOID2(logger, loggerClass, "trace",\
"(ILjava/lang/String;)V", 50, jmsg)
@@ -497,29 +487,29 @@
jint state;
if(!NSK_VERIFY(
- NSK_CPP_STUB2(GetJavaVM, env, &vm) == 0)) {
+ env->GetJavaVM(&vm) == 0)) {
return NULL;
}
if(!NSK_VERIFY(
- NSK_CPP_STUB3(GetEnv, vm, (void **)&jvmti, JVMTI_VERSION_1)
+ vm->GetEnv((void **)&jvmti, JVMTI_VERSION_1)
== JNI_OK)) {
return NULL;
}
if(!NSK_VERIFY(
- NSK_CPP_STUB3(GetThreadState, jvmti, (jthread)thread, &state)
+ jvmti->GetThreadState((jthread)thread, &state)
== JVMTI_ERROR_NONE)) {
return NULL;
}
stateName = getStateName(env, state);
- if (!NSK_JNI_VERIFY(env, (ThreadState = NSK_CPP_STUB2(FindClass, env, "java/lang/Thread$State")) != NULL))
+ if (!NSK_JNI_VERIFY(env, (ThreadState = env->FindClass("java/lang/Thread$State")) != NULL))
return NULL;
- if (!NSK_JNI_VERIFY(env, (method = NSK_CPP_STUB4(GetStaticMethodID, env, ThreadState, "valueOf", "(Ljava/lang/String;)Ljava/lang/Thread$State;")) != NULL))
+ if (!NSK_JNI_VERIFY(env, (method = env->GetStaticMethodID(ThreadState, "valueOf", "(Ljava/lang/String;)Ljava/lang/Thread$State;")) != NULL))
return NULL;
- threadState = NSK_CPP_STUB4(CallStaticObjectMethod, env, ThreadState, method, stateName);
+ threadState = env->CallStaticObjectMethod(ThreadState, method, stateName);
return threadState;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -27,34 +27,31 @@
#define FIND_CLASS(_class, _className)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(FindClass, env, _className)) != NULL))\
+ env->FindClass(_className)) != NULL))\
return
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
return
#define GET_OBJ_FIELD(_value, _obj, _class, _fieldName, _fieldSig)\
GET_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetObjectField, env, _obj, field)
+ _value = env->GetObjectField(_obj, field)
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL)) \
+ env->GetMethodID(_class, _methodName, _sig)) != NULL)) \
return
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method))) \
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method))) \
return
/*
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -27,34 +27,31 @@
#define FIND_CLASS(_class, _className)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(FindClass, env, _className)) != NULL))\
+ env->FindClass(_className)) != NULL))\
return
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
return
#define GET_OBJ_FIELD(_value, _obj, _class, _fieldName, _fieldSig)\
GET_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetObjectField, env, _obj, field)
+ _value = env->GetObjectField(_obj, field)
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetMethodID(_class, _methodName, _sig)) != NULL))\
return
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method)))\
return
/*
* Class: nsk_monitoring_share_thread_LockingThreads_Thread1
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -29,123 +29,113 @@
#define FIND_CLASS(_class, _className)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(FindClass, env, _className)) != NULL))\
+ env->FindClass(_className)) != NULL))\
return
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
return
#define GET_STATIC_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetStaticFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetStaticFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_STATIC_OBJ_FIELD(_value, _class, _fieldName, _fieldSig)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetStaticObjectField, env, _class, \
- field)
+ _value = env->GetStaticObjectField(_class, field)
#define GET_STATIC_BOOL_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "Z");\
- _value = NSK_CPP_STUB3(GetStaticBooleanField, env, _class, field)
+ _value = env->GetStaticBooleanField(_class, field)
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
return
#define GET_INT_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetIntField, env, _obj, field)
+ _value = env->GetIntField(_obj, field)
#define GET_LONG_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "J");\
- _value = NSK_CPP_STUB3(GetLongField, env, _obj, field)
+ _value = env->GetLongField(_obj, field)
#define GET_STATIC_INT_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetStaticIntField, env, _class, field)
+ _value = env->GetStaticIntField(_class, field)
#define SET_INT_FIELD(_obj, _class, _fieldName, _newValue)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- NSK_CPP_STUB4(SetIntField, env, _obj, field, _newValue)
+ env->SetIntField(_obj, field, _newValue)
#define GET_OBJ_FIELD(_value, _obj, _class, _fieldName, _fieldSig)\
GET_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetObjectField, env, _obj, field)
+ _value = env->GetObjectField(_obj, field)
#define GET_ARR_ELEMENT(_arr, _index)\
- NSK_CPP_STUB3(GetObjectArrayElement, env, _arr, _index)
+ env->GetObjectArrayElement(_arr, _index)
#define SET_ARR_ELEMENT(_arr, _index, _newValue)\
- NSK_CPP_STUB4(SetObjectArrayElement, env, _arr, _index, _newValue)
+ env->SetObjectArrayElement(_arr, _index, _newValue)
#define GET_STATIC_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetStaticMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetStaticMethodID(_class, _methodName, _sig)) != NULL))\
return
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetMethodID(_class, _methodName, _sig)) != NULL))\
return
#define CALL_STATIC_VOID_NOPARAM(_class, _methodName)\
GET_STATIC_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallStaticVoidMethod, env,\
- _class, method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method)))\
return
#define CALL_STATIC_VOID(_class, _methodName, _sig, _param)\
GET_STATIC_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallStaticVoidMethod, env,\
- _class, method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method, _param)))\
return
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method)))\
return
#define CALL_VOID(_obj, _class, _methodName, _sig, _param)\
GET_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallVoidMethod, env, _obj,\
- method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method, _param)))\
return
#define CALL_VOID2(_obj, _class, _methodName, _sig, _param1, _param2)\
GET_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB5(CallVoidMethod, env, _obj, \
- method, _param1, _param2)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method, _param1, _param2)))\
return
#define CALL_INT_NOPARAM(_value, _obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()I");\
- _value = NSK_CPP_STUB3(CallIntMethod, env, _obj, method)
+ _value = env->CallIntMethod(_obj, method)
#define NEW_OBJ(_obj, _class, _constructorName, _sig, _params)\
GET_METHOD_ID(method, _class, _constructorName, _sig);\
if (!NSK_JNI_VERIFY(env, (_obj = \
- NSK_CPP_STUB4(NewObject, env, _class, method, _params)) != NULL))\
+ env->NewObject(_class, method, _params)) != NULL))\
return
#define MONITOR_ENTER(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorEnter, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorEnter(x) == 0)
#define MONITOR_EXIT(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorExit, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorExit(x) == 0)
#define TRACE(msg)\
GET_OBJ_FIELD(logger, obj, threadClass, "logger", "Lnsk/share/Log$Logger;");\
- jmsg = NSK_CPP_STUB2(NewStringUTF, env, msg);\
+ jmsg = env->NewStringUTF(msg);\
CALL_VOID2(logger, loggerClass, "trace",\
"(ILjava/lang/String;)V", 50, jmsg)
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -160,10 +160,8 @@
lock(jni_env);
display(0, "#### JVMTIagent: ClassLoad: >>>>>>>> entered the raw monitor \"eventLock\" ####\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature,
- jvmti_env, klass, &cls_sig, /*&generic*/NULL)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get class signature\n");
+ if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &cls_sig, /*&generic*/NULL)))
+ jni_env->FatalError("JVMTIagent: failed to get class signature\n");
else {
if (shortTestName != NULL) {
if (strstr((const char*) cls_sig, shortTestName) != NULL) {
@@ -245,14 +243,11 @@
if (hotswap == HOTSWAP_EVERY_EXCEPTION ||
hotswap == HOTSWAP_EVERY_EXCEPTION_FOR_EVERY_CLASS) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass,
- jvmti_env, method, &decl_clazz)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get method declaring class\n");
+ if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &decl_clazz)))
+ jni_env->FatalError("JVMTIagent: failed to get method declaring class\n");
if (findAndHotSwap(jni_env, decl_clazz) != 0)
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to hotswap class\n");
+ jni_env->FatalError("JVMTIagent: failed to hotswap class\n");
}
}
@@ -419,14 +414,11 @@
getVerdict(jni_env, "SingleStep");
if (hotswap == HOTSWAP_EVERY_SINGLE_STEP) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass,
- jvmti_env, method, &decl_clazz)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get method declaring class\n");
+ if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &decl_clazz)))
+ jni_env->FatalError("JVMTIagent: failed to get method declaring class\n");
if (findAndHotSwap(jni_env, decl_clazz) != 0)
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to hotswap class\n");
+ jni_env->FatalError("JVMTIagent: failed to hotswap class\n");
}
}
@@ -443,14 +435,11 @@
if (hotswap == HOTSWAP_EVERY_METHOD_ENTRY ||
hotswap == HOTSWAP_EVERY_METHOD_ENTRY_FOR_EVERY_CLASS) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass,
- jvmti_env, method, &decl_clazz)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get method declaring class\n");
+ if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &decl_clazz)))
+ jni_env->FatalError("JVMTIagent: failed to get method declaring class\n");
if (findAndHotSwap(jni_env, decl_clazz) != 0)
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to hotswap class\n");
+ jni_env->FatalError("JVMTIagent: failed to hotswap class\n");
}
}
@@ -477,30 +466,23 @@
if (hotswap == HOTSWAP_EVERY_EXCEPTION ||
hotswap == HOTSWAP_EVERY_EXCEPTION_FOR_EVERY_CLASS) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass,
- jvmti_env, method, &decl_clazz)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get method declaring class\n");
+ if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &decl_clazz)))
+ jni_env->FatalError("JVMTIagent: failed to get method declaring class\n");
if (findAndHotSwap(jni_env, decl_clazz) != 0)
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to hotswap class\n");
+ jni_env->FatalError("JVMTIagent: failed to hotswap class\n");
}
}
/************************/
static void lock(JNIEnv *jni_env) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter,
- jvmti, eventLock)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to enter a raw monitor\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventLock)))
+ jni_env->FatalError("JVMTIagent: failed to enter a raw monitor\n");
}
static void unlock(JNIEnv *jni_env) {
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit,
- jvmti, eventLock)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to exit a raw monitor\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventLock)))
+ jni_env->FatalError("JVMTIagent: failed to exit a raw monitor\n");
}
JNIEXPORT jint JNICALL
@@ -516,10 +498,8 @@
}
/* get supported JVMTI capabilities */
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
- jvmti, &capabil)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to get capabilities\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&capabil)))
+ jni_env->FatalError("JVMTIagent: failed to get capabilities\n");
if (capabil.can_redefine_classes != 1) { /* ???????????? */
printf("ERROR: JVMTIagent: Class File Redefinition (HotSwap) is not implemented in this VM\n");
return 1;
@@ -574,16 +554,14 @@
return 1;
}
- if (!NSK_JNI_VERIFY(jni_env, (shortTestName = NSK_CPP_STUB3(GetStringUTFChars,
- jni_env, shortName, NULL)) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni_env, (shortTestName = jni_env->GetStringUTFChars(shortName, NULL)) != NULL)) {
printf("ERROR: JVMTIagent: unable to get UTF-8 characters of the string\n");
return 1;
}
display(0, "#### JVMTIagent: short name of current test is \"%s\"\n",
shortTestName);
- if (!NSK_JNI_VERIFY(jni_env, (rasCls = NSK_CPP_STUB2(NewGlobalRef,
- jni_env, cls)) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni_env, (rasCls = jni_env->NewGlobalRef(cls)) != NULL)) {
printf("ERROR JVMTIagent: unable to create a new global reference of the class \"RASagent\"\n");
return 1;
}
@@ -605,37 +583,31 @@
if ((_clsInfo = (class_info*)
malloc(sizeof(class_info))) == NULL)
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: cannot allocate memory for class_info\n");
+ jni_env->FatalError("JVMTIagent: cannot allocate memory for class_info\n");
/* fill the structure class_info */
_clsInfo->clazzsig = cls_sig;
- if (!NSK_JNI_VERIFY(jni_env, ((*_clsInfo).cls = NSK_CPP_STUB2(NewGlobalRef,
- jni_env, clazz)) != NULL)) {
+ if (!NSK_JNI_VERIFY(jni_env, ((*_clsInfo).cls = jni_env->NewGlobalRef(clazz)) != NULL)) {
printf("ERROR: JVMTIagent: unable to create a new global reference of class \"%s\"\n",
_clsInfo->clazzsig);
free(_clsInfo);
deallocClsInfo(jni_env);
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: unable to create a new global reference of class\n");
+ jni_env->FatalError("JVMTIagent: unable to create a new global reference of class\n");
}
if (!NSK_JNI_VERIFY(jni_env, (mid =
- NSK_CPP_STUB4(GetStaticMethodID, jni_env, rasCls,
- "loadFromClassFile", "(Ljava/lang/String;)[B")) != NULL))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: unable to get ID of the method \"loadFromClassFile\"\n");
+ jni_env->GetStaticMethodID(rasCls, "loadFromClassFile", "(Ljava/lang/String;)[B")) != NULL))
+ jni_env->FatalError("JVMTIagent: unable to get ID of the method \"loadFromClassFile\"\n");
- classBytes = (jbyteArray) NSK_CPP_STUB4(CallStaticObjectMethod,
- jni_env, rasCls, mid, NSK_CPP_STUB2(NewStringUTF, jni_env, cls_sig));
+ classBytes = (jbyteArray) jni_env->CallStaticObjectMethod(rasCls, mid, jni_env->NewStringUTF(cls_sig));
clearJavaException(jni_env);
- (*_clsInfo).bCount = NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes);
+ (*_clsInfo).bCount = jni_env->GetArrayLength(classBytes);
(*_clsInfo).clsBytes =
- NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, &isCopy);
+ jni_env->GetByteArrayElements(classBytes, &isCopy);
_clsInfo->next = NULL;
@@ -653,17 +625,15 @@
static void deallocClsInfo(JNIEnv *jni_env) {
class_info *clsInfoCurr = clsInfoFst;
- NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni_env, rasCls));
+ NSK_TRACE(jni_env->DeleteGlobalRef(rasCls));
while(clsInfoCurr != NULL) {
class_info *_clsInfo = clsInfoCurr;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
- jvmti, (unsigned char*) clsInfoCurr->clazzsig)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: failed to deallocate memory for clazzsig\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) clsInfoCurr->clazzsig)))
+ jni_env->FatalError("JVMTIagent: failed to deallocate memory for clazzsig\n");
- NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni_env, clsInfoCurr->cls));
+ NSK_TRACE(jni_env->DeleteGlobalRef(clsInfoCurr->cls));
clsInfoCurr = (class_info*) clsInfoCurr->next;
@@ -679,10 +649,8 @@
class_info *clsInfoCurr = clsInfoFst;
display(1, "\n#### JVMTIagent: findAndHotSwap: obtaining class signature of class to be hotswap ...\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature,
- jvmti, clazz, &clazzsig, /*&generic*/NULL)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: findAndHotSwap: failed to get class signature\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(clazz, &clazzsig, /*&generic*/NULL)))
+ jni_env->FatalError("JVMTIagent: findAndHotSwap: failed to get class signature\n");
else {
display(1, "#### JVMTIagent: findAndHotSwap: ... class signature obtained: \"%s\"\n",
clazzsig);
@@ -696,10 +664,8 @@
hotswap == HOTSWAP_EVERY_EXCEPTION_FOR_EVERY_CLASS) {
display(1, "\n#### JVMTIagent: findAndHotSwap: going to hotswap tested class \"%s\" during execution of class \"%s\" ...\n",
clsInfoCurr->clazzsig, clazzsig);
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
- jvmti, (unsigned char*) clazzsig)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: findAndHotSwap: failed to deallocate memory for clazzsig\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) clazzsig)))
+ jni_env->FatalError("JVMTIagent: findAndHotSwap: failed to deallocate memory for clazzsig\n");
if (doHotSwap(jni_env, clsInfoCurr->cls,
clsInfoCurr->bCount, clsInfoCurr->clsBytes) != 0) {
@@ -712,10 +678,8 @@
display(0, "\n#### JVMTIagent: findAndHotSwap: tested class found \"%s\" ...\n",
clazzsig);
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
- jvmti, (unsigned char*) clazzsig)))
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: findAndHotSwap: failed to deallocate memory for clazzsig\n");
+ if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) clazzsig)))
+ jni_env->FatalError("JVMTIagent: findAndHotSwap: failed to deallocate memory for clazzsig\n");
display(0, "\n#### JVMTIagent: findAndHotSwap: going to hotswap tested class \"%s\" ...\n",
clsInfoCurr->clazzsig);
@@ -751,8 +715,7 @@
"#### JVMTIagent: >>>>>>>> Invoke RedefineClasses():\n"
"<JVMTIagent>\tnew class byte count=%d\n",
classDef.class_byte_count);
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses,
- jvmti, 1, &classDef)))
+ if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(jvmti->RedefineClasses(1, &classDef)))
return 1;
display(0, "#### JVMTIagent: <<<<<<<< RedefineClasses() is successfully done ####\n");
@@ -772,8 +735,7 @@
callbacks.SingleStep = &SingleStep;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)))
return JNI_ERR;
stepEventSet = JNI_TRUE;
@@ -789,8 +751,7 @@
callbacks.MethodEntry = &MethodEntry;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MethodEntry events done\n");
@@ -800,8 +761,7 @@
callbacks.MethodExit = &MethodExit;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MethodExit events done\n");
@@ -817,8 +777,7 @@
callbacks.ExceptionCatch = &ExceptionCatch;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
return JNI_ERR;
excCatchEventSet = JNI_TRUE;
@@ -827,8 +786,7 @@
}
}
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
- jvmti, &callbacks, sizeof(callbacks))))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
return JNI_ERR;
else
return 0;
@@ -856,8 +814,7 @@
caps.can_generate_native_method_bind_events = 1;
caps.can_generate_object_free_events = 1;
caps.can_generate_vm_object_alloc_events = 1;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
- jvmti, &caps)))
+ if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
return JNI_ERR;
/* Breakpoint events */
@@ -865,8 +822,7 @@
callbacks.Breakpoint = &Breakpoint;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting Breakpoint events done\n");
@@ -875,8 +831,7 @@
callbacks.ClassFileLoadHook = &ClassFileLoadHook;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ClassFileLoadHook events done\n");
@@ -885,8 +840,7 @@
callbacks.ClassLoad = &ClassLoad;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ClassLoad events done\n");
@@ -895,8 +849,7 @@
callbacks.ClassPrepare = &ClassPrepare;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ClassPrepare events done\n");
@@ -905,8 +858,7 @@
callbacks.CompiledMethodLoad = &CompiledMethodLoad;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting CompiledMethodLoad events done\n");
@@ -915,8 +867,7 @@
callbacks.CompiledMethodUnload = &CompiledMethodUnload;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting CompiledMethodUnload events done\n");
@@ -925,8 +876,7 @@
callbacks.DataDumpRequest = &DataDumpRequest;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_DATA_DUMP_REQUEST, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_DATA_DUMP_REQUEST, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting DataDumpRequest events done\n");
@@ -935,8 +885,7 @@
callbacks.DynamicCodeGenerated = &DynamicCodeGenerated;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting DynamicCodeGenerated events done\n");
@@ -945,8 +894,7 @@
callbacks.Exception = &Exception;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting Exception events done\n");
@@ -955,8 +903,7 @@
callbacks.FieldAccess = &FieldAccess;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_FIELD_ACCESS, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FIELD_ACCESS, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting FieldAccess events done\n");
@@ -965,8 +912,7 @@
callbacks.FieldModification = &FieldModification;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_FIELD_MODIFICATION, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FIELD_MODIFICATION, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting FieldModification events done\n");
@@ -975,8 +921,7 @@
callbacks.FramePop = &FramePop;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_FRAME_POP, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FRAME_POP, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting FramePop events done\n");
@@ -985,8 +930,7 @@
callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting GarbageCollectionFinish events done\n");
@@ -995,8 +939,7 @@
callbacks.GarbageCollectionStart = &GarbageCollectionStart;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting GarbageCollectionStart events done\n");
@@ -1005,8 +948,7 @@
callbacks.MonitorContendedEnter = &MonitorContendedEnter;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MonitorContendedEnter events done\n");
@@ -1015,8 +957,7 @@
callbacks.MonitorContendedEntered = &MonitorContendedEntered;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MonitorContendedEntered events done\n");
@@ -1025,8 +966,7 @@
callbacks.MonitorWait = &MonitorWait;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MonitorWait events done\n");
@@ -1035,8 +975,7 @@
callbacks.MonitorWaited = &MonitorWaited;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting MonitorWaited events done\n");
@@ -1045,8 +984,7 @@
callbacks.NativeMethodBind = &NativeMethodBind;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting NativeMethodBind events done\n");
@@ -1055,8 +993,7 @@
callbacks.ObjectFree = &ObjectFree;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ObjectFree events done\n");
@@ -1065,8 +1002,7 @@
callbacks.ThreadEnd = &ThreadEnd;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_THREAD_END, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_THREAD_END, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ThreadEnd events done\n");
@@ -1075,8 +1011,7 @@
callbacks.ThreadStart = &ThreadStart;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_THREAD_START, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_THREAD_START, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting ThreadStart events done\n");
@@ -1085,8 +1020,7 @@
callbacks.VMDeath = &VMDeath;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting VMDeath events done\n");
@@ -1095,8 +1029,7 @@
callbacks.VMInit = &VMInit;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting VMInit events done\n");
@@ -1105,8 +1038,7 @@
callbacks.VMStart = &VMStart;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting VMStart events done\n");
@@ -1115,26 +1047,23 @@
callbacks.VMObjectAlloc = &VMObjectAlloc;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
- jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
return JNI_ERR;
display(0, "#### JVMTIagent: ... setting VMObjectAlloc events done\n");
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
- jvmti, &callbacks, sizeof(callbacks))))
+ if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
return JNI_ERR;
return 0;
}
static void clearJavaException(JNIEnv* jni_env) {
- if (NSK_CPP_STUB1(ExceptionOccurred, jni_env)) {
+ if (jni_env->ExceptionOccurred()) {
- NSK_CPP_STUB1(ExceptionDescribe, jni_env);
- NSK_CPP_STUB1(ExceptionClear, jni_env);
+ jni_env->ExceptionDescribe();
+ jni_env->ExceptionClear();
- NSK_CPP_STUB2(FatalError, jni_env,
- "JVMTIagent: exception occurred in java code, aborting\n");
+ jni_env->FatalError("JVMTIagent: exception occurred in java code, aborting\n");
}
}
@@ -1229,7 +1158,7 @@
exit(97);
}
else
- NSK_CPP_STUB2(FatalError, jni_env, error_msg);
+ jni_env->FatalError(error_msg);
}
}
@@ -1257,8 +1186,7 @@
doSetup(options);
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor,
- jvmti, "_event_lock", &eventLock)))
+ if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_event_lock", &eventLock)))
return JNI_ERR;
if (enableEventsCaps() == 0 && addStressEvents() == 0) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -205,28 +205,27 @@
*/
jclass localTargetAppClass;
if (!NSK_JNI_VERIFY(jni, (localTargetAppClass =
- NSK_CPP_STUB2(FindClass, jni, TARGET_APP_CLASS_NAME)) != NULL)) {
+ jni->FindClass(TARGET_APP_CLASS_NAME)) != NULL)) {
return NSK_FALSE;
}
if (!NSK_JNI_VERIFY(jni, (targetAppClass = (jclass)
- NSK_CPP_STUB2(NewGlobalRef, jni, localTargetAppClass)) != NULL)) {
+ jni->NewGlobalRef(localTargetAppClass)) != NULL)) {
return NSK_FALSE;
}
}
if (agentLoadedMethod == NULL) {
if (!NSK_JNI_VERIFY(jni, (agentLoadedMethod =
- NSK_CPP_STUB4(GetStaticMethodID, jni, targetAppClass,
- AGENT_LOADED_METHOD_NAME, AGENT_LOADED_METHOD_SIGNATURE)) != NULL))
+ jni->GetStaticMethodID(targetAppClass, AGENT_LOADED_METHOD_NAME, AGENT_LOADED_METHOD_SIGNATURE)) != NULL))
return NSK_FALSE;
}
if (!NSK_JNI_VERIFY(jni, (agentNameString =
- NSK_CPP_STUB2(NewStringUTF, jni, agentName)) != NULL))
+ jni->NewStringUTF(agentName)) != NULL))
return NSK_FALSE;
- NSK_CPP_STUB4(CallStaticVoidMethod, jni, targetAppClass, agentLoadedMethod, agentNameString);
+ jni->CallStaticVoidMethod(targetAppClass, agentLoadedMethod, agentNameString);
return NSK_TRUE;
}
@@ -255,16 +254,14 @@
if (agentFinishedMethod == NULL) {
if (!NSK_JNI_VERIFY(jni, (agentFinishedMethod =
- NSK_CPP_STUB4(GetStaticMethodID, jni, targetAppClass,
- AGENT_FINISHED_METHOD_NAME, AGENT_FINISHED_METHOD_SIGNATURE)) != NULL))
+ jni->GetStaticMethodID(targetAppClass, AGENT_FINISHED_METHOD_NAME, AGENT_FINISHED_METHOD_SIGNATURE)) != NULL))
return NSK_FALSE;
}
- if (!NSK_JNI_VERIFY(jni, (agentNameString = NSK_CPP_STUB2(NewStringUTF, jni, agentName)) != NULL))
+ if (!NSK_JNI_VERIFY(jni, (agentNameString = jni->NewStringUTF(agentName)) != NULL))
return NSK_FALSE;
- NSK_CPP_STUB5(CallStaticVoidMethod, jni, targetAppClass,
- agentFinishedMethod, agentNameString, success ? JNI_TRUE : JNI_FALSE);
+ jni->CallStaticVoidMethod(targetAppClass, agentFinishedMethod, agentNameString, success ? JNI_TRUE : JNI_FALSE);
return NSK_TRUE;
}
@@ -277,7 +274,7 @@
JNIEnv* nsk_aod_createJNIEnv(JavaVM* vm) {
JNIEnv* jni;
- NSK_CPP_STUB3(GetEnv, vm, (void**)&jni, JNI_VERSION_1_2);
+ vm->GetEnv((void**)&jni, JNI_VERSION_1_2);
NSK_VERIFY(jni != NULL);
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README Mon Oct 01 09:56:45 2018 +0100
@@ -46,7 +46,7 @@
// jni->FindClass(jni, class_name)
if (!NSK_JNI_VERIFY(jni,
- NSK_CPP_STUB2(FindClass, jni, class_name) != NULL)) {
+ jni->FindClass(class_name) != NULL)) {
return JNI_ERR;
}
@@ -54,7 +54,7 @@
// cls = jni->FindClass(jni, class_name)
if (!NSK_JNI_VERIFY(jni, (cls =
- NSK_CPP_STUB2(FindClass, jni, class_name)) != NULL)) {
+ jni->FindClass(class_name)) != NULL)) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -53,11 +53,11 @@
{
jthrowable throwable;
- NSK_TRACE(throwable = NSK_CPP_STUB1(ExceptionOccurred, jni));
+ NSK_TRACE(throwable = jni->ExceptionOccurred());
if (throwable != NULL) {
nsk_lcomplain(file, line, "Exception in JNI call (cleared):\n");
- NSK_TRACE(NSK_CPP_STUB1(ExceptionDescribe, jni));
- NSK_TRACE(NSK_CPP_STUB1(ExceptionClear, jni));
+ NSK_TRACE(jni->ExceptionDescribe());
+ NSK_TRACE(jni->ExceptionClear());
return NSK_TRUE;
}
return NSK_FALSE;
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README Mon Oct 01 09:56:45 2018 +0100
@@ -94,7 +94,7 @@
// jvm->GetEnv(jvm, &env, version)
if (!NSK_VERIFY(
- NSK_CPP_STUB3(GetEnv, jvm, &env, JNI_VERSION_1_2) == JNI_OK)) {
+ jvm->GetEnv(&env, JNI_VERSION_1_2) == JNI_OK)) {
return JNI_ERR;
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.h Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.h Mon Oct 01 09:56:45 2018 +0100
@@ -29,16 +29,15 @@
#define JNI_VERSION JNI_VERSION_1_1
-#define EXCEPTION_CLEAR NSK_CPP_STUB1(ExceptionClear, env)
-#define EXCEPTION_OCCURRED NSK_CPP_STUB1(ExceptionOccurred, env)
+#define EXCEPTION_CLEAR env->ExceptionClear()
+#define EXCEPTION_OCCURRED env->ExceptionOccurred()
// Check for pending exception of the specified type
// If it's present, then clear it
#define EXCEPTION_CHECK(exceptionClass, recurDepth) \
if (EXCEPTION_OCCURRED != NULL) { \
jobject exception = EXCEPTION_OCCURRED; \
- if (NSK_CPP_STUB3(IsInstanceOf, env, exception, \
- exceptionClass) == JNI_TRUE) { \
+ if (env->IsInstanceOf(exception, exceptionClass) == JNI_TRUE) { \
EXCEPTION_CLEAR; \
NSK_DISPLAY1("StackOverflowError occurred at depth %d\n", recurDepth); \
} \
@@ -46,95 +45,86 @@
#define FIND_CLASS(_class, _className)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(FindClass, env, _className)) != NULL))\
+ env->FindClass(_className)) != NULL))\
exit(1)
#define GET_OBJECT_CLASS(_class, _obj)\
if (!NSK_JNI_VERIFY(env, (_class = \
- NSK_CPP_STUB2(GetObjectClass, env, _obj)) != NULL))\
+ env->GetObjectClass(_obj)) != NULL))\
exit(1)
#define GET_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetFieldID(_class, _fieldName, _fieldSig)) != NULL))\
exit(1)
#define GET_STATIC_FIELD_ID(_fieldID, _class, _fieldName, _fieldSig)\
if (!NSK_JNI_VERIFY(env, (_fieldID = \
- NSK_CPP_STUB4(GetStaticFieldID, env, _class,\
- _fieldName, _fieldSig)) != NULL))\
+ env->GetStaticFieldID(_class, _fieldName, _fieldSig)) != NULL))\
exit(1)
#define GET_STATIC_BOOL_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "Z");\
- _value = NSK_CPP_STUB3(GetStaticBooleanField, env, _class, field)
+ _value = env->GetStaticBooleanField(_class, field)
#define GET_STATIC_INT_FIELD(_value, _class, _fieldName)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetStaticIntField, env, _class, field)
+ _value = env->GetStaticIntField(_class, field)
#define GET_STATIC_OBJ_FIELD(_value, _class, _fieldName, _fieldSig)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetStaticObjectField, env, _class, \
- field)
+ _value = env->GetStaticObjectField(_class, field)
#define GET_INT_FIELD(_value, _obj, _class, _fieldName)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- _value = NSK_CPP_STUB3(GetIntField, env, _obj, field)
+ _value = env->GetIntField(_obj, field)
#define SET_INT_FIELD(_obj, _class, _fieldName, _newValue)\
GET_FIELD_ID(field, _class, _fieldName, "I");\
- NSK_CPP_STUB4(SetIntField, env, _obj, field, _newValue)
+ env->SetIntField(_obj, field, _newValue)
#define SET_STATIC_INT_FIELD(_class, _fieldName, _newValue)\
GET_STATIC_FIELD_ID(field, _class, _fieldName, "I");\
- NSK_CPP_STUB4(SetStaticIntField, env, _class, field, _newValue)
+ env->SetStaticIntField(_class, field, _newValue)
#define GET_OBJ_FIELD(_value, _obj, _class, _fieldName, _fieldSig)\
GET_FIELD_ID(field, _class, _fieldName, _fieldSig);\
- _value = NSK_CPP_STUB3(GetObjectField, env, _obj, field)
+ _value = env->GetObjectField(_obj, field)
#define GET_STATIC_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetStaticMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetStaticMethodID(_class, _methodName, _sig)) != NULL))\
exit(1)
#define GET_METHOD_ID(_methodID, _class, _methodName, _sig)\
if (!NSK_JNI_VERIFY(env, (_methodID = \
- NSK_CPP_STUB4(GetMethodID, env, _class,\
- _methodName, _sig)) != NULL))\
+ env->GetMethodID(_class, _methodName, _sig)) != NULL))\
exit(1)
#define CALL_STATIC_VOID_NOPARAM(_class, _methodName)\
GET_STATIC_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallStaticVoidMethod, env,\
- _class, method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method)))\
exit(1)
#define CALL_STATIC_VOID(_class, _methodName, _sig, _param)\
GET_STATIC_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallStaticVoidMethod, env,\
- _class, method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallStaticVoidMethod(_class, method, _param)))\
exit(1)
#define CALL_VOID_NOPARAM(_obj, _class, _methodName)\
GET_METHOD_ID(method, _class, _methodName, "()V");\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB3(CallVoidMethod, env, _obj,\
- method)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method)))\
exit(1)
#define CALL_VOID(_obj, _class, _methodName, _sig, _param)\
GET_METHOD_ID(method, _class, _methodName, _sig);\
- if (!NSK_JNI_VERIFY_VOID(env, NSK_CPP_STUB4(CallVoidMethod, env, _obj,\
- method, _param)))\
+ if (!NSK_JNI_VERIFY_VOID(env, env->CallVoidMethod(_obj, method, _param)))\
exit(1)
#define MONITOR_ENTER(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorEnter, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorEnter(x) == 0)
#define MONITOR_EXIT(x) \
- NSK_JNI_VERIFY(env, NSK_CPP_STUB2(MonitorExit, env, x) == 0)
+ NSK_JNI_VERIFY(env, env->MonitorExit(x) == 0)
#endif /* _IS_NSK_STRACE_DEFINED_ */
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -87,11 +87,11 @@
if (maxDepth - currDepth > 0)
{
GET_STATIC_METHOD_ID(method, threadClass, "yield", "()V");
- NSK_CPP_STUB3(CallStaticVoidMethod, env, threadClass, method);
+ env->CallStaticVoidMethod(threadClass, method);
EXCEPTION_CHECK(stackOverflowErrorClass, currDepth);
GET_METHOD_ID(method, threadClass, "recursiveMethod1", "()V");
- NSK_CPP_STUB3(CallVoidMethod, env, obj, method);
+ env->CallVoidMethod(obj, method);
EXCEPTION_CHECK(stackOverflowErrorClass, currDepth);
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace006.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -88,11 +88,11 @@
if (maxDepth - currDepth > 0)
{
GET_STATIC_METHOD_ID(method, threadClass, "yield", "()V");
- NSK_CPP_STUB3(CallStaticVoidMethod, env, threadClass, method);
+ env->CallStaticVoidMethod(threadClass, method);
EXCEPTION_CHECK(stackOverflowErrorClass, currDepth);
GET_METHOD_ID(method, threadClass, "recursiveMethod1", "()V");
- NSK_CPP_STUB3(CallVoidMethod, env, obj, method);
+ env->CallVoidMethod(obj, method);
EXCEPTION_CHECK(stackOverflowErrorClass, currDepth);
}
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -48,27 +48,25 @@
jobjectArray arguments;
jobject result;
- if ( ! NSK_JNI_VERIFY(pEnv, (mhClass = NSK_CPP_STUB2(GetObjectClass, pEnv, mhToCall)) != NULL) )
+ if ( ! NSK_JNI_VERIFY(pEnv, (mhClass = pEnv->GetObjectClass(mhToCall)) != NULL) )
return NULL;
- if ( ! NSK_JNI_VERIFY(pEnv, NULL != (mid = NSK_CPP_STUB4(GetMethodID, pEnv, mhClass,
- "invokeWithArguments",
- "([Ljava/lang/Object;)Ljava/lang/Object;"))) )
+ if ( ! NSK_JNI_VERIFY(pEnv, NULL != (mid = pEnv->GetMethodID(mhClass, "invokeWithArguments", "([Ljava/lang/Object;)Ljava/lang/Object;"))) )
return NULL;
- NSK_JNI_VERIFY(pEnv, NULL != (objectClass = NSK_CPP_STUB2(FindClass, pEnv, "java/lang/Object")));
+ NSK_JNI_VERIFY(pEnv, NULL != (objectClass = pEnv->FindClass("java/lang/Object")));
- NSK_JNI_VERIFY(pEnv, NULL != (arguments = NSK_CPP_STUB4(NewObjectArray, pEnv, ARGS_COUNT, objectClass, NULL)));
+ NSK_JNI_VERIFY(pEnv, NULL != (arguments = pEnv->NewObjectArray(ARGS_COUNT, objectClass, NULL)));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 0, a1));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 1, a2));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 2, a3));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 3, a4));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 4, a5));
- NSK_JNI_VERIFY_VOID(pEnv, NSK_CPP_STUB4(SetObjectArrayElement, pEnv, arguments, 5, a6));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 0, a1));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 1, a2));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 2, a3));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 3, a4));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 4, a5));
+ NSK_JNI_VERIFY_VOID(pEnv, pEnv->SetObjectArrayElement(arguments, 5, a6));
// Swap arguments
- NSK_JNI_VERIFY(pEnv, NULL != (result = NSK_CPP_STUB4(CallObjectMethod, pEnv, mhToCall, mid, arguments)));
+ NSK_JNI_VERIFY(pEnv, NULL != (result = pEnv->CallObjectMethod(mhToCall, mid, arguments)));
return result;
}
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -36,15 +36,15 @@
const char * pStr;
jsize len;
- if ( ! NSK_VERIFY((pStr = NSK_CPP_STUB3(GetStringUTFChars, pEnv, src, NULL)) != NULL) ) {
+ if ( ! NSK_VERIFY((pStr = pEnv->GetStringUTFChars(src, NULL)) != NULL) ) {
return;
}
- len = NSK_CPP_STUB2(GetStringUTFLength, pEnv, src) + 1;
+ len = pEnv->GetStringUTFLength(src) + 1;
*dst = (char*) malloc(len);
strncpy(*dst, pStr, len);
- NSK_CPP_STUB3(ReleaseStringUTFChars, pEnv, src, pStr);
+ pEnv->ReleaseStringUTFChars(src, pStr);
}
struct MethodName * getMethodName(jvmtiEnv * pJvmtiEnv, jmethodID method) {
@@ -53,17 +53,17 @@
jclass clazz;
struct MethodName * mn;
- if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, pJvmtiEnv, method, &szName, NULL, NULL)) ) {
+ if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetMethodName(method, &szName, NULL, NULL)) ) {
return NULL;
}
- if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, pJvmtiEnv, method, &clazz)) ) {
- NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
+ if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetMethodDeclaringClass(method, &clazz)) ) {
+ NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
return NULL;
}
- if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, pJvmtiEnv, clazz, &szSignature, NULL)) ) {
- NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
+ if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetClassSignature(clazz, &szSignature, NULL)) ) {
+ NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
return NULL;
}
@@ -71,8 +71,8 @@
strncpy(mn->methodName, szName, sizeof(mn->methodName));
strncpy(mn->classSig, szSignature, sizeof(mn->classSig));
- NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szName));
- NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, pJvmtiEnv, (unsigned char*) szSignature));
+ NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szName));
+ NSK_JVMTI_VERIFY(pJvmtiEnv->Deallocate((unsigned char*) szSignature));
return mn;
}
@@ -107,7 +107,7 @@
void * getTLS(jvmtiEnv * pJvmtiEnv, jthread thread, jsize sizeToAllocate) {
void * tls;
- if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadLocalStorage, pJvmtiEnv, thread, &tls)) )
+ if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->GetThreadLocalStorage(thread, &tls)) )
return NULL;
if ( ! tls) {
@@ -116,7 +116,7 @@
memset(tls, 0, sizeToAllocate);
- if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetThreadLocalStorage, pJvmtiEnv, thread, tls)) )
+ if ( ! NSK_JVMTI_VERIFY(pJvmtiEnv->SetThreadLocalStorage(thread, tls)) )
return NULL;
}
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp Wed Sep 26 18:11:00 2018 +0100
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp Mon Oct 01 09:56:45 2018 +0100
@@ -56,23 +56,23 @@
classDef.klass = clazzToRedefine;
if (!NSK_JNI_VERIFY(env,
- (classDef.class_byte_count = /* jsize */ NSK_CPP_STUB2(GetArrayLength, env, bytecodeArray)) > 0)) {
+ (classDef.class_byte_count = /* jsize */ env->GetArrayLength(bytecodeArray)) > 0)) {
return JNI_FALSE;
}
if (!NSK_JNI_VERIFY(env,
- (classDef.class_bytes = (const unsigned char *) /* jbyte* */ NSK_CPP_STUB3(GetByteArrayElements, env, bytecodeArray, NULL)) != NULL)) {
+ (classDef.class_bytes = (const unsigned char *) /* jbyte* */ env->GetByteArrayElements(bytecodeArray, NULL)) != NULL)) {
return JNI_FALSE;
}
if (!NSK_JVMTI_VERIFY(
- NSK_CPP_STUB3(RedefineClasses, test_jvmti, 1, &classDef))) {
+ test_jvmti->RedefineClasses(1, &classDef))) {
result = JNI_FALSE;
}
// Need to cleanup reference to byte[] whether RedefineClasses succeeded or not
if (!NSK_JNI_VERIFY_VOID(env,
- NSK_CPP_STUB4(ReleaseByteArrayElements, env, bytecodeArray, (jbyte*)classDef.class_bytes, JNI_ABORT))) {
+ env->ReleaseByteArrayElements(bytecodeArray, (jbyte*)classDef.class_bytes, JNI_ABORT))) {
return JNI_FALSE;
}
@@ -91,12 +91,10 @@
memset(&caps, 0, sizeof(jvmtiCapabilities));
caps.can_redefine_classes = 1;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
- test_jvmti, &caps)))
+ if (!NSK_JVMTI_VERIFY(test_jvmti->AddCapabilities(&caps)))
return JNI_ERR;
- if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
- test_jvmti, &caps)))
+ if (!NSK_JVMTI_VERIFY(test_jvmti->GetCapabilities(&caps)))
return JNI_ERR;
if (!caps.can_redefine_classes)
--- a/test/jdk/ProblemList.txt Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/ProblemList.txt Mon Oct 01 09:56:45 2018 +0100
@@ -128,7 +128,6 @@
java/awt/FileDialog/8003399/bug8003399.java 8198334 windows-all
java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all
-java/awt/dnd/BadSerializaionTest/BadSerializationTest.java 8039082 generic-all
java/awt/dnd/MissingEventsOnModalDialog/MissingEventsOnModalDialogTest.java 8164464 linux-all,macosx-all
java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html 8171510 macosx-all
javax/swing/dnd/7171812/bug7171812.java 8041447 macosx-all
@@ -558,7 +557,6 @@
java/net/DatagramSocket/SendDatagramToBadAddress.java 7143960 macosx-all
java/net/Socket/LingerTest.java 8208690 generic-all
-sun/net/www/http/HttpClient/MultiThreadTest.java 8208690 generic-all
############################################################################
@@ -680,6 +678,7 @@
sun/security/pkcs11/tls/TestMasterSecret.java 8204203 windows-all
sun/security/pkcs11/tls/TestPRF.java 8204203 windows-all
sun/security/pkcs11/tls/TestPremaster.java 8204203 windows-all
+sun/security/tools/keytool/NssTest.java 8204203 windows-all
############################################################################
@@ -687,7 +686,6 @@
javax/sound/sampled/DirectAudio/bug6372428.java 8055097 generic-all
javax/sound/sampled/Clip/bug5070081.java 8055097 generic-all
javax/sound/sampled/DataLine/LongFramePosition.java 8055097 generic-all
-javax/sound/sampled/Clip/AutoCloseTimeCheck.java 8207150 generic-all
javax/sound/sampled/Clip/Drain/ClipDrain.java 7062792 generic-all
--- a/test/jdk/TEST.ROOT Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/TEST.ROOT Mon Oct 01 09:56:45 2018 +0100
@@ -19,7 +19,7 @@
# Tests that must run in othervm mode
othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/swing javax/print \
com/apple/laf com/sun/java/accessibility com/sun/java/swing sanity/client demo/jfc \
-javax/management com/sun/awt sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
+javax/management sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
# Tests that cannot run concurrently
exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi
--- a/test/jdk/TEST.groups Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/TEST.groups Mon Oct 01 09:56:45 2018 +0100
@@ -351,7 +351,6 @@
jdk_awt = \
java/awt \
- com/sun/awt \
com/apple/eawt \
com/apple/laf \
sun/awt
@@ -489,8 +488,7 @@
:jdk_sound \
:jdk_sctp \
javax/accessibility \
- com/sun/java/swing \
- com/sun/awt
+ com/sun/java/swing
needs_g1gc = \
jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java \
--- a/test/jdk/com/sun/awt/SecurityWarning/CustomSecurityManager.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-import sun.awt.AWTPermissions;
-import java.security.Permission;
-
-public class CustomSecurityManager extends SecurityManager {
- @Override
- public void checkPermission(Permission perm) {
- if (perm.implies(AWTPermissions.TOPLEVEL_WINDOW_PERMISSION)) {
- throw new SecurityException();
- }
- }
-}
--- a/test/jdk/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2009, 2018, 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 %W% %E%
- @key headful
- @bug 6818312
- @summary The size returned by SecurityWarning.getSize() should not be zero
- @author anthony.petrov@sun.com: area=awt.toplevel
- @library ../../../../java/awt/regtesthelpers
- @modules java.desktop/com.sun.awt
- java.desktop/sun.awt
- @build Util CustomSecurityManager CopyClassFile
- @run main CopyClassFile CustomSecurityManager bootcp/
- @run main/othervm/secure=CustomSecurityManager -Xbootclasspath/a:bootcp GetSizeShouldNotReturnZero
-*/
-
-/**
- * GetSizeShouldNotReturnZero.java
- *
- * summary: The size returned by SecurityWarning.getSize() should not be zero
- */
-
-import com.sun.awt.SecurityWarning;
-import test.java.awt.regtesthelpers.Util;
-
-import java.awt.*;
-
-public class GetSizeShouldNotReturnZero
-{
- private static void init()
- {
- Frame f = new Frame();
- f.setSize(100, 100);
- f.setVisible(true);
-
- Robot robot = Util.createRobot();
- Util.waitForIdle(robot);
-
- Dimension size = SecurityWarning.getSize(f);
- if (size.width == 0 || size.height == 0) {
- fail("Reported security warning size: " + size);
- return;
- }
- pass();
- }//End init()
-
-
- /*****************************************************
- * Standard Test Machinery Section
- * DO NOT modify anything in this section -- it's a
- * standard chunk of code which has all of the
- * synchronisation necessary for the test harness.
- * By keeping it the same in all tests, it is easier
- * to read and understand someone else's test, as
- * well as insuring that all tests behave correctly
- * with the test harness.
- * There is a section following this for test-
- * classes
- ******************************************************/
- private static boolean theTestPassed = false;
- private static boolean testGeneratedInterrupt = false;
- private static String failureMessage = "";
-
- private static Thread mainThread = null;
-
- private static int sleepTime = 300000;
-
- // Not sure about what happens if multiple of this test are
- // instantiated in the same VM. Being static (and using
- // static vars), it aint gonna work. Not worrying about
- // it for now.
- public static void main( String args[] ) throws InterruptedException
- {
- mainThread = Thread.currentThread();
- try
- {
- init();
- }
- catch( TestPassedException e )
- {
- //The test passed, so just return from main and harness will
- // interepret this return as a pass
- return;
- }
- //At this point, neither test pass nor test fail has been
- // called -- either would have thrown an exception and ended the
- // test, so we know we have multiple threads.
-
- //Test involves other threads, so sleep and wait for them to
- // called pass() or fail()
- try
- {
- Thread.sleep( sleepTime );
- //Timed out, so fail the test
- throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
- }
- catch (InterruptedException e)
- {
- //The test harness may have interrupted the test. If so, rethrow the exception
- // so that the harness gets it and deals with it.
- if( ! testGeneratedInterrupt ) throw e;
-
- //reset flag in case hit this code more than once for some reason (just safety)
- testGeneratedInterrupt = false;
-
- if ( theTestPassed == false )
- {
- throw new RuntimeException( failureMessage );
- }
- }
-
- }//main
-
- public static synchronized void setTimeoutTo( int seconds )
- {
- sleepTime = seconds * 1000;
- }
-
- public static synchronized void pass()
- {
- System.out.println( "The test passed." );
- System.out.println( "The test is over, hit Ctl-C to stop Java VM" );
- //first check if this is executing in main thread
- if ( mainThread == Thread.currentThread() )
- {
- //Still in the main thread, so set the flag just for kicks,
- // and throw a test passed exception which will be caught
- // and end the test.
- theTestPassed = true;
- throw new TestPassedException();
- }
- theTestPassed = true;
- testGeneratedInterrupt = true;
- mainThread.interrupt();
- }//pass()
-
- public static synchronized void fail()
- {
- //test writer didn't specify why test failed, so give generic
- fail( "it just plain failed! :-)" );
- }
-
- public static synchronized void fail( String whyFailed )
- {
- System.out.println( "The test failed: " + whyFailed );
- System.out.println( "The test is over, hit Ctl-C to stop Java VM" );
- //check if this called from main thread
- if ( mainThread == Thread.currentThread() )
- {
- //If main thread, fail now 'cause not sleeping
- throw new RuntimeException( whyFailed );
- }
- theTestPassed = false;
- testGeneratedInterrupt = true;
- failureMessage = whyFailed;
- mainThread.interrupt();
- }//fail()
-
-}// class GetSizeShouldNotReturnZero
-
-//This exception is used to exit from any level of call nesting
-// when it's determined that the test has passed, and immediately
-// end the test.
-class TestPassedException extends RuntimeException
-{
-}
--- a/test/jdk/com/sun/awt/TEST.properties Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-modules=java.desktop
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/jdi/connect/WildcardPortSupport.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2018, 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 8163083
+ * @summary verifies that multiple listeners could be started using wildcard port number
+ */
+
+
+import com.sun.jdi.*;
+import com.sun.jdi.connect.*;
+
+import java.io.IOException;
+import java.io.PrintStream;
+
+import java.util.Map;
+
+public class WildcardPortSupport {
+
+ private static final String PORT_ARG = "port";
+
+ public static void main(String argv[]) throws Exception {
+ WildcardPortSupport test = new WildcardPortSupport();
+ test.runAllTests();
+ }
+
+ public void runAllTests() throws Exception {
+ ListeningConnector connector =
+ Bootstrap.virtualMachineManager().listeningConnectors().stream().
+ filter(c -> c.name().equals("com.sun.jdi.SocketListen")).findFirst().get();
+
+ if (connector == null) {
+ throw new RuntimeException("FAILURE: no com.sun.jdi.SocketListen connectors found!");
+ }
+
+ testWithDefaultArgs1(connector);
+ testWithDefaultArgs2(connector);
+ testWithWildcardPort1(connector);
+ testWithWildcardPort2(connector);
+ testWithDefaultArgsNegative(connector);
+ }
+
+
+ // Start listeners with unspecified port number and use their bound port numbers to stop them
+ private void testWithDefaultArgs1(ListeningConnector connector) throws IOException,
+ IllegalConnectorArgumentsException {
+ int port1 = startListening(connector, connector.defaultArguments());
+ int port2 = startListening(connector, connector.defaultArguments());
+ connector.stopListening(getArgumentsMap(connector, port1));
+ connector.stopListening(getArgumentsMap(connector, port2));
+ }
+
+ // Start listeners with unspecified port number and use the original argument map instances to stop them
+ private void testWithDefaultArgs2(ListeningConnector connector) throws IOException,
+ IllegalConnectorArgumentsException {
+ Map<String, Connector.Argument> args1 = connector.defaultArguments();
+ startListening(connector, args1);
+ Map<String, Connector.Argument> args2 = connector.defaultArguments();
+ startListening(connector, args2);
+ connector.stopListening(args1);
+ connector.stopListening(args2);
+ }
+
+ // Start listeners with wildcard port number ("0") and use their bound port numbers to stop them
+ private void testWithWildcardPort1(ListeningConnector connector) throws IOException,
+ IllegalConnectorArgumentsException {
+ int port1 = startListening(connector, getArgumentsMap(connector, 0));
+ int port2 = startListening(connector, getArgumentsMap(connector, 0));
+ connector.stopListening(getArgumentsMap(connector, port1));
+ connector.stopListening(getArgumentsMap(connector, port2));
+ }
+
+ // Start listeners with wildcard port number ("0") and use the original argument map instances to stop them
+ private void testWithWildcardPort2(ListeningConnector connector) throws IOException,
+ IllegalConnectorArgumentsException {
+ Map<String, Connector.Argument> args1 = getArgumentsMap(connector, 0);
+ startListening(connector, args1);
+ Map<String, Connector.Argument> args2 = getArgumentsMap(connector, 0);
+ startListening(connector, args2);
+ connector.stopListening(args1);
+ connector.stopListening(args2);
+ }
+
+ // Tries to start two listeners using the same instance of default argument map
+ private void testWithDefaultArgsNegative(ListeningConnector connector) throws IOException,
+ IllegalConnectorArgumentsException {
+ Map<String, Connector.Argument> args = connector.defaultArguments();
+ connector.startListening(args);
+ String port = args.get(PORT_ARG).value();
+ if (port.isEmpty() || "0".equals(port)) {
+ throw new RuntimeException("Test testWithDefaultArgsNegative failed." +
+ " The argument map was not updated with the bound port number.");
+ }
+ try {
+ // This call should fail since the previous the argument map is
+ // already updated with the port number of the started listener
+ connector.startListening(args);
+ } catch (IllegalConnectorArgumentsException ex) {
+ System.out.println("Expected exception caught" + ex.getMessage());
+ return;
+ } finally {
+ connector.stopListening(args);
+ }
+ throw new RuntimeException("Test testWithDefaultArgsNegative failed. No expected " +
+ "com.sun.jdi.IllegalConnectorArgumentsException exception was thrown.");
+ }
+
+ private int startListening(ListeningConnector connector, Map<String, Connector.Argument> args)
+ throws IOException, IllegalConnectorArgumentsException {
+ String address = connector.startListening(args);
+ return Integer.valueOf(address.split(":")[1]);
+ }
+
+
+ private Map<String, Connector.Argument> getArgumentsMap(ListeningConnector connector, int port) {
+ Map<String, Connector.Argument> args = connector.defaultArguments();
+ Connector.Argument arg = args.get(PORT_ARG);
+ arg.setValue(String.valueOf(port));
+ return args;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/Frame/CycleThroughFrameTest/CycleThroughFrameTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2018, 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
+ @key headful
+ @bug 8206392
+ @requires (os.family == "mac")
+ @summary Cycle through frames using keyboard shortcut doesn't work on Mac
+ @compile CycleThroughFrameTest.java
+ @run main/manual CycleThroughFrameTest
+*/
+
+import java.awt.Frame;
+import java.awt.Button;
+import java.awt.TextArea;
+import java.awt.FlowLayout;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+public class CycleThroughFrameTest {
+
+ public static final int maxFrames = 5;
+ private static JFrame[] frame;
+ private static Frame instructionFrame;
+ private static volatile boolean testContinueFlag = true;
+
+ private static final String TEST_INSTRUCTIONS =
+ " This is a manual test\n\n" +
+ " 1) Configure Keyboard shortcut if not done in your system:\n" +
+ " 2) Open System Preferences, go to -> Keyboard -> Shortcuts -> Keyboard\n" +
+ " 3) Enable 'Move focus to next window' if disabled\n" +
+ " 4) Enable 'Move focus to next window drawer' if disabled\n" +
+ " 5) Close System Preferences\n" +
+ " 5) Press COMMAND + ` keys to cycle through frames in forward order\n" +
+ " 6) Press FAIL if focus doesn't move to next frame\n" +
+ " 7) Press COMMAND + SHIFT + ` to cycle through frames in reverse order\n" +
+ " 8) Press FAIL if focus doesn't move to next frame in reverse order\n" +
+ " 9) Press PASS otherwise";
+
+ private static final String FAIL_MESSAGE = "Focus doesn't move to next frame";
+
+ public void showJFrame(int frameNumber) {
+
+ String title = "Frame " + frameNumber;
+ frame[frameNumber] = new JFrame(title);
+ frame[frameNumber].setSize(300, 200);
+ frame[frameNumber].setLocation(50+(frameNumber*20), 50+(frameNumber*20));
+ frame[frameNumber].setVisible(true);
+ }
+
+ private void createAndShowFrame() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ frame = new JFrame[maxFrames];
+ for (int i = 0; i < maxFrames; i++) {
+ showJFrame(i);
+ }
+ }
+ });
+ }
+
+ public void createAndShowInstructionFrame() {
+ Button passButton = new Button("Pass");
+ passButton.setEnabled(true);
+
+ Button failButton = new Button("Fail");
+ failButton.setEnabled(true);
+
+ TextArea instructions = new TextArea(12, 70);
+ instructions.setText(TEST_INSTRUCTIONS);
+
+ instructionFrame = new Frame("Test Instructions");
+ instructionFrame.add(passButton);
+ instructionFrame.add(failButton);
+ instructionFrame.add(instructions);
+ instructionFrame.setSize(200,200);
+ instructionFrame.setLayout(new FlowLayout());
+ instructionFrame.pack();
+ instructionFrame.setVisible(true);
+
+ passButton.addActionListener(ae -> {
+ dispose();
+ testContinueFlag = false;
+ });
+
+ failButton.addActionListener(ae -> {
+ dispose();
+ testContinueFlag = false;
+ throw new RuntimeException(FAIL_MESSAGE);
+ });
+ }
+
+ private static void dispose() {
+ for (int i = 0; i < maxFrames; i++) {
+ frame[i].dispose();
+ }
+ instructionFrame.dispose();
+ }
+
+ public static void main(String[] args) throws Exception {
+
+ CycleThroughFrameTest testObj = new CycleThroughFrameTest();
+ testObj.createAndShowFrame();
+ testObj.createAndShowInstructionFrame();
+
+ final int sleepTime = 300000;
+ final int sleepLoopTime = 1000;
+ int remainingSleepTime = sleepTime;
+ while(remainingSleepTime > 0 && testContinueFlag) {
+ Thread.sleep(sleepLoopTime);
+ remainingSleepTime -= sleepLoopTime;
+ }
+
+ if (testContinueFlag) {
+ dispose();
+ throw new RuntimeException("Timed out after " +
+ (sleepTime - remainingSleepTime) / 1000 + " seconds");
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/MenuBar/TestNoScreenMenuBar.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2018, 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.
+ */
+
+/**
+ * @test
+ * @key headful
+ * @bug 8146310
+ * @summary [macosx] setDefaultMenuBar does not initialize screen menu bar
+ * @author Alan Snyder
+ * @run main/othervm TestNoScreenMenuBar
+ * @requires (os.family == "mac")
+ */
+
+import java.awt.AWTException;
+import java.awt.Desktop;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+
+public class TestNoScreenMenuBar
+{
+ static TestNoScreenMenuBar theTest;
+ private Robot robot;
+ private boolean isApplicationOpened;
+ private boolean isActionPerformed;
+
+ public TestNoScreenMenuBar(String[] args)
+ {
+ try {
+ robot = new Robot();
+ robot.setAutoDelay(50);
+ } catch (AWTException ex) {
+ throw new RuntimeException(ex);
+ }
+
+ if (!(args.length > 0 && args[0].equals("baseline"))) {
+ // activate another application
+ openOtherApplication();
+ robot.delay(500);
+ }
+
+ // The failure mode is installing the default menu bar while the application is inactive
+ Desktop desktop = Desktop.getDesktop();
+ desktop.setDefaultMenuBar(createMenuBar());
+
+ robot.delay(500);
+ desktop.requestForeground(true);
+ robot.delay(500);
+ }
+
+ JMenuBar createMenuBar()
+ {
+ JMenuBar mb = new JMenuBar();
+ // A very long name makes it more likely that the robot will hit the menu
+ JMenu menu = new JMenu("TestTestTestTestTestTestTestTestTestTest");
+ mb.add(menu);
+ JMenuItem item = new JMenuItem("TestTestTestTestTestTestTestTestTestTest");
+ item.addActionListener(ev -> {
+ isActionPerformed = true;
+ });
+ menu.add(item);
+ return mb;
+ }
+
+ void dispose()
+ {
+ closeOtherApplication();
+ Desktop.getDesktop().setDefaultMenuBar(null);
+ }
+
+ private void performMenuItemTest()
+ {
+ // Find the menu on the screen menu bar
+ // The location depends upon the application name which is the name of the first menu.
+ // Unfortunately, the application name can vary based on how the application is run.
+ // The work around is to make the menu and the menu item names very long.
+
+ int menuBarX = 250;
+ int menuBarY = 11;
+ int menuItemX = menuBarX;
+ int menuItemY = 34;
+
+ robot.mouseMove(menuBarX, menuBarY);
+ robot.delay(100);
+ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+ robot.delay(100);
+ robot.mouseMove(menuItemX, menuItemY);
+ robot.delay(100);
+ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+ robot.waitForIdle();
+
+ waitForAction();
+ }
+
+ private synchronized void waitForAction()
+ {
+ try {
+ for (int i = 0; i < 10; i++) {
+ if (isActionPerformed) {
+ return;
+ }
+ wait(100);
+ }
+ } catch (InterruptedException ex) {
+ }
+ throw new RuntimeException("Test failed: menu item action was not performed");
+ }
+
+ private void openOtherApplication() {
+ String[] cmd = { "/usr/bin/open", "/Applications/System Preferences.app" };
+ execute(cmd);
+ isApplicationOpened = true;
+ }
+
+ private void closeOtherApplication() {
+ if (isApplicationOpened) {
+ String[] cmd = { "/usr/bin/osascript", "-e", "tell application \"System Preferences\" to close window 1" };
+ execute(cmd);
+ }
+ }
+
+ private void execute(String[] cmd) {
+ try {
+ Process p = Runtime.getRuntime().exec(cmd);
+ p.waitFor();
+ } catch (IOException | InterruptedException ex) {
+ throw new RuntimeException("Unable to execute command");
+ }
+ }
+
+ private static void runSwing(Runnable r)
+ {
+ try {
+ SwingUtilities.invokeAndWait(r);
+ } catch (InterruptedException e) {
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ if (!System.getProperty("os.name").contains("OS X")) {
+ System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
+ return;
+ }
+
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ try {
+ runSwing(() -> theTest = new TestNoScreenMenuBar(args));
+ theTest.performMenuItemTest();
+ } finally {
+ if (theTest != null) {
+ runSwing(() -> theTest.dispose());
+ }
+ }
+ }
+}
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/FrameBorderCounter.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -20,15 +20,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Point;
import java.awt.Robot;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowAdapter;
public class FrameBorderCounter {
@@ -59,6 +58,7 @@
background.setVisible(true);
}
});
+ robot.waitForIdle();
EventQueue.invokeAndWait(new Runnable() {
public void run() {
frame = new Frame("Frame");
--- a/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java Mon Oct 01 09:56:45 2018 +0100
@@ -33,8 +33,7 @@
* @bug 6994264
* @summary Opaque overlapping test for Choice AWT component
* @library /java/awt/patchlib ../../regtesthelpers
- * @modules java.desktop/com.sun.awt
- * java.desktop/java.awt.peer
+ * @modules java.desktop/java.awt.peer
* java.desktop/sun.awt
* @build java.desktop/java.awt.Helper
* @build Util
--- a/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -32,8 +32,13 @@
@run main ScreenInsetsTest
*/
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
import test.java.awt.regtesthelpers.Util;
@@ -41,21 +46,33 @@
{
public static void main(String[] args)
{
- if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH))
- {
- // this state is used in the test - sorry
- return;
- }
-
boolean passed = true;
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice[] gds = ge.getScreenDevices();
- for (GraphicsDevice gd : gds)
- {
+ for (GraphicsDevice gd : gds) {
+
GraphicsConfiguration gc = gd.getDefaultConfiguration();
Rectangle gcBounds = gc.getBounds();
Insets gcInsets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
+ int left = gcInsets.left;
+ int right = gcInsets.right;
+ int bottom = gcInsets.bottom;
+ int top = gcInsets.top;
+ if (left < 0 || right < 0 || bottom < 0 || top < 0) {
+ throw new RuntimeException("Negative value: " + gcInsets);
+ }
+ int maxW = gcBounds.width / 3;
+ int maxH = gcBounds.height / 3;
+ if (left > maxW || right > maxW || bottom > maxH || top > maxH) {
+ throw new RuntimeException("Big value: " + gcInsets);
+ }
+
+ if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH))
+ {
+ // this state is used in the test - sorry
+ continue;
+ }
Frame f = new Frame("Test", gc);
f.setUndecorated(true);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2018, 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
+ * @key headful
+ * @bug 8130655
+ * @summary Tests that window owned by EmbeddedFrame can receive keyboard input
+ * @requires (os.family == "mac")
+ * @modules java.desktop/sun.awt
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main WindowOwnedByEmbeddedFrameTest
+ */
+
+import sun.awt.EmbeddedFrame;
+
+import java.awt.Robot;
+import java.awt.TextField;
+import java.awt.Window;
+import java.awt.event.KeyEvent;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class WindowOwnedByEmbeddedFrameTest {
+ private static TextField textField;
+ private static EmbeddedFrame embeddedFrame;
+ private static Window window;
+
+ public static void main(String[] args) {
+ try {
+ Robot robot = Util.createRobot();
+ robot.setAutoDelay(50);
+
+ embeddedFrame = createEmbeddedFrame();
+
+ textField = new TextField("");
+
+ window = new Window(embeddedFrame);
+ window.setSize(200, 200);
+ window.setLocationRelativeTo(null);
+ window.add(textField);
+ window.setVisible(true);
+
+ Util.waitForIdle(robot);
+
+ Util.clickOnComp(textField, robot);
+ Util.waitForIdle(robot);
+
+ robot.keyPress(KeyEvent.VK_T);
+ robot.keyRelease(KeyEvent.VK_T);
+ Util.waitForIdle(robot);
+
+ robot.keyPress(KeyEvent.VK_E);
+ robot.keyRelease(KeyEvent.VK_E);
+ Util.waitForIdle(robot);
+
+ robot.keyPress(KeyEvent.VK_S);
+ robot.keyRelease(KeyEvent.VK_S);
+ Util.waitForIdle(robot);
+
+ robot.keyPress(KeyEvent.VK_T);
+ robot.keyRelease(KeyEvent.VK_T);
+ Util.waitForIdle(robot);
+
+ if ("".equals(textField.getText())) {
+ throw new RuntimeException("Keyboard input in text field isn't possible");
+ }
+ } finally {
+ if (embeddedFrame != null) {
+ embeddedFrame.dispose();
+ }
+ if (window != null) {
+ window.dispose();
+ }
+ }
+ }
+
+ private static EmbeddedFrame createEmbeddedFrame() {
+ try {
+ return (EmbeddedFrame) Class.forName("sun.lwawt.macosx.CEmbeddedFrame").newInstance();
+ } catch (Exception e) {
+ throw new RuntimeException("Cannot create EmbeddedFrame", e);
+ }
+ }
+}
+
--- a/test/jdk/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2014, 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
- * @key headful
- * @bug 8030050
- * @summary Validate fields on DnD class deserialization
- * @author petr.pchelko@oracle.com
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.util.stream.Stream;
-
-public class BadSerializationTest {
-
- private static final String[] badSerialized = new String[] {
- "badAction",
- "noEvents",
- "nullComponent",
- "nullDragSource",
- "nullOrigin"
- };
-
- private static final String goodSerialized = "good";
-
- public static void main(String[] args) throws Exception {
- String testSrc = System.getProperty("test.src") + File.separator;
- testReadObject(testSrc + goodSerialized, false);
- Stream.of(badSerialized).forEach(file -> testReadObject(testSrc + file, true));
- }
-
- private static void testReadObject(String filename, boolean expectException) {
- Exception exceptionCaught = null;
- try (FileInputStream fileInputStream = new FileInputStream(filename);
- ObjectInputStream ois = new ObjectInputStream(fileInputStream)) {
- ois.readObject();
- } catch (InvalidObjectException e) {
- exceptionCaught = e;
- } catch (IOException e) {
- throw new RuntimeException("FAILED: IOException", e);
- } catch (ClassNotFoundException e) {
- throw new RuntimeException("FAILED: ClassNotFoundException", e);
- }
- if (exceptionCaught != null && !expectException) {
- throw new RuntimeException("FAILED: UnexpectedException", exceptionCaught);
- }
- if (exceptionCaught == null && expectException) {
- throw new RuntimeException("FAILED: Invalid object was created with no exception");
- }
- }
-}
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/badAction has changed
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/good has changed
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/noEvents has changed
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/nullComponent has changed
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/nullDragSource has changed
Binary file test/jdk/java/awt/dnd/BadSerializaionTest/nullOrigin has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/dnd/BadSerializationTest/BadSerializationTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2014, 2018, 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
+ * @key headful
+ * @bug 8030050 8039082
+ * @summary Validate fields on DnD class deserialization
+ */
+
+import java.awt.Point;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureRecognizer;
+import java.awt.dnd.DragSource;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.stream.Stream;
+
+import javax.swing.JPanel;
+
+import static java.awt.dnd.DnDConstants.ACTION_COPY;
+
+public class BadSerializationTest {
+
+ private static final String[] badSerialized = new String[] {
+ "badAction",
+ "noEvents",
+ "nullComponent",
+ "nullDragSource",
+ "nullOrigin"
+ };
+
+ private static final String goodSerialized = "good";
+
+ public static void main(String[] args) throws Exception {
+ if (args.length > 0 && args[0].equals("-write")) {
+ writeObjects(); //Creates the binary files for the test.
+ } else {
+ String testSrc = System.getProperty("test.src") + File.separator;
+ testReadObject(testSrc + goodSerialized, false);
+ Stream.of(badSerialized).forEach(
+ file -> testReadObject(testSrc + file, true));
+ }
+ }
+
+ private static void testReadObject(String filename, boolean expectException) {
+ Exception exceptionCaught = null;
+ try (FileInputStream fileInputStream = new FileInputStream(filename);
+ ObjectInputStream ois = new ObjectInputStream(fileInputStream)) {
+ ois.readObject();
+ } catch (InvalidObjectException e) {
+ exceptionCaught = e;
+ } catch (IOException e) {
+ throw new RuntimeException("FAILED: IOException", e);
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException("FAILED: ClassNotFoundException", e);
+ }
+ if (exceptionCaught != null && !expectException) {
+ throw new RuntimeException("FAILED: UnexpectedException", exceptionCaught);
+ }
+ if (exceptionCaught == null && expectException) {
+ throw new RuntimeException("FAILED: Invalid object was created with no exception");
+ }
+ }
+
+ /**
+ * Creates the stubs for the test. It is necessary to disable all checks in
+ * the constructors of DragGestureEvent/DragGestureRecognizer before run.
+ */
+ private static void writeObjects() throws Exception {
+ ArrayList<InputEvent> evs = new ArrayList<>();
+ Point ori = new Point();
+
+ write(new DragGestureEvent(new NothingNull(), ACTION_COPY, ori, evs),
+ "noEvents");
+
+ evs.add(new KeyEvent(new JPanel(), 0, 0, 0, 0, 'a', 0));
+
+ write(new DragGestureEvent(new NullComponent(), ACTION_COPY, ori, evs),
+ "nullComponent");
+
+ write(new DragGestureEvent(new NothingNull(), 100, ori, evs),
+ "badAction");
+
+ write(new DragGestureEvent(new NullDragSource(), ACTION_COPY, ori, evs),
+ "nullDragSource");
+
+ write(new DragGestureEvent(new NothingNull(), ACTION_COPY, null, evs),
+ "nullOrigin");
+
+ write(new DragGestureEvent(new NothingNull(), ACTION_COPY, ori, evs),
+ "good");
+ }
+
+ private static void write(Object obj, String file) throws Exception {
+ try (FileOutputStream fis = new FileOutputStream(file);
+ ObjectOutputStream ois = new ObjectOutputStream(fis)) {
+ ois.writeObject(obj);
+ }
+ }
+
+ public static final class NullDragSource extends DragGestureRecognizer {
+
+ public NullDragSource() {
+ super(null, new JPanel());
+ }
+
+ protected void registerListeners() {
+ }
+
+ protected void unregisterListeners() {
+ }
+ }
+
+ public static final class NullComponent extends DragGestureRecognizer {
+
+ public NullComponent() {
+ super(new DragSource(), null);
+ }
+
+ protected void registerListeners() {
+ }
+
+ protected void unregisterListeners() {
+ }
+ }
+
+ public static final class NothingNull extends DragGestureRecognizer {
+
+ public NothingNull() {
+ super(new DragSource(), new JPanel());
+ }
+
+ protected void registerListeners() {
+ }
+
+ protected void unregisterListeners() {
+ }
+ }
+}
Binary file test/jdk/java/awt/dnd/BadSerializationTest/badAction has changed
Binary file test/jdk/java/awt/dnd/BadSerializationTest/good has changed
Binary file test/jdk/java/awt/dnd/BadSerializationTest/noEvents has changed
Binary file test/jdk/java/awt/dnd/BadSerializationTest/nullComponent has changed
Binary file test/jdk/java/awt/dnd/BadSerializationTest/nullDragSource has changed
Binary file test/jdk/java/awt/dnd/BadSerializationTest/nullOrigin has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/font/GlyphVector/ZWJLigatureTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2018, 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 7017058 8191130 8195836
+ @summary Test handling of ZWJ by layout.
+ */
+
+/*
+ * A forced mapping of ZWJ (u+200D) to a special invisible glyph ID
+ * was breaking many uses of ZWJ to form ligatures in fonts supporting
+ * Indic scripts (Malayalam, Bengali, Sinhala at least) and also Emoji.
+ * Without knowing the exact properties of a font under test, and also
+ * how a layout engine maps chars to glyphs, it is difficult to write
+ * a complete robust automated test.
+ * So whilst it tries to show rendering for any fonts that claims to
+ * support the target alphabet, it will fail only when specific known
+ * fonts fail.
+ * The test automatically passes or fails only if these fonts do
+ * not ligature away the ZWJ.
+ * Besides this the test renders the specific text from these fonts
+ * and any others that claim to fully support the text, so it can be
+ * manually examined if so desired.
+ */
+
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+import java.util.Locale;
+
+public class ZWJLigatureTest {
+
+ // These are fonts and scripts on Windows that should support
+ // the behaviours enough to make reliable tests";
+
+ static final String malayalamName = "Malayalam";
+ static final String malayalamFont = "Kartika";
+ static final String malayalamText = "\u0D2C\u0D3E\u0D32\u0D28\u0D4D\u200D";
+
+ static final String bengaliName = "Bengali";
+ static final String bengaliFont = "Vrinda";
+ static final String bengaliText =
+ "\u09CE \u09A4\u09CD\u200D " +
+ "\u09A4\u09BE\u09CE \u09A4\u09BE\u09A4\u09CD\u200D";
+
+ static final String sinhalaName = "Sinhala";
+ static final String sinhalaFont = "Iskoola Pota";
+ static final String sinhalaText =
+ "\u0DC1\u0DCA\u200D\u0DBB\u0DD3" +
+ "\u0D9A\u0DCA\u200D\u0DBB\u0DD2" +
+ "\u0D9A\u0DCA\u200D\u0DBB\u0DD3" +
+ "\u0DA7\u0DCA\u200D\u0DBB\u0DDA" +
+ "\u0DB6\u0DCA\u200D\u0DBB\u0DD0" +
+ "\u0D9B\u0DCA\u200D\u0DBA\u0DCF";
+
+
+ static String[] scripts = { malayalamName, bengaliName, sinhalaName };
+ static String[] fontNames = { malayalamFont, bengaliFont, sinhalaFont };
+ static String[] text = { malayalamText, bengaliText, sinhalaText };
+
+
+ static void doTest() {
+ boolean testFailed = false;
+
+ BufferedImage bi = new BufferedImage(50, 50, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g2d = (Graphics2D)bi.getGraphics();
+ FontRenderContext frc = g2d.getFontRenderContext();
+ for (int f=0; f < fontNames.length; f++) {
+ Font font = new Font(fontNames[f], Font.PLAIN, 30);
+ String family = font.getFamily(Locale.ENGLISH).toLowerCase();
+ if (!fontNames[f].toLowerCase().equals(family)) {
+ System.out.println(fontNames[f] + " not found, skipping.");
+ continue;
+ } else {
+ System.out.println("Testing " + fontNames[f] +
+ " for " + scripts[f]);
+ }
+ char[] chs = text[f].toCharArray();
+ GlyphVector gv = font.layoutGlyphVector(frc, chs, 0, chs.length, 0);
+ for (int g=0; g<gv.getNumGlyphs(); g++) {
+ int glyph = gv.getGlyphCode(g);
+ int charIdx = gv.getGlyphCharIndex(g);
+ int codePoint = text[f].codePointAt(charIdx);
+ Point2D pos = gv.getGlyphPosition(g);
+
+ if (codePoint == 0x200D) {
+ testFailed = true;
+ System.out.println("FAIL: GOT ZWJ\n");
+ }
+ System.out.println("["+g+"]: gid="+Integer.toHexString(glyph)
+ +", charIdx="+Integer.toHexString(charIdx)
+ +", codePoint="+Integer.toHexString(codePoint)
+ +", pos=["+pos.getX()+","+pos.getY()+"]");
+ }
+ }
+ if (testFailed) {
+ throw new RuntimeException("TEST FAILED");
+ }
+ }
+
+ public static void main(String[] args) {
+ doTest();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/print/PageFormat/WrongPaperForBookPrintingTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2018, 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
+ @key headful
+ @bug 8201818
+ @summary Printing attributes break page size set via "java.awt.print.Book"
+ object
+ @run main/manual WrongPaperForBookPrintingTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.print.Book;
+import java.awt.print.PageFormat;
+import java.awt.print.Paper;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.Size2DSyntax;
+import javax.print.attribute.standard.Chromaticity;
+import javax.print.attribute.standard.MediaSize;
+import javax.print.attribute.standard.MediaSizeName;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.WindowConstants;
+
+public class WrongPaperForBookPrintingTest implements Printable {
+ private static final CountDownLatch testEndedSignal = new CountDownLatch(1);
+ private static final int testTimeout = 300000;
+ private static volatile String testFailureMsg;
+ private static volatile boolean testPassed;
+ private static volatile boolean testFinished;
+
+ public static void main(String[] args) {
+ SwingUtilities.invokeLater(() -> createAndShowTestDialog());
+
+ try {
+ if (!testEndedSignal.await(testTimeout, TimeUnit.MILLISECONDS)) {
+ throw new RuntimeException(String.format(
+ "Test timeout '%d ms' elapsed.", testTimeout));
+ }
+ if (!testPassed) {
+ String failureMsg = testFailureMsg;
+ if ((failureMsg != null) && (!failureMsg.trim().isEmpty())) {
+ throw new RuntimeException(failureMsg);
+ } else {
+ throw new RuntimeException("Test failed.");
+ }
+ }
+ } catch (InterruptedException ie) {
+ throw new RuntimeException(ie);
+ } finally {
+ testFinished = true;
+ }
+ }
+
+ private static void doTest() {
+ PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
+ aset.add(Chromaticity.MONOCHROME);
+
+ MediaSize isoA5Size = MediaSize.getMediaSizeForName(MediaSizeName.ISO_A5);
+ float[] size = isoA5Size.getSize(Size2DSyntax.INCH);
+ Paper paper = new Paper();
+ paper.setSize(size[0] * 72.0, size[1] * 72.0);
+ paper.setImageableArea(0.0, 0.0, size[0] * 72.0, size[1] * 72.0);
+ PageFormat pf = new PageFormat();
+ pf.setPaper(paper);
+
+ Book pageable = new Book();
+ pageable.append(new WrongPaperForBookPrintingTest(), pf);
+
+ PrinterJob job = PrinterJob.getPrinterJob();
+ job.setPageable(pageable);
+ if (job.printDialog()) {
+ try {
+ job.print(aset);
+ } catch (PrinterException pe) {
+ throw new RuntimeException(pe);
+ }
+ }
+ }
+
+ private static void pass() {
+ testPassed = true;
+ testEndedSignal.countDown();
+ }
+
+ private static void fail(String failureMsg) {
+ testFailureMsg = failureMsg;
+ testPassed = false;
+ testEndedSignal.countDown();
+ }
+
+ private static String convertMillisToTimeStr(int millis) {
+ if (millis < 0) {
+ return "00:00:00";
+ }
+ int hours = millis / 3600000;
+ int minutes = (millis - hours * 3600000) / 60000;
+ int seconds = (millis - hours * 3600000 - minutes * 60000) / 1000;
+ return String.format("%02d:%02d:%02d", hours, minutes, seconds);
+ }
+
+ private static void createAndShowTestDialog() {
+ String description =
+ " To run this test it is required to have a virtual PDF\r\n" +
+ " printer or any other printer supporting A5 paper size.\r\n" +
+ "\r\n" +
+ " 1. Verify that NOT A5 paper size is set as default for the\r\n" +
+ " printer to be used.\r\n" +
+ " 2. Click on \"Start Test\" button.\r\n" +
+ " 3. In the shown print dialog select the printer and click\r\n" +
+ " on \"Print\" button.\r\n" +
+ " 4. Verify that a page with a drawn rectangle is printed on\r\n" +
+ " a paper of A5 size which is (5.8 x 8.3 in) or\r\n" +
+ " (148 x 210 mm).\r\n" +
+ "\r\n" +
+ " If the printed page size is correct, click on \"PASS\"\r\n" +
+ " button, otherwise click on \"FAIL\" button.";
+
+ final JDialog dialog = new JDialog();
+ dialog.setTitle("WrongPaperForBookPrintingTest");
+ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ dialog.dispose();
+ fail("Main dialog was closed.");
+ }
+ });
+
+ final JLabel testTimeoutLabel = new JLabel(String.format(
+ "Test timeout: %s", convertMillisToTimeStr(testTimeout)));
+ final long startTime = System.currentTimeMillis();
+ final Timer timer = new Timer(0, null);
+ timer.setDelay(1000);
+ timer.addActionListener((e) -> {
+ int leftTime = testTimeout - (int) (System.currentTimeMillis() - startTime);
+ if ((leftTime < 0) || testFinished) {
+ timer.stop();
+ dialog.dispose();
+ }
+ testTimeoutLabel.setText(String.format(
+ "Test timeout: %s", convertMillisToTimeStr(leftTime)));
+ });
+ timer.start();
+
+ JTextArea textArea = new JTextArea(description);
+ textArea.setEditable(false);
+
+ final JButton testButton = new JButton("Start Test");
+ final JButton passButton = new JButton("PASS");
+ final JButton failButton = new JButton("FAIL");
+ testButton.addActionListener((e) -> {
+ testButton.setEnabled(false);
+ new Thread(() -> {
+ try {
+ doTest();
+
+ SwingUtilities.invokeLater(() -> {
+ passButton.setEnabled(true);
+ failButton.setEnabled(true);
+ });
+ } catch (Throwable t) {
+ t.printStackTrace();
+ dialog.dispose();
+ fail("Exception occurred in a thread executing the test.");
+ }
+ }).start();
+ });
+ passButton.setEnabled(false);
+ passButton.addActionListener((e) -> {
+ dialog.dispose();
+ pass();
+ });
+ failButton.setEnabled(false);
+ failButton.addActionListener((e) -> {
+ dialog.dispose();
+ fail("Size of a printed page is wrong.");
+ });
+
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ JPanel labelPanel = new JPanel(new FlowLayout());
+ labelPanel.add(testTimeoutLabel);
+ mainPanel.add(labelPanel, BorderLayout.NORTH);
+ mainPanel.add(textArea, BorderLayout.CENTER);
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ buttonPanel.add(testButton);
+ buttonPanel.add(passButton);
+ buttonPanel.add(failButton);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ dialog.add(mainPanel);
+
+ dialog.pack();
+ dialog.setVisible(true);
+ }
+
+ @Override
+ public int print(Graphics g, PageFormat pf, int pageIndex)
+ throws PrinterException {
+ if (pageIndex == 0) {
+ g.setColor(Color.RED);
+ g.drawRect((int) pf.getImageableX(), (int) pf.getImageableY(),
+ (int) pf.getImageableWidth() - 1, (int) pf.getImageableHeight() - 1);
+ return Printable.PAGE_EXISTS;
+ } else {
+ return Printable.NO_SUCH_PAGE;
+ }
+ }
+}
--- a/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/lang/SecurityManager/CheckPackageAccess.java Mon Oct 01 09:56:45 2018 +0100
@@ -143,7 +143,7 @@
"jdk.internal.loader", null, null),
// java.desktop module loaded by boot loader and has an openQual pkg
// that is exported
- new Test("java.desktop", "java.applet", null, "sun.applet",
+ new Test("java.desktop", "java.applet", null, "sun.font",
"sun.awt", null, "javax.swing.plaf.basic"),
// java.security.jgss module loaded by platform loader
new Test("java.security.jgss", "org.ietf.jgss", null,
--- a/test/jdk/java/util/Collections/EmptyNavigableSet.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/Collections/EmptyNavigableSet.java Mon Oct 01 09:56:45 2018 +0100
@@ -45,6 +45,7 @@
import java.util.TreeSet;
import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertSame;
import static org.testng.Assert.assertTrue;
@@ -369,7 +370,7 @@
assertSame(emptyNavigableSetArray, result);
- assertTrue(result[0] == null);
+ assertNull(result[0]);
}
@DataProvider(name = "NavigableSet<?>", parallel = true)
--- a/test/jdk/java/util/PriorityQueue/AddNonComparable.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/PriorityQueue/AddNonComparable.java Mon Oct 01 09:56:45 2018 +0100
@@ -42,6 +42,7 @@
import java.util.function.Supplier;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
public class AddNonComparable {
@@ -64,7 +65,7 @@
test(new PriorityQueue<>(), AComparable::new,
(q, e) -> {
assertEquals(q.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
test(new PriorityBlockingQueue<>(), NonComparable::new,
@@ -75,7 +76,7 @@
test(new PriorityBlockingQueue<>(), AComparable::new,
(q, e) -> {
assertEquals(q.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
}
@@ -98,7 +99,7 @@
test(new TreeSet<>(), AComparable::new,
(s, e) -> {
assertEquals(s.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
test(new ConcurrentSkipListSet<>(), NonComparable::new,
@@ -109,7 +110,7 @@
test(new ConcurrentSkipListSet<>(), AComparable::new,
(s, e) -> {
assertEquals(s.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
}
@@ -131,7 +132,7 @@
test(new TreeMap<>(), AComparable::new,
(m, e) -> {
assertEquals(m.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
test(new ConcurrentSkipListMap<>(), NonComparable::new,
@@ -142,7 +143,7 @@
test(new ConcurrentSkipListMap<>(), AComparable::new,
(s, e) -> {
assertEquals(s.size(), 1);
- assertTrue(e == null);
+ assertNull(e);
});
}
--- a/test/jdk/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/AbstractQueuedSynchronizerTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1310,7 +1310,7 @@
try {
s.acquireInterruptibly(1);
shouldThrow();
- } catch (InterruptedException expected) {}
+ } catch (InterruptedException success) {}
};
for (int i = 0; i < 2; i++) {
Thread thread = new Thread(failedAcquire);
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -86,9 +86,13 @@
assertFalse(f.isDone());
assertFalse(f.isCancelled());
assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
+
+ Object result = null;
try {
- assertNull(f.getNow(null));
+ result = f.getNow(null);
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertNull(result);
+
try {
f.get(randomExpiredTimeout(), randomTimeUnit());
shouldThrow();
@@ -97,14 +101,18 @@
catch (Throwable fail) { threadUnexpectedException(fail); }
}
- <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
- checkTimedGet(f, value);
-
+ <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
+ checkTimedGet(f, expectedValue);
+
+ assertEquals(expectedValue, f.join());
+ assertEquals(expectedValue, f.getNow(null));
+
+ T result = null;
try {
- assertEquals(value, f.join());
- assertEquals(value, f.getNow(null));
- assertEquals(value, f.get());
+ result = f.get();
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertEquals(expectedValue, result);
+
assertTrue(f.isDone());
assertFalse(f.isCancelled());
assertFalse(f.isCompletedExceptionally());
@@ -570,9 +578,28 @@
public CompletableFuture<Integer> apply(Integer x) {
invoked();
value = x;
- CompletableFuture<Integer> f = new CompletableFuture<>();
- assertTrue(f.complete(inc(x)));
- return f;
+ return CompletableFuture.completedFuture(inc(x));
+ }
+ }
+
+ static class FailingExceptionalCompletableFutureFunction extends CheckedAction
+ implements Function<Throwable, CompletableFuture<Integer>>
+ {
+ final CFException ex;
+ FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
+ public CompletableFuture<Integer> apply(Throwable x) {
+ invoked();
+ throw ex;
+ }
+ }
+
+ static class ExceptionalCompletableFutureFunction extends CheckedAction
+ implements Function<Throwable, CompletionStage<Integer>> {
+ final Integer value = 3;
+ ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
+ public CompletionStage<Integer> apply(Throwable x) {
+ invoked();
+ return CompletableFuture.completedFuture(value);
}
}
@@ -691,8 +718,16 @@
Function<? super T,U> a) {
return f.applyToEither(g, a);
}
+ public <T> CompletableFuture<T> exceptionally
+ (CompletableFuture<T> f,
+ Function<Throwable, ? extends T> fn) {
+ return f.exceptionally(fn);
+ }
+ public <T> CompletableFuture<T> exceptionallyCompose
+ (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return f.exceptionallyCompose(fn);
+ }
},
-
ASYNC {
public void checkExecutionMode() {
assertEquals(defaultExecutorIsCommonPool,
@@ -765,6 +800,17 @@
Function<? super T,U> a) {
return f.applyToEitherAsync(g, a);
}
+ public <T> CompletableFuture<T> exceptionally
+ (CompletableFuture<T> f,
+ Function<Throwable, ? extends T> fn) {
+ return f.exceptionallyAsync(fn);
+ }
+
+ public <T> CompletableFuture<T> exceptionallyCompose
+ (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return f.exceptionallyComposeAsync(fn);
+ }
+
},
EXECUTOR {
@@ -838,6 +884,16 @@
Function<? super T,U> a) {
return f.applyToEitherAsync(g, a, new ThreadExecutor());
}
+ public <T> CompletableFuture<T> exceptionally
+ (CompletableFuture<T> f,
+ Function<Throwable, ? extends T> fn) {
+ return f.exceptionallyAsync(fn, new ThreadExecutor());
+ }
+ public <T> CompletableFuture<T> exceptionallyCompose
+ (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
+ return f.exceptionallyComposeAsync(fn, new ThreadExecutor());
+ }
+
};
public abstract void checkExecutionMode();
@@ -880,6 +936,12 @@
(CompletableFuture<T> f,
CompletionStage<? extends T> g,
Function<? super T,U> a);
+ public abstract <T> CompletableFuture<T> exceptionally
+ (CompletableFuture<T> f,
+ Function<Throwable, ? extends T> fn);
+ public abstract <T> CompletableFuture<T> exceptionallyCompose
+ (CompletableFuture<T> f,
+ Function<Throwable, ? extends CompletionStage<T>> fn);
}
/**
@@ -887,15 +949,14 @@
* normally, and source result is propagated
*/
public void testExceptionally_normalCompletion() {
+ for (ExecutionMode m : ExecutionMode.values())
for (boolean createIncomplete : new boolean[] { true, false })
for (Integer v1 : new Integer[] { 1, null })
{
- final AtomicInteger a = new AtomicInteger(0);
final CompletableFuture<Integer> f = new CompletableFuture<>();
if (!createIncomplete) assertTrue(f.complete(v1));
- final CompletableFuture<Integer> g = f.exceptionally
- ((Throwable t) -> {
- a.getAndIncrement();
+ final CompletableFuture<Integer> g = m.exceptionally
+ (f, (Throwable t) -> {
threadFail("should not be called");
return null; // unreached
});
@@ -903,7 +964,6 @@
checkCompletedNormally(g, v1);
checkCompletedNormally(f, v1);
- assertEquals(0, a.get());
}}
/**
@@ -911,6 +971,7 @@
* exception
*/
public void testExceptionally_exceptionalCompletion() {
+ for (ExecutionMode m : ExecutionMode.values())
for (boolean createIncomplete : new boolean[] { true, false })
for (Integer v1 : new Integer[] { 1, null })
{
@@ -918,9 +979,9 @@
final CFException ex = new CFException();
final CompletableFuture<Integer> f = new CompletableFuture<>();
if (!createIncomplete) f.completeExceptionally(ex);
- final CompletableFuture<Integer> g = f.exceptionally
- ((Throwable t) -> {
- ExecutionMode.SYNC.checkExecutionMode();
+ final CompletableFuture<Integer> g = m.exceptionally
+ (f, (Throwable t) -> {
+ m.checkExecutionMode();
threadAssertSame(t, ex);
a.getAndIncrement();
return v1;
@@ -936,6 +997,7 @@
* exceptionally with that exception
*/
public void testExceptionally_exceptionalCompletionActionFailed() {
+ for (ExecutionMode m : ExecutionMode.values())
for (boolean createIncomplete : new boolean[] { true, false })
{
final AtomicInteger a = new AtomicInteger(0);
@@ -943,9 +1005,9 @@
final CFException ex2 = new CFException();
final CompletableFuture<Integer> f = new CompletableFuture<>();
if (!createIncomplete) f.completeExceptionally(ex1);
- final CompletableFuture<Integer> g = f.exceptionally
- ((Throwable t) -> {
- ExecutionMode.SYNC.checkExecutionMode();
+ final CompletableFuture<Integer> g = m.exceptionally
+ (f, (Throwable t) -> {
+ m.checkExecutionMode();
threadAssertSame(t, ex1);
a.getAndIncrement();
throw ex2;
@@ -3116,6 +3178,121 @@
checkCompletedNormally(f, v1);
}}
+ /**
+ * exceptionallyCompose result completes normally after normal
+ * completion of source
+ */
+ public void testExceptionallyCompose_normalCompletion() {
+ for (ExecutionMode m : ExecutionMode.values())
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(m);
+ if (!createIncomplete) assertTrue(f.complete(v1));
+ final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+ if (createIncomplete) assertTrue(f.complete(v1));
+
+ checkCompletedNormally(f, v1);
+ checkCompletedNormally(g, v1);
+ r.assertNotInvoked();
+ }}
+
+ /**
+ * exceptionallyCompose result completes normally after exceptional
+ * completion of source
+ */
+ public void testExceptionallyCompose_exceptionalCompletion() {
+ for (ExecutionMode m : ExecutionMode.values())
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(m);
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedNormally(g, r.value);
+ r.assertInvoked();
+ }}
+
+ /**
+ * exceptionallyCompose completes exceptionally on exception if action does
+ */
+ public void testExceptionallyCompose_actionFailed() {
+ for (ExecutionMode m : ExecutionMode.values())
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final FailingExceptionalCompletableFutureFunction r
+ = new FailingExceptionalCompletableFutureFunction(m);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedWithWrappedException(g, r.ex);
+ r.assertInvoked();
+ }}
+
+ /**
+ * exceptionallyCompose result completes exceptionally if the
+ * result of the action does
+ */
+ public void testExceptionallyCompose_actionReturnsFailingFuture() {
+ for (ExecutionMode m : ExecutionMode.values())
+ for (int order = 0; order < 6; order++)
+ {
+ final CFException ex0 = new CFException();
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final CompletableFuture<Integer> g = new CompletableFuture<>();
+ final CompletableFuture<Integer> h;
+ // Test all permutations of orders
+ switch (order) {
+ case 0:
+ assertTrue(f.completeExceptionally(ex0));
+ assertTrue(g.completeExceptionally(ex));
+ h = m.exceptionallyCompose(f, (x -> g));
+ break;
+ case 1:
+ assertTrue(f.completeExceptionally(ex0));
+ h = m.exceptionallyCompose(f, (x -> g));
+ assertTrue(g.completeExceptionally(ex));
+ break;
+ case 2:
+ assertTrue(g.completeExceptionally(ex));
+ assertTrue(f.completeExceptionally(ex0));
+ h = m.exceptionallyCompose(f, (x -> g));
+ break;
+ case 3:
+ assertTrue(g.completeExceptionally(ex));
+ h = m.exceptionallyCompose(f, (x -> g));
+ assertTrue(f.completeExceptionally(ex0));
+ break;
+ case 4:
+ h = m.exceptionallyCompose(f, (x -> g));
+ assertTrue(f.completeExceptionally(ex0));
+ assertTrue(g.completeExceptionally(ex));
+ break;
+ case 5:
+ h = m.exceptionallyCompose(f, (x -> g));
+ assertTrue(f.completeExceptionally(ex0));
+ assertTrue(g.completeExceptionally(ex));
+ break;
+ default: throw new AssertionError();
+ }
+
+ checkCompletedExceptionally(g, ex);
+ checkCompletedWithWrappedException(h, ex);
+ checkCompletedExceptionally(f, ex0);
+ }}
+
// other static methods
/**
@@ -4527,4 +4704,429 @@
// return stage.toCompletableFuture().copy().isDone();
// }
+ // For testing default implementations
+ // Only non-default interface methods defined.
+ static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
+ final CompletableFuture<T> cf;
+ DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
+ public CompletableFuture<T> toCompletableFuture() {
+ return cf; }
+ public CompletionStage<Void> thenRun
+ (Runnable action) {
+ return cf.thenRun(action); }
+ public CompletionStage<Void> thenRunAsync
+ (Runnable action) {
+ return cf.thenRunAsync(action); }
+ public CompletionStage<Void> thenRunAsync
+ (Runnable action,
+ Executor executor) {
+ return cf.thenRunAsync(action, executor); }
+ public CompletionStage<Void> thenAccept
+ (Consumer<? super T> action) {
+ return cf.thenAccept(action); }
+ public CompletionStage<Void> thenAcceptAsync
+ (Consumer<? super T> action) {
+ return cf.thenAcceptAsync(action); }
+ public CompletionStage<Void> thenAcceptAsync
+ (Consumer<? super T> action,
+ Executor executor) {
+ return cf.thenAcceptAsync(action, executor); }
+ public <U> CompletionStage<U> thenApply
+ (Function<? super T,? extends U> a) {
+ return cf.thenApply(a); }
+ public <U> CompletionStage<U> thenApplyAsync
+ (Function<? super T,? extends U> fn) {
+ return cf.thenApplyAsync(fn); }
+ public <U> CompletionStage<U> thenApplyAsync
+ (Function<? super T,? extends U> fn,
+ Executor executor) {
+ return cf.thenApplyAsync(fn, executor); }
+ public <U,V> CompletionStage<V> thenCombine
+ (CompletionStage<? extends U> other,
+ BiFunction<? super T,? super U,? extends V> fn) {
+ return cf.thenCombine(other, fn); }
+ public <U,V> CompletionStage<V> thenCombineAsync
+ (CompletionStage<? extends U> other,
+ BiFunction<? super T,? super U,? extends V> fn) {
+ return cf.thenCombineAsync(other, fn); }
+ public <U,V> CompletionStage<V> thenCombineAsync
+ (CompletionStage<? extends U> other,
+ BiFunction<? super T,? super U,? extends V> fn,
+ Executor executor) {
+ return cf.thenCombineAsync(other, fn, executor); }
+ public <U> CompletionStage<Void> thenAcceptBoth
+ (CompletionStage<? extends U> other,
+ BiConsumer<? super T, ? super U> action) {
+ return cf.thenAcceptBoth(other, action); }
+ public <U> CompletionStage<Void> thenAcceptBothAsync
+ (CompletionStage<? extends U> other,
+ BiConsumer<? super T, ? super U> action) {
+ return cf.thenAcceptBothAsync(other, action); }
+ public <U> CompletionStage<Void> thenAcceptBothAsync
+ (CompletionStage<? extends U> other,
+ BiConsumer<? super T, ? super U> action,
+ Executor executor) {
+ return cf.thenAcceptBothAsync(other, action, executor); }
+ public CompletionStage<Void> runAfterBoth
+ (CompletionStage<?> other,
+ Runnable action) {
+ return cf.runAfterBoth(other, action); }
+ public CompletionStage<Void> runAfterBothAsync
+ (CompletionStage<?> other,
+ Runnable action) {
+ return cf.runAfterBothAsync(other, action); }
+ public CompletionStage<Void> runAfterBothAsync
+ (CompletionStage<?> other,
+ Runnable action,
+ Executor executor) {
+ return cf.runAfterBothAsync(other, action, executor); }
+ public <U> CompletionStage<U> applyToEither
+ (CompletionStage<? extends T> other,
+ Function<? super T, U> fn) {
+ return cf.applyToEither(other, fn); }
+ public <U> CompletionStage<U> applyToEitherAsync
+ (CompletionStage<? extends T> other,
+ Function<? super T, U> fn) {
+ return cf.applyToEitherAsync(other, fn); }
+ public <U> CompletionStage<U> applyToEitherAsync
+ (CompletionStage<? extends T> other,
+ Function<? super T, U> fn,
+ Executor executor) {
+ return cf.applyToEitherAsync(other, fn, executor); }
+ public CompletionStage<Void> acceptEither
+ (CompletionStage<? extends T> other,
+ Consumer<? super T> action) {
+ return cf.acceptEither(other, action); }
+ public CompletionStage<Void> acceptEitherAsync
+ (CompletionStage<? extends T> other,
+ Consumer<? super T> action) {
+ return cf.acceptEitherAsync(other, action); }
+ public CompletionStage<Void> acceptEitherAsync
+ (CompletionStage<? extends T> other,
+ Consumer<? super T> action,
+ Executor executor) {
+ return cf.acceptEitherAsync(other, action, executor); }
+ public CompletionStage<Void> runAfterEither
+ (CompletionStage<?> other,
+ Runnable action) {
+ return cf.runAfterEither(other, action); }
+ public CompletionStage<Void> runAfterEitherAsync
+ (CompletionStage<?> other,
+ Runnable action) {
+ return cf.runAfterEitherAsync(other, action); }
+ public CompletionStage<Void> runAfterEitherAsync
+ (CompletionStage<?> other,
+ Runnable action,
+ Executor executor) {
+ return cf.runAfterEitherAsync(other, action, executor); }
+ public <U> CompletionStage<U> thenCompose
+ (Function<? super T, ? extends CompletionStage<U>> fn) {
+ return cf.thenCompose(fn); }
+ public <U> CompletionStage<U> thenComposeAsync
+ (Function<? super T, ? extends CompletionStage<U>> fn) {
+ return cf.thenComposeAsync(fn); }
+ public <U> CompletionStage<U> thenComposeAsync
+ (Function<? super T, ? extends CompletionStage<U>> fn,
+ Executor executor) {
+ return cf.thenComposeAsync(fn, executor); }
+ public <U> CompletionStage<U> handle
+ (BiFunction<? super T, Throwable, ? extends U> fn) {
+ return cf.handle(fn); }
+ public <U> CompletionStage<U> handleAsync
+ (BiFunction<? super T, Throwable, ? extends U> fn) {
+ return cf.handleAsync(fn); }
+ public <U> CompletionStage<U> handleAsync
+ (BiFunction<? super T, Throwable, ? extends U> fn,
+ Executor executor) {
+ return cf.handleAsync(fn, executor); }
+ public CompletionStage<T> whenComplete
+ (BiConsumer<? super T, ? super Throwable> action) {
+ return cf.whenComplete(action); }
+ public CompletionStage<T> whenCompleteAsync
+ (BiConsumer<? super T, ? super Throwable> action) {
+ return cf.whenCompleteAsync(action); }
+ public CompletionStage<T> whenCompleteAsync
+ (BiConsumer<? super T, ? super Throwable> action,
+ Executor executor) {
+ return cf.whenCompleteAsync(action, executor); }
+ public CompletionStage<T> exceptionally
+ (Function<Throwable, ? extends T> fn) {
+ return cf.exceptionally(fn); }
+ }
+
+ /**
+ * default-implemented exceptionallyAsync action is not invoked when
+ * source completes normally, and source result is propagated
+ */
+ public void testDefaultExceptionallyAsync_normalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) assertTrue(f.complete(v1));
+ final CompletionStage<Integer> g = d.exceptionallyAsync
+ ((Throwable t) -> {
+ threadFail("should not be called");
+ return null; // unreached
+ });
+ if (createIncomplete) assertTrue(f.complete(v1));
+
+ checkCompletedNormally(g.toCompletableFuture(), v1);
+ }}
+
+ /**
+ * default-implemented exceptionallyAsync action completes with
+ * function value on source exception
+ */
+ public void testDefaultExceptionallyAsync_exceptionalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final AtomicInteger a = new AtomicInteger(0);
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyAsync
+ ((Throwable t) -> {
+ threadAssertSame(t, ex);
+ a.getAndIncrement();
+ return v1;
+ });
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedNormally(g.toCompletableFuture(), v1);
+ assertEquals(1, a.get());
+ }}
+
+ /**
+ * Under default implementation, if an "exceptionally action"
+ * throws an exception, it completes exceptionally with that
+ * exception
+ */
+ public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final AtomicInteger a = new AtomicInteger(0);
+ final CFException ex1 = new CFException();
+ final CFException ex2 = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex1);
+ final CompletionStage<Integer> g = d.exceptionallyAsync
+ ((Throwable t) -> {
+ threadAssertSame(t, ex1);
+ a.getAndIncrement();
+ throw ex2;
+ });
+ if (createIncomplete) f.completeExceptionally(ex1);
+
+ checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
+ checkCompletedExceptionally(f, ex1);
+ checkCompletedExceptionally(d.toCompletableFuture(), ex1);
+ assertEquals(1, a.get());
+ }}
+
+ /**
+ * default-implemented exceptionallyCompose result completes
+ * normally after normal completion of source
+ */
+ public void testDefaultExceptionallyCompose_normalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) assertTrue(f.complete(v1));
+ final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+ if (createIncomplete) assertTrue(f.complete(v1));
+
+ checkCompletedNormally(f, v1);
+ checkCompletedNormally(g.toCompletableFuture(), v1);
+ r.assertNotInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyCompose result completes
+ * normally after exceptional completion of source
+ */
+ public void testDefaultExceptionallyCompose_exceptionalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedNormally(g.toCompletableFuture(), r.value);
+ r.assertInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyCompose completes
+ * exceptionally on exception if action does
+ */
+ public void testDefaultExceptionallyCompose_actionFailed() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final FailingExceptionalCompletableFutureFunction r
+ = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
+ r.assertInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync result completes
+ * normally after normal completion of source
+ */
+ public void testDefaultExceptionallyComposeAsync_normalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) assertTrue(f.complete(v1));
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+ if (createIncomplete) assertTrue(f.complete(v1));
+
+ checkCompletedNormally(f, v1);
+ checkCompletedNormally(g.toCompletableFuture(), v1);
+ r.assertNotInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync result completes
+ * normally after exceptional completion of source
+ */
+ public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedNormally(g.toCompletableFuture(), r.value);
+ r.assertInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync completes
+ * exceptionally on exception if action does
+ */
+ public void testDefaultExceptionallyComposeAsync_actionFailed() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final FailingExceptionalCompletableFutureFunction r
+ = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
+ r.assertInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync result completes
+ * normally after normal completion of source
+ */
+ public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ for (Integer v1 : new Integer[] { 1, null })
+ {
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) assertTrue(f.complete(v1));
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+ if (createIncomplete) assertTrue(f.complete(v1));
+
+ checkCompletedNormally(f, v1);
+ checkCompletedNormally(g.toCompletableFuture(), v1);
+ r.assertNotInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync result completes
+ * normally after exceptional completion of source
+ */
+ public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final ExceptionalCompletableFutureFunction r =
+ new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedNormally(g.toCompletableFuture(), r.value);
+ r.assertInvoked();
+ }}
+
+ /**
+ * default-implemented exceptionallyComposeAsync completes
+ * exceptionally on exception if action does
+ */
+ public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
+ for (boolean createIncomplete : new boolean[] { true, false })
+ {
+ final CFException ex = new CFException();
+ final CompletableFuture<Integer> f = new CompletableFuture<>();
+ final FailingExceptionalCompletableFutureFunction r
+ = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
+ final DelegatedCompletionStage<Integer> d =
+ new DelegatedCompletionStage<Integer>(f);
+ if (!createIncomplete) f.completeExceptionally(ex);
+ final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+ if (createIncomplete) f.completeExceptionally(ex);
+
+ checkCompletedExceptionally(f, ex);
+ checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
+ r.assertInvoked();
+ }}
+
}
--- a/test/jdk/java/util/concurrent/tck/CountedCompleterTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/CountedCompleterTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -135,10 +135,14 @@
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ Object v1 = null, v2 = null;
try {
- assertNull(a.get());
- assertNull(a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertNull(v1);
+ assertNull(v2);
}
void checkCancelled(CountedCompleter a) {
--- a/test/jdk/java/util/concurrent/tck/DelayQueueTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/DelayQueueTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -96,7 +96,7 @@
// suppress [overrides] javac warning
public int hashCode() { return pseudodelay; }
public long getDelay(TimeUnit ignore) {
- return Integer.MIN_VALUE + pseudodelay;
+ return (long) Integer.MIN_VALUE + pseudodelay;
}
public String toString() {
return String.valueOf(pseudodelay);
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool8Test.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool8Test.java Mon Oct 01 09:56:45 2018 +0100
@@ -133,10 +133,14 @@
assertNull(a.join());
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ Object v1 = null, v2 = null;
try {
- assertNull(a.get());
- assertNull(a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertNull(v1);
+ assertNull(v2);
}
void checkCancelled(ForkJoinTask a) {
--- a/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinTask8Test.java Mon Oct 01 09:56:45 2018 +0100
@@ -140,13 +140,13 @@
checkCompletedNormally(a, null);
}
- <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
+ <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
assertTrue(a.isDone());
assertFalse(a.isCancelled());
assertTrue(a.isCompletedNormally());
assertFalse(a.isCompletedAbnormally());
assertNull(a.getException());
- assertSame(expected, a.getRawResult());
+ assertSame(expectedValue, a.getRawResult());
if (a instanceof BinaryAsyncAction)
assertEquals(COMPLETE_STATE,
((BinaryAsyncAction)a).getForkJoinTaskTag());
@@ -154,7 +154,7 @@
{
Thread.currentThread().interrupt();
long startTime = System.nanoTime();
- assertSame(expected, a.join());
+ assertSame(expectedValue, a.join());
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
Thread.interrupted();
}
@@ -169,10 +169,14 @@
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ T v1 = null, v2 = null;
try {
- assertSame(expected, a.get());
- assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertSame(expectedValue, v1);
+ assertSame(expectedValue, v2);
}
void checkCompletedAbnormally(ForkJoinTask a, Throwable t) {
--- a/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -114,18 +114,18 @@
checkCompletedNormally(a, null);
}
- <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
+ <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
assertTrue(a.isDone());
assertFalse(a.isCancelled());
assertTrue(a.isCompletedNormally());
assertFalse(a.isCompletedAbnormally());
assertNull(a.getException());
- assertSame(expected, a.getRawResult());
+ assertSame(expectedValue, a.getRawResult());
{
Thread.currentThread().interrupt();
long startTime = System.nanoTime();
- assertSame(expected, a.join());
+ assertSame(expectedValue, a.join());
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
Thread.interrupted();
}
@@ -140,10 +140,14 @@
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ T v1 = null, v2 = null;
try {
- assertSame(expected, a.get());
- assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertSame(expectedValue, v1);
+ assertSame(expectedValue, v2);
}
void checkCancelled(ForkJoinTask a) {
--- a/test/jdk/java/util/concurrent/tck/FutureTaskTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/FutureTaskTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -87,8 +87,9 @@
pf.run();
pf.runAndReset();
assertEquals(savedRunCount, pf.runCount());
+ Object r2 = null;
try {
- assertSame(r, f.get());
+ r2 = f.get();
} catch (CancellationException t) {
assertSame(exInfo, CancellationException.class);
} catch (ExecutionException t) {
@@ -96,6 +97,8 @@
} catch (Throwable t) {
threadUnexpectedException(t);
}
+ if (exInfo == null)
+ assertSame(r, r2);
assertTrue(f.isDone());
}
}
@@ -128,14 +131,17 @@
}
}
- <T> void checkCompletedNormally(Future<T> f, T expected) {
+ <T> void checkCompletedNormally(Future<T> f, T expectedValue) {
checkIsDone(f);
assertFalse(f.isCancelled());
+ T v1 = null, v2 = null;
try {
- assertSame(expected, f.get());
- assertSame(expected, f.get(randomTimeout(), randomTimeUnit()));
+ v1 = f.get();
+ v2 = f.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertSame(expectedValue, v1);
+ assertSame(expectedValue, v2);
}
void checkCancelled(Future<?> f) {
@@ -485,7 +491,7 @@
try {
task.cancel(true);
shouldThrow();
- } catch (SecurityException expected) {}
+ } catch (SecurityException success) {}
// We failed to deliver the interrupt, but the world retains
// its sanity, as if we had done task.cancel(false)
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java Mon Oct 01 09:56:45 2018 +0100
@@ -1415,9 +1415,11 @@
*/
<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
long startTime = System.nanoTime();
+ T actual = null;
try {
- assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
+ actual = f.get(timeoutMillis, MILLISECONDS);
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertEquals(expectedValue, actual);
if (millisElapsedSince(startTime) > timeoutMillis/2)
throw new AssertionError("timed get did not return promptly");
}
@@ -1596,13 +1598,15 @@
}
public void await(CountDownLatch latch, long timeoutMillis) {
+ boolean timedOut = false;
try {
- if (!latch.await(timeoutMillis, MILLISECONDS))
- fail("timed out waiting for CountDownLatch for "
- + (timeoutMillis/1000) + " sec");
+ timedOut = !latch.await(timeoutMillis, MILLISECONDS);
} catch (Throwable fail) {
threadUnexpectedException(fail);
}
+ if (timedOut)
+ fail("timed out waiting for CountDownLatch for "
+ + (timeoutMillis/1000) + " sec");
}
public void await(CountDownLatch latch) {
@@ -1610,13 +1614,15 @@
}
public void await(Semaphore semaphore) {
+ boolean timedOut = false;
try {
- if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
- fail("timed out waiting for Semaphore for "
- + (LONG_DELAY_MS/1000) + " sec");
+ timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
} catch (Throwable fail) {
threadUnexpectedException(fail);
}
+ if (timedOut)
+ fail("timed out waiting for Semaphore for "
+ + (LONG_DELAY_MS/1000) + " sec");
}
public void await(CyclicBarrier barrier) {
@@ -1802,17 +1808,17 @@
@SuppressWarnings("unchecked")
<T> T serialClone(T o) {
+ T clone = null;
try {
ObjectInputStream ois = new ObjectInputStream
(new ByteArrayInputStream(serialBytes(o)));
- T clone = (T) ois.readObject();
- if (o == clone) assertImmutable(o);
- assertSame(o.getClass(), clone.getClass());
- return clone;
+ clone = (T) ois.readObject();
} catch (Throwable fail) {
threadUnexpectedException(fail);
- return null;
}
+ if (o == clone) assertImmutable(o);
+ else assertSame(o.getClass(), clone.getClass());
+ return clone;
}
/**
@@ -1831,7 +1837,7 @@
(new ByteArrayInputStream(bos.toByteArray()));
T clone = (T) ois.readObject();
if (o == clone) assertImmutable(o);
- assertSame(o.getClass(), clone.getClass());
+ else assertSame(o.getClass(), clone.getClass());
return clone;
}
--- a/test/jdk/java/util/concurrent/tck/RecursiveActionTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/RecursiveActionTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -123,10 +123,14 @@
assertNull(a.join());
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ Object v1 = null, v2 = null;
try {
- assertNull(a.get());
- assertNull(a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertNull(v1);
+ assertNull(v2);
}
void checkCancelled(RecursiveAction a) {
--- a/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -109,29 +109,33 @@
} catch (Throwable fail) { threadUnexpectedException(fail); }
}
- <T> void checkCompletedNormally(RecursiveTask<T> a, T expected) {
+ <T> void checkCompletedNormally(RecursiveTask<T> a, T expectedValue) {
assertTrue(a.isDone());
assertFalse(a.isCancelled());
assertTrue(a.isCompletedNormally());
assertFalse(a.isCompletedAbnormally());
assertNull(a.getException());
- assertSame(expected, a.getRawResult());
- assertSame(expected, a.join());
+ assertSame(expectedValue, a.getRawResult());
+ assertSame(expectedValue, a.join());
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ T v1 = null, v2 = null;
try {
- assertSame(expected, a.get());
- assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertSame(expectedValue, v1);
+ assertSame(expectedValue, v2);
}
/**
* Waits for the task to complete, and checks that when it does,
* it will have an Integer result equals to the given int.
*/
- void checkCompletesNormally(RecursiveTask<Integer> a, int expected) {
+ void checkCompletesNormally(RecursiveTask<Integer> a, int expectedValue) {
Integer r = a.join();
- assertEquals(expected, (int) r);
+ assertEquals(expectedValue, (int) r);
checkCompletedNormally(a, r);
}
@@ -139,9 +143,9 @@
* Like checkCompletesNormally, but verifies that the task has
* already completed.
*/
- void checkCompletedNormally(RecursiveTask<Integer> a, int expected) {
+ void checkCompletedNormally(RecursiveTask<Integer> a, int expectedValue) {
Integer r = a.getRawResult();
- assertEquals(expected, (int) r);
+ assertEquals(expectedValue, (int) r);
checkCompletedNormally(a, r);
}
--- a/test/jdk/java/util/concurrent/tck/ReentrantLockTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/ReentrantLockTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1187,7 +1187,7 @@
await(cond, awaitMethod);
throw new AssertionError("should throw");
}
- catch (IllegalMonitorStateException expected) {}
+ catch (IllegalMonitorStateException success) {}
catch (Throwable fail) { threadUnexpectedException(fail); }}};
Thread rogueThread = new Thread(rogue, "rogue");
threads.add(rogueThread);
--- a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1029,7 +1029,9 @@
public void onComplete() {}
}
pub.subscribe(new Sub());
- CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE));
+ checkTimedGet(
+ CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE)),
+ null);
await(finished);
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/sound/sampled/Clip/ClipIsRunningAfterStop.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2018, 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 java.util.concurrent.TimeUnit;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineUnavailableException;
+
+import static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
+
+/**
+ * @test
+ * @bug 8207150
+ * @summary Clip.isRunning() may return true after Clip.stop() was called
+ */
+public final class ClipIsRunningAfterStop {
+
+ private static volatile Exception failed;
+
+ public static void main(final String[] args) throws Exception {
+ final Runnable r = () -> {
+ try {
+ test();
+ } catch (LineUnavailableException | IllegalArgumentException ignored) {
+ // the test is not applicable
+ } catch (Exception ex) {
+ failed = ex;
+ }
+ };
+ Thread t1 = new Thread(r);
+ Thread t2 = new Thread(r);
+ Thread t3 = new Thread(r);
+ t1.start();
+ t2.start();
+ t3.start();
+ t1.join();
+ t2.join();
+ t3.join();
+ if (failed != null) {
+ throw new RuntimeException(failed);
+ }
+ }
+
+ private static void test() throws Exception {
+ // Will run the test no more than 15 seconds
+ long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
+ while (failed == null && endtime - System.nanoTime() > 0) {
+ Clip clip = createClip();
+ clip.loop(Clip.LOOP_CONTINUOUSLY);
+ clip.stop();
+ if (clip.isRunning()) {
+ if (clip.isRunning()) {
+ throw new RuntimeException("Clip is running");
+ }
+ }
+ if (clip.isActive()) {
+ if (clip.isActive()) {
+ throw new RuntimeException("Clip is active");
+ }
+ }
+ clip.close();
+ }
+ }
+
+ private static Clip createClip() throws LineUnavailableException {
+ AudioFormat format =
+ new AudioFormat(PCM_SIGNED, 44100, 8, 1, 1, 44100, false);
+ DataLine.Info info = new DataLine.Info(Clip.class, format);
+ Clip clip = (Clip) AudioSystem.getLine(info);
+ clip.open(format, new byte[2], 0, 2);
+ return clip;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JEditorPane/TestHTMLBulletsSizeAndAliasing.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2018, 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 8201925 8202013
+ * @summary Verifies if JEditorPane unordered list bullets look pixelated
+ * and large relative to text font size
+ * @run main/manual TestHTMLBulletsSizeAndAliasing
+ */
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JEditorPane;
+
+public class TestHTMLBulletsSizeAndAliasing {
+
+ public static void main(String[] args) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ AliasingTest test = new AliasingTest(latch);
+ Thread T1 = new Thread(test);
+ T1.start();
+
+ // wait for latch to complete
+ boolean ret = false;
+ try {
+ ret = latch.await(60, TimeUnit.SECONDS);
+ } catch (InterruptedException ie) {
+ throw ie;
+ }
+ if (!ret) {
+ test.dispose();
+ throw new RuntimeException(" User has not executed the test");
+ }
+
+ if (test.testResult == false) {
+ throw new RuntimeException("JEditorPane unordered list bullets look pixelated");
+ }
+ }
+}
+
+class AliasingTest implements Runnable {
+ static JFrame f;
+ static JDialog dialog;
+ public boolean testResult = false;
+ private final CountDownLatch latch;
+
+ public AliasingTest(CountDownLatch latch) throws Exception {
+ this.latch = latch;
+ }
+
+ @Override
+ public void run() {
+ try {
+ SwingUtilities.invokeAndWait(() -> {
+ createUI();
+ aliasingTest();
+ });
+ } catch (Exception ex) {
+ if (f != null) {
+ f.dispose();
+ }
+ latch.countDown();
+ throw new RuntimeException("createUI Failed: " + ex.getMessage());
+ }
+
+ }
+
+ public void dispose() {
+ dialog.dispose();
+ f.dispose();
+ }
+
+
+ private static String getHtml() {
+ return "<html><body>" +
+ "<ul>" +
+ "<li>Text</li>" +
+ "<li>Document</li>" +
+ "</ul>" +
+ "</body></html>";
+ }
+
+ private static Component createSplitPane() {
+ JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
+ createHtmlViewer(false), createHtmlViewer(true));
+ splitPane.setOneTouchExpandable(true);
+ splitPane.setResizeWeight(0.5);
+ splitPane.setPreferredSize(new Dimension(150, 150));
+ return splitPane;
+ }
+
+ private static Component createHtmlViewer(boolean antialiasing) {
+ JEditorPane editorPane;
+ if (antialiasing) {
+ editorPane = new JEditorPane() {
+ @Override
+ public void paint(Graphics g) {
+ Graphics2D g2d = (Graphics2D) g.create();
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ super.paint(g2d);
+ g2d.dispose();
+ }
+ };
+ }
+ else {
+ editorPane = new JEditorPane();
+ }
+ editorPane.setEditable(false);
+ editorPane.setContentType("text/html");
+ editorPane.setText(getHtml());
+ return new JScrollPane(editorPane);
+ }
+ private static void aliasingTest() {
+ f = new JFrame("List Bullets");
+ f.add(createSplitPane());
+ f.pack();
+ f.setLocationRelativeTo(null);
+ f.setVisible(true);
+ }
+
+
+ private final void createUI() {
+ String description
+ = " INSTRUCTIONS:\n"
+ + " A JEditorPane divided by SplitPane will be shown.\n"
+ + " The upper html is rendered in a default JEditorPane.\n "
+ + " The lower html is rendered in a JEditorPane using "
+ + " rendering hints to turn on antialiasing.\n"
+ + " If upper html bullets looks pixelated AND"
+ + " larger than needed relative to text font size\n"
+ + " and not as smooth as shown in lower html\n "
+ + " then press fail else press pass";
+
+ dialog = new JDialog();
+ dialog.setTitle("textselectionTest");
+ JTextArea textArea = new JTextArea(description);
+ textArea.setEditable(false);
+ final JButton passButton = new JButton("PASS");
+ passButton.addActionListener((e) -> {
+ testResult = true;
+ dispose();
+ latch.countDown();
+ });
+ final JButton failButton = new JButton("FAIL");
+ failButton.addActionListener((e) -> {
+ testResult = false;
+ dispose();
+ latch.countDown();
+ });
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ mainPanel.add(textArea, BorderLayout.CENTER);
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ buttonPanel.add(passButton);
+ buttonPanel.add(failButton);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ dialog.add(mainPanel);
+ dialog.pack();
+ dialog.setVisible(true);
+ }
+}
--- a/test/jdk/javax/swing/JSplitPane/4816114/bug4816114.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/javax/swing/JSplitPane/4816114/bug4816114.java Mon Oct 01 09:56:45 2018 +0100
@@ -24,20 +24,26 @@
/*
* @test
* @key headful
- * @bug 4816114
+ * @bug 4816114 8203904
* @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized
* @author Andrey Pikalev
* @run main bug4816114
*/
-import javax.swing.*;
-import java.awt.*;
-import java.lang.reflect.*;
-
+import java.awt.Robot;
+import java.awt.Dimension;
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.SwingUtilities;
+import javax.swing.JSplitPane;
+import javax.swing.BorderFactory;
+import java.lang.reflect.InvocationTargetException;
public class bug4816114 {
- JFrame fr;
+ static JFrame fr;
JSplitPane splitPane;
boolean[] resized = new boolean[] { false, false, false,
@@ -49,43 +55,49 @@
static bug4816114 test = new bug4816114();
public static void main(String[] args) throws InterruptedException, InvocationTargetException, AWTException {
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- test.createAndShowGUI();
- }
- });
- Robot robot = new Robot();
- robot.waitForIdle();
- Thread.sleep(1000);
- Thread.sleep(2000);
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test.createAndShowGUI();
+ }
+ });
+ Robot robot = new Robot();
+ robot.waitForIdle();
+ Thread.sleep(1000);
+ Thread.sleep(2000);
- step++;
- test.doTest(150, 300);
+ step++;
+ test.doTest(150, 300);
- step++;
- test.doTest(650, 300);
+ step++;
+ test.doTest(650, 300);
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- test.splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
- }
- });
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test.splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
+ }
+ });
- step++;
- test.doTest(300, 650);
+ step++;
+ test.doTest(300, 650);
- step++;
- test.doTest(300, 150);
+ step++;
+ test.doTest(300, 150);
+
+ step++;
+ test.doTest(300, 650);
- step++;
- test.doTest(300, 650);
-
- if ( !test.isPassed() ) {
- throw new Error("The divider location is wrong.");
+ if ( !test.isPassed() ) {
+ throw new Error("The divider location is wrong.");
+ }
+ } finally {
+ SwingUtilities.invokeAndWait(() -> fr.dispose());
}
}
+
public void createAndShowGUI() {
fr = new JFrame("Test");
+ fr.setUndecorated(true);
splitPane = new TestSplitPane();
splitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JTable/TestClearSel.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2018, 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
+ * @key headful
+ * @bug 8202702
+ * @summary Verifies if Jtable clear selction causes disappearance of a row.
+ * @run main/manual TestClearSel
+ */
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+
+public class TestClearSel {
+
+ static DefaultTableModel model;
+
+ public static void main(String[] args) throws Exception {
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ ClearSelTest test = new ClearSelTest(latch);
+ Thread T1 = new Thread(test);
+ T1.start();
+
+ // wait for latch to complete
+ boolean ret = false;
+ try {
+ ret = latch.await(60, TimeUnit.SECONDS);
+ } catch (InterruptedException ie) {
+ throw ie;
+ }
+ if (!ret) {
+ test.dispose();
+ throw new RuntimeException(" User has not executed the test");
+ }
+
+ if (test.testResult == false) {
+ throw new RuntimeException("Some text were not rendered properly"
+ + " during painting of Jtable rows ");
+ }
+ }
+}
+
+class ClearSelTest implements Runnable {
+ static JFrame f;
+ static JDialog dialog;
+ static DefaultTableModel model;
+ public boolean testResult = false;
+ private final CountDownLatch latch;
+ private static String[] rows = new String[]{
+ "Row1", "Row2", "Row3", "Row4", "Row5",
+ "Row6", "Row7", "Row8", "Row9", "Row10"};
+
+ public ClearSelTest(CountDownLatch latch) throws Exception {
+ this.latch = latch;
+ }
+
+ @Override
+ public void run() {
+ try {
+ SwingUtilities.invokeAndWait(() -> {
+ createUI();
+ clearSelTest();
+ });
+ } catch (Exception ex) {
+ if (f != null) {
+ f.dispose();
+ }
+ latch.countDown();
+ throw new RuntimeException("createUI Failed: " + ex.getMessage());
+ }
+
+ }
+
+ public void dispose() {
+ dialog.dispose();
+ f.dispose();
+ }
+
+ private static void clearSelTest() {
+ final DefaultTableModel model = new DefaultTableModel();
+ model.addColumn("Test", rows);
+ final JTable table = new JTable(model);
+ table.setRowHeight(25);
+
+ final MouseAdapter adapt = new MouseAdapter() {
+
+ @Override
+ public void mouseMoved(final MouseEvent pE) {
+ final int row = table.rowAtPoint(pE.getPoint());
+ if (row > -1) {
+ table.setRowSelectionInterval(row, row);
+ } else {
+ table.clearSelection();
+ }
+ }
+
+ @Override
+ public void mouseEntered(final MouseEvent pE) {
+ final int row = table.rowAtPoint(pE.getPoint());
+ if (row > -1) {
+ table.setRowSelectionInterval(row, row);
+ } else {
+ table.clearSelection();
+ }
+ }
+
+ @Override
+ public void mouseExited(final MouseEvent pE) {
+ table.clearSelection();
+ }
+ };
+ table.addMouseListener(adapt);
+ table.addMouseMotionListener(adapt);
+
+ f = new JFrame();
+ f.setSize(300, 300);
+ f.setLocationRelativeTo(null);
+ f.add(table);
+ f.setVisible(true);
+ }
+
+
+ private final void createUI() {
+ String description
+ = " INSTRUCTIONS:\n"
+ + " A JTable will be shown.\n"
+ + " Move mouse over different row to select the row.\n "
+ + " Please verify if row text disappear "
+ + " if mouse is moved out of table.\n"
+ + " If any moment any part of the rows will not be\n "
+ + " painted properly and if some text are missing in JTable,\n "
+ + " then press fail else press pass";
+
+ dialog = new JDialog();
+ dialog.setTitle("textselectionTest");
+ JTextArea textArea = new JTextArea(description);
+ textArea.setEditable(false);
+ final JButton passButton = new JButton("PASS");
+ passButton.addActionListener((e) -> {
+ testResult = true;
+ dispose();
+ latch.countDown();
+ });
+ final JButton failButton = new JButton("FAIL");
+ failButton.addActionListener((e) -> {
+ testResult = false;
+ dispose();
+ latch.countDown();
+ });
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ mainPanel.add(textArea, BorderLayout.CENTER);
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ buttonPanel.add(passButton);
+ buttonPanel.add(failButton);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ dialog.add(mainPanel);
+ dialog.pack();
+ dialog.setVisible(true);
+ }
+}
--- a/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/javax/swing/UIDefaults/6795356/TableTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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,14 +24,11 @@
/*
* @test
* @bug 6795356
- * @summary Checks that SwingLazyValue class correclty works
+ * @summary Checks that SwingLazyValue class works correctly
* @author Alexander Potochkin
- * @modules java.desktop/sun.applet
* @run main/othervm TableTest
*/
-import sun.applet.AppletSecurity;
-
import javax.swing.*;
import javax.swing.table.TableCellEditor;
import java.awt.*;
@@ -41,7 +38,7 @@
public static void main(String[] args) throws Exception {
KeyboardFocusManager.getCurrentKeyboardFocusManager();
- System.setSecurityManager(new AppletSecurity());
+ System.setSecurityManager(new SecurityManager());
JTable table = new JTable();
TableCellEditor de = table.getDefaultEditor(Double.class);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/border/TestTitledBorderLeak.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018, 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 java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import javax.swing.border.TitledBorder;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8204963
+ * @summary Verifies TitledBorder's memory leak
+ * @run main TestTitledBorderLeak
+ */
+
+public class TestTitledBorderLeak {
+
+ final static int TOTAL_TITLEDBORDER = 10;
+ final static int GC_ATTEMPTS = 10;
+ static ArrayList<WeakReference<TitledBorder>> weakRefArrTB =
+ new ArrayList(TOTAL_TITLEDBORDER);
+
+ public static void main(String[] args) throws Exception {
+
+ JFrame frame[] = new JFrame[TOTAL_TITLEDBORDER];
+
+ SwingUtilities.invokeAndWait(() -> {
+ for (int i = 0; i < TOTAL_TITLEDBORDER; i++) {
+ TitledBorder tb = new TitledBorder("");
+ weakRefArrTB.add(i, new WeakReference<TitledBorder>(tb));
+ JLabel label = new JLabel("TitledBorder");
+ label.setBorder(tb);
+ frame[i] = new JFrame("Borders");
+ JPanel panel = new JPanel();
+ panel.add(label);
+ frame[i].setContentPane(panel);
+ frame[i].setVisible(true);
+
+ }
+ });
+ if (TOTAL_TITLEDBORDER != weakRefArrTB.size()) {
+ System.err.println("TOTAL_TITLEDBORDER != weakRefArrTB.size()");
+ }
+ Thread.sleep(3000);
+ SwingUtilities.invokeAndWait(() -> {
+ for (int i = 0; i < TOTAL_TITLEDBORDER; i++) {
+ frame[i].dispose();
+ frame[i] = null;
+ }
+ });
+ Thread.sleep(3000);
+ attemptGCTitledBorder();
+ if (TOTAL_TITLEDBORDER != getCleanedUpTitledBorderCount()) {
+ throw new RuntimeException("Expected Total TitledBorder to be freed : " + TOTAL_TITLEDBORDER +
+ " Freed " + getCleanedUpTitledBorderCount());
+ }
+ System.out.println("OK");
+ }
+
+ private static void attemptGCTitledBorder() {
+ // Attempt gc GC_ATTEMPTS times
+ for (int i = 0; i < GC_ATTEMPTS; i++) {
+ System.gc();
+ System.runFinalization();
+ if (getCleanedUpTitledBorderCount() == TOTAL_TITLEDBORDER) {
+ break;
+ }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ System.err.println("InterruptedException occurred during Thread.sleep()");
+ }
+ }
+ }
+
+ private static int getCleanedUpTitledBorderCount() {
+ int count = 0;
+ for (WeakReference<TitledBorder> ref : weakRefArrTB) {
+ if (ref.get() == null) {
+ count++;
+ }
+ }
+ return count;
+ }
+}
--- a/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,6 +36,7 @@
import java.awt.Robot;
import java.awt.image.BufferedImage;
+import javax.swing.UIManager;
import static com.sun.swingset3.demos.button.ButtonDemo.DEMO_TITLE;
import static org.jemmy2ext.JemmyExt.*;
@@ -66,8 +67,9 @@
sComparator = new StrictImageComparator();
}
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
Robot rob = new Robot();
new ClassReference(ButtonDemo.class.getCanonicalName()).startApplication();
@@ -112,19 +114,22 @@
assertNotBlack(pressedImage[0]);
return !sComparator.compare(initialButtonImage, pressedImage[0]);
}
+
public String getDescription() {
return "Button with new image";
}
});
} finally {
- if(pressedImage[0] != null) save(pressedImage[0], "button" + i + "_pressed.png");
+ if (pressedImage[0] != null) {
+ save(pressedImage[0], "button" + i + "_pressed.png");
+ }
button.releaseMouse();
//additional instrumentation for JDK-8198920. To be removed after the bug is fixed
button.getOutput().printTrace("JDK-8198920: Button released at " + System.currentTimeMillis());
try {
button.waitState(comp -> actionListenerCalled.get());
button.getOutput().printTrace("JDK-8198920: Action listener was called by " + System.currentTimeMillis());
- } catch(org.netbeans.jemmy.TimeoutExpiredException e) {
+ } catch (org.netbeans.jemmy.TimeoutExpiredException e) {
button.getOutput().printTrace("JDK-8198920: Action listener was not called by " + System.currentTimeMillis());
}
//end of instrumentation for JDK-8198920
--- a/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,6 +28,7 @@
import java.util.concurrent.BlockingQueue;
import javax.swing.ButtonModel;
import javax.swing.JButton;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
@@ -93,8 +94,9 @@
"isArmed = false, isEnabled = true, isPressed = false, isSelected = false"
};
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ButtonDemo.class.getCanonicalName()).startApplication();
--- a/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,6 +24,7 @@
import org.jtregext.GuiTestListener;
import com.sun.swingset3.demos.combobox.ComboBoxDemo;
import static org.testng.AssertJUnit.*;
+import javax.swing.UIManager;
import org.testng.annotations.Test;
import org.netbeans.jemmy.ClassReference;
import org.netbeans.jemmy.operators.JComboBoxOperator;
@@ -50,6 +51,7 @@
public class ComboBoxDemoTest {
private static enum ComboBoxInfo {
+
PRESETS("Presets:"),
HAIR("Hair:"),
EYES_N_NOSE("Eyes & Nose:"),
@@ -63,9 +65,9 @@
}
- @Test
- public void test() throws Exception {
-
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ComboBoxDemo.class.getCanonicalName()).startApplication();
JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/SwingSet/src/FrameDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2018, 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 static com.sun.swingset3.demos.frame.FrameDemo.BUSY_CHECKBOX;
+import static com.sun.swingset3.demos.frame.FrameDemo.CONTENT_LABEL;
+import static com.sun.swingset3.demos.frame.FrameDemo.CONTENT_LABEL_COLOR;
+import static com.sun.swingset3.demos.frame.FrameDemo.CONTENT_LABEL_SIZE;
+import static com.sun.swingset3.demos.frame.FrameDemo.DEMO_TITLE;
+import static com.sun.swingset3.demos.frame.FrameDemo.INTERNAL_FRAME;
+import static com.sun.swingset3.demos.frame.FrameDemo.MENU;
+import static com.sun.swingset3.demos.frame.FrameDemo.MENU_ITEM1;
+import static com.sun.swingset3.demos.frame.FrameDemo.MENU_ITEM2;
+import static com.sun.swingset3.demos.frame.FrameDemo.SHOW_BUTTON;
+import static com.sun.swingset3.demos.frame.FrameDemo.STATUS_LABEL;
+import static com.sun.swingset3.demos.frame.FrameDemo.STATUS_LABEL_BORDER;
+import static com.sun.swingset3.demos.frame.FrameDemo.STATUS_LABEL_HOR_ALIGNMENT;
+import static com.sun.swingset3.demos.frame.FrameDemo.TOOLBAR_BUTTON;
+import static org.jemmy2ext.JemmyExt.EXACT_STRING_COMPARATOR;
+import static org.testng.AssertJUnit.assertEquals;
+
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Point;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.UIManager;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+import org.jtregext.GuiTestListener;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.ComponentChooser;
+import org.netbeans.jemmy.WindowWaiter;
+import org.netbeans.jemmy.operators.ComponentOperator;
+import org.netbeans.jemmy.operators.FrameOperator;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JCheckBoxOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+import org.netbeans.jemmy.operators.JMenuBarOperator;
+import org.netbeans.jemmy.operators.JMenuItemOperator;
+import org.netbeans.jemmy.operators.JMenuOperator;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import com.sun.swingset3.demos.frame.FrameDemo;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 FrameDemo page by checking the different actions
+ * on the frame, properties and different actions on subcomponents of frame
+ * and control panel actions by checking and unchecking the busy check box and
+ * pressing the show button.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Extensions/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @modules java.desktop
+ * java.logging
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.frame.FrameDemo
+ * @run testng FrameDemoTest
+ */
+@Listeners(GuiTestListener.class)
+public class FrameDemoTest {
+
+ private final static Dimension NEW_SIZE = new Dimension(500, 500);
+ private final static Point NEW_LOCATION = new Point(200, 200);
+ private final static int NUMBER_OF_MENUS = 1;
+ private final static int NUMBER_OF_MENU_ITEMS = 2;
+ private final static int MAX_NUMBER_OF_FRAMES = 1;
+ private final static int DELAY_AFTER_SHOW_BUTTON_PRESS = 500;
+
+ /**
+ * Testing the different actions on the frame, properties and different
+ * actions on subcomponents of the frame and control panel action by
+ * checking and unchecking the busy check box and pressing the show button.
+ *
+ * @throws Exception
+ */
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
+ new ClassReference(FrameDemo.class.getCanonicalName()).startApplication();
+
+ JFrameOperator masterFrameOperator = new JFrameOperator(DEMO_TITLE);
+ masterFrameOperator.setComparator(EXACT_STRING_COMPARATOR);
+
+ JFrameOperator internalFrameOperator = new JFrameOperator(INTERNAL_FRAME);
+ internalFrameOperator.setComparator(EXACT_STRING_COMPARATOR);
+ internalFrameOperator.setVerification(true);
+ internalFrameOperator.waitComponentVisible(true);
+
+ checkSubComponents(internalFrameOperator);
+ checkFrameActions(internalFrameOperator);
+ checkControlPanelActions(masterFrameOperator, internalFrameOperator);
+ }
+
+ /**
+ * Verifying the status of added components to the frame
+ * @param internalFrameOperator
+ */
+ private void checkSubComponents(JFrameOperator internalFrameOperator) {
+ // Verifying the properties of added button to the frame
+ JButtonOperator buttonOperator =
+ new JButtonOperator(internalFrameOperator, TOOLBAR_BUTTON);
+ AtomicBoolean buttonActionStatus = new AtomicBoolean(false);
+ buttonOperator.addActionListener(event -> buttonActionStatus.set(true));
+ buttonOperator.push();
+ buttonOperator.waitStateOnQueue(comp -> buttonActionStatus.get());
+
+ // Verifying the properties of added labels to the frame
+ JLabelOperator contentLabelOperator =
+ new JLabelOperator(internalFrameOperator, CONTENT_LABEL);
+ contentLabelOperator.waitStateOnQueue(comp
+ -> CONTENT_LABEL_SIZE.equals(comp.getSize()));
+ contentLabelOperator.waitStateOnQueue(comp
+ -> CONTENT_LABEL_COLOR.equals(comp.getBackground()));
+ JLabelOperator statusLabelOperator =
+ new JLabelOperator(internalFrameOperator, STATUS_LABEL);
+ statusLabelOperator.waitStateOnQueue(comp
+ -> STATUS_LABEL_BORDER.equals(((JLabel)comp).getBorder()));
+ statusLabelOperator.waitStateOnQueue((component) -> STATUS_LABEL_HOR_ALIGNMENT
+ == ((JLabel)component).getHorizontalAlignment());
+
+ // Verifying the properties of added menu to the frame
+ JMenuBarOperator menuBarOperator = new JMenuBarOperator(internalFrameOperator);
+ menuBarOperator.waitStateOnQueue(comp -> NUMBER_OF_MENUS
+ == ((JMenuBar)comp).getMenuCount());
+ JMenuOperator menuOperator = new JMenuOperator(internalFrameOperator, MENU);
+ menuOperator.waitStateOnQueue(comp -> NUMBER_OF_MENU_ITEMS
+ == ((JMenu)comp).getMenuComponentCount());
+ AtomicBoolean menuActionStatus = new AtomicBoolean(false);
+ addMenuListener(menuOperator, menuActionStatus);
+ menuOperator.push();
+ menuOperator.waitStateOnQueue(comp -> menuActionStatus.get());
+
+ // Verifying the properties of the menu items
+ checkMenuItem((JMenuItem) menuOperator.getMenuComponent(0), MENU_ITEM1);
+ checkMenuItem((JMenuItem) menuOperator.getMenuComponent(1), MENU_ITEM2);
+ }
+
+ /**
+ * Verifying different actions on the frame
+ * @param internalFrameOperator
+ */
+ private void checkFrameActions(JFrameOperator internalFrameOperator)
+ throws InterruptedException {
+ // Verifying the maximized status
+ internalFrameOperator.maximize();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
+ internalFrameOperator.demaximize();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
+
+ // Verifying the iconified status
+ internalFrameOperator.iconify();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
+ internalFrameOperator.deiconify();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
+
+ // Verifying the resize of the frame
+ TestHelpers.checkChangeSize(internalFrameOperator, NEW_SIZE);
+
+ // Verifying the change of location of the frame
+ TestHelpers.checkChangeLocation(internalFrameOperator, NEW_LOCATION);
+ }
+
+ /**
+ * Verifying control panel actions on the frame
+ * @param masterFrameOprator
+ * @param internalFrameOperator
+ * @throws InterruptedException
+ */
+ private void checkControlPanelActions(JFrameOperator masterFrameOprator,
+ JFrameOperator internalFrameOperator) throws InterruptedException {
+ // Verifying the visibility and number of frames after pressing Show Button
+ internalFrameOperator.requestClose();
+ internalFrameOperator.waitClosed();
+ JButtonOperator showButtonOperator = new JButtonOperator(masterFrameOprator, SHOW_BUTTON);
+ showButtonOperator.push();
+ internalFrameOperator.waitComponentVisible(true);
+ showButtonOperator.push();
+ showButtonOperator.push();
+ Thread.sleep(DELAY_AFTER_SHOW_BUTTON_PRESS);
+ int count = WindowWaiter.countWindows(masterFrameOprator.getOwner(),
+ new FrameOperator.FrameFinder(new ComponentChooser() {
+
+ @Override
+ public String getDescription() {
+ return "frames with name != " + DEMO_TITLE;
+ }
+
+ @Override
+ public boolean checkComponent(Component comp) {
+ return comp.isShowing()
+ && ((Frame) comp).getTitle() != DEMO_TITLE;
+ }
+ }));
+ assertEquals("Number of frames after clicking Show Button two times"
+ + " validation failed,", MAX_NUMBER_OF_FRAMES, count);
+
+ // Verifying the visibility and cursor type after selecting busy check box
+ JCheckBoxOperator busyCheckBoxOperator =
+ new JCheckBoxOperator(masterFrameOprator, BUSY_CHECKBOX);
+ busyCheckBoxOperator.setVerification(true);
+ checkBusyCheckBox(internalFrameOperator, busyCheckBoxOperator, true);
+ internalFrameOperator.waitStateOnQueue(comp -> Cursor.WAIT_CURSOR
+ == internalFrameOperator.getGlassPane().getCursor().getType());
+
+ checkBusyCheckBox(internalFrameOperator, busyCheckBoxOperator, false);
+ internalFrameOperator.waitStateOnQueue(comp -> Cursor.DEFAULT_CURSOR
+ == internalFrameOperator.getCursor().getType());
+ }
+
+ private void checkBusyCheckBox(JFrameOperator internalFrameOperator,
+ JCheckBoxOperator busyCheckBoxOperator, boolean isSelect) {
+ busyCheckBoxOperator.changeSelection(isSelect);
+ new ComponentOperator(internalFrameOperator.
+ getGlassPane()).waitComponentVisible(isSelect);
+ }
+
+ /**
+ * Verifying the properties of the menu item
+ * @param menuItem : menu item component
+ * @param menuExpectedName : expected menu item name/text
+ */
+ private void checkMenuItem(JMenuItem menuItem, String menuExpectedName) {
+ JMenuItemOperator menuItemOperator = new JMenuItemOperator(menuItem);
+ AtomicBoolean menuItemActionStatus = new AtomicBoolean(false);
+ menuItemOperator.addActionListener(event -> menuItemActionStatus.set(true));
+ menuItemOperator.waitStateOnQueue((component)
+ -> menuExpectedName.equals(((JMenuItem)component).getText()));
+ menuItemOperator.push();
+ menuItemOperator.waitStateOnQueue(comp -> menuItemActionStatus.get());
+ }
+
+ /**
+ * Add menu listener to the operator
+ * @param menuOperator : JMenuOperator on which menu listener has to be added
+ * @param menuActionStatus : menu action status variable
+ */
+ private void addMenuListener(JMenuOperator menuOperator,
+ AtomicBoolean menuActionStatus) {
+ menuOperator.addMenuListener(new MenuListener() {
+
+ @Override
+ public void menuSelected(MenuEvent e) {
+ menuActionStatus.set(true);
+ }
+
+ @Override
+ public void menuDeselected(MenuEvent e) {
+ }
+
+ @Override
+ public void menuCanceled(MenuEvent e) {
+ }
+ });
+ }
+
+}
\ No newline at end of file
--- a/test/jdk/sanity/client/SwingSet/src/InternalFrameDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/InternalFrameDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -138,6 +138,9 @@
orignalSize.height - PARENT_FRAME_NEW_SIZE_DELTA);
parentFrameOperator.resize(newSize.width, newSize.height);
parentFrameOperator.waitComponentSize(newSize);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// keeping some delay before checking the internal frame property
// as it is a negative scenario
Thread.sleep(DELAY);
@@ -145,26 +148,41 @@
// Resizing parent frame back to original size
parentFrameOperator.resize(orignalSize.width, orignalSize.height);
parentFrameOperator.waitComponentSize(orignalSize);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// Iconifying the parent frame and verifying the iconified status of the internal
// frame(it should not be iconified)
parentFrameOperator.iconify();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// keeping some delay before checking the internal frame property
// as it is a negative scenario
Thread.sleep(DELAY);
assertFalse("Internal Frame should not be iconified when parent frame"
+ " alone is iconified.", internalFrameOperator.isIcon());
parentFrameOperator.deiconify();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// Maximizing the parent frame and verifying the maximized status of the internal
// frame(it should not be maximized)
parentFrameOperator.maximize();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// keeping some delay before checking the internal frame property
// as it is a negative scenario
Thread.sleep(DELAY);
assertFalse("Internal Frame should not be maximized when parent frame"
+ " alone is maximized.", internalFrameOperator.isMaximum());
parentFrameOperator.demaximize();
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// Relocating the parent frame and verifying the location of the internal
// frame(it should not be changed the location)
@@ -173,6 +191,9 @@
(orignalLocation.y + PARENT_FRAME_NEW_LOCATION_DELTA));
parentFrameOperator.move(newLocation.x, newLocation.y);
parentFrameOperator.waitComponentLocation(newLocation);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
// keeping some delay before checking the internal frame property
// as it is a negative scenario
Thread.sleep(DELAY);
@@ -180,15 +201,19 @@
// Moving back parent frame to original location
parentFrameOperator.move(orignalLocation.x, orignalLocation.y);
parentFrameOperator.waitComponentLocation(orignalLocation);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ TestHelpers.delayBetweenFrameStateChange();
}
/**
* Verifying different actions on the internal frame.
*
* @param internalFrameOperator : internal fame operator
+ * @throws InterruptedException
*/
- private void checkInternalFrameAction(
- JInternalFrameOperator internalFrameOperator) {
+ private void checkInternalFrameAction(JInternalFrameOperator
+ internalFrameOperator) throws InterruptedException {
// Verifying maximize and demaximize actions
internalFrameOperator.waitStateOnQueue(comp
-> ((JInternalFrame)comp).isMaximizable());
--- a/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,6 +26,7 @@
import java.awt.Component;
import javax.swing.JList;
+import javax.swing.UIManager;
import org.netbeans.jemmy.ClassReference;
import org.netbeans.jemmy.ComponentChooser;
@@ -67,14 +68,16 @@
public boolean checkComponent(Component comp) {
return getUIValue(listOp, (JList list) -> list.getModel().getSize()) == size;
}
+
public String getDescription() {
return "Model size to be equal to " + size;
}
});
}
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ListDemo.class.getCanonicalName()).startApplication();
--- a/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,8 +70,9 @@
public static final String YES = "Yes";
public static final String SELECT_AN_OPTION = UIManager.getString("OptionPane.titleText");
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(OptionPaneDemo.class.getCanonicalName()).startApplication();
@@ -94,7 +95,7 @@
private void useInputDialog(JFrameOperator jfo, String textToType, String buttonToPush) {
new JButtonOperator(jfo, INPUT_BUTTON).pushNoBlock();
JDialogOperator jdo = new JDialogOperator(INPUT);
- if(textToType != null) {
+ if (textToType != null) {
JTextFieldOperator jto = new JTextFieldOperator(jdo);
jto.typeText(textToType);
jto.waitText(textToType);
@@ -146,7 +147,7 @@
}
private void callADialogAndClose(JFrameOperator jfo, String buttonToOpenDialog,
- String dialogTitle, String buttonToPush) {
+ String dialogTitle, String buttonToPush) {
new JButtonOperator(jfo, buttonToOpenDialog).pushNoBlock();
JDialogOperator jdo = new JDialogOperator(dialogTitle);
new JButtonOperator(jdo, buttonToPush).push();
--- a/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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 @@
import com.sun.swingset3.demos.progressbar.ProgressBarDemo;
import static com.sun.swingset3.demos.progressbar.ProgressBarDemo.*;
import java.awt.Component;
+import javax.swing.UIManager;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
import org.netbeans.jemmy.ClassReference;
@@ -55,9 +56,9 @@
private final static long PROGRESS_BAR_TIMEOUT = 180000;
- @Test
- public void test() throws Exception {
-
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ProgressBarDemo.class.getCanonicalName()).startApplication();
JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
--- a/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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 @@
import com.sun.swingset3.demos.scrollpane.ScrollPaneDemo;
import static com.sun.swingset3.demos.scrollpane.ScrollPaneDemo.DEMO_TITLE;
import static org.testng.AssertJUnit.*;
+import javax.swing.UIManager;
import org.testng.annotations.Test;
import org.netbeans.jemmy.ClassReference;
import org.netbeans.jemmy.operators.JFrameOperator;
@@ -49,8 +50,9 @@
@Listeners(GuiTestListener.class)
public class ScrollPaneDemoTest {
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ScrollPaneDemo.class.getName()).startApplication();
--- a/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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 @@
import com.sun.swingset3.demos.spinner.SpinnerDemo;
import static com.sun.swingset3.demos.spinner.SpinnerDemo.DEMO_TITLE;
import java.text.DecimalFormat;
+import javax.swing.UIManager;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.Test;
import org.netbeans.jemmy.ClassReference;
@@ -54,8 +55,9 @@
private static final int SPINNERS_COUNT = 9;
private static final DecimalFormat decimalFormat = new DecimalFormat();
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(SpinnerDemo.class.getCanonicalName()).startApplication();
JFrameOperator frame = new JFrameOperator(DEMO_TITLE);
--- a/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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,6 +26,7 @@
import static com.sun.swingset3.demos.tabbedpane.TabbedPaneDemo.*;
import static org.jemmy2ext.JemmyExt.getLabeledContainerOperator;
import static org.testng.AssertJUnit.*;
+import javax.swing.UIManager;
import org.testng.annotations.Test;
import org.netbeans.jemmy.ClassReference;
import org.netbeans.jemmy.operators.ContainerOperator;
@@ -52,8 +53,9 @@
@Listeners(GuiTestListener.class)
public class TabbedPaneDemoTest {
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(TabbedPaneDemo.class.getCanonicalName()).startApplication();
JFrameOperator mainFrame = new JFrameOperator(DEMO_TITLE);
--- a/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -33,6 +33,7 @@
import java.util.List;
import javax.swing.JTable;
+import javax.swing.UIManager;
import org.jtregext.GuiTestListener;
import org.netbeans.jemmy.ClassReference;
@@ -104,8 +105,9 @@
*
* @throws Exception
*/
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(TableDemo.class.getCanonicalName()).startApplication();
--- a/test/jdk/sanity/client/SwingSet/src/TestHelpers.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/TestHelpers.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,16 +1,38 @@
+/*
+ * Copyright (c) 2018, 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 java.awt.Dimension;
import java.awt.Point;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.file.Path;
+
import javax.swing.UIManager;
+
import org.netbeans.jemmy.operators.ComponentOperator;
import org.testng.annotations.DataProvider;
public class TestHelpers {
+ public static final long DELAY_BTWN_FRAME_STATE_CHANGE = 2000;
+
/**
* A DataProvider having the class name of all the available look and feels
*
@@ -29,21 +51,40 @@
}
public static void checkChangeLocation(ComponentOperator component,
- Point finalLocation) {
+ Point finalLocation) throws InterruptedException {
Point initialLocation = component.getLocation();
component.setLocation(finalLocation);
component.waitComponentLocation(finalLocation);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ delayBetweenFrameStateChange();
component.setLocation(initialLocation);
component.waitComponentLocation(initialLocation);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ delayBetweenFrameStateChange();
}
public static void checkChangeSize(ComponentOperator component,
- Dimension dimensionFinal) {
+ Dimension dimensionFinal) throws InterruptedException {
Dimension dimensionInitial = component.getSize();
component.setSize(dimensionFinal);
component.waitComponentSize(dimensionFinal);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ delayBetweenFrameStateChange();
component.setSize(dimensionInitial);
component.waitComponentSize(dimensionInitial);
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ delayBetweenFrameStateChange();
}
-}
+ // TODO This is a workaround for JDK-8210638, this delay has to remove
+ // after fixing this bug, this is an unstable code.
+ public static void delayBetweenFrameStateChange()
+ throws InterruptedException {
+ Thread.sleep(DELAY_BTWN_FRAME_STATE_CHANGE);
+ }
+
+}
\ No newline at end of file
--- a/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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,6 +28,7 @@
import com.sun.swingset3.demos.togglebutton.ToggleButtonDemo;
import static com.sun.swingset3.demos.togglebutton.ToggleButtonDemo.*;
import java.util.function.BiFunction;
+import javax.swing.UIManager;
import org.jemmy2ext.JemmyExt.ByClassChooser;
import static org.jemmy2ext.JemmyExt.EXACT_STRING_COMPARATOR;
import static org.jemmy2ext.JemmyExt.getBorderTitledJPanelOperator;
@@ -65,8 +66,9 @@
@Listeners(GuiTestListener.class)
public class ToggleButtonDemoTest {
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(ToggleButtonDemo.class.getCanonicalName()).startApplication();
JFrameOperator mainFrame = new JFrameOperator(ToggleButtonDemo.class.getAnnotation(DemoProperties.class).value());
--- a/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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 @@
import static com.sun.swingset3.demos.tree.TreeDemo.DEMO_TITLE;
import java.awt.Component;
+import javax.swing.UIManager;
import javax.swing.tree.TreePath;
import org.jtregext.GuiTestListener;
@@ -68,14 +69,16 @@
public boolean checkComponent(Component comp) {
return tree.getRowCount() == count;
}
+
public String getDescription() {
return "A tree to have " + count + " rows";
}
});
}
- @Test
- public void test() throws Exception {
+ @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+ public void test(String lookAndFeel) throws Exception {
+ UIManager.setLookAndFeel(lookAndFeel);
new ClassReference(TreeDemo.class.getCanonicalName()).startApplication();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/frame/BusyGlass.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2018, 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.swingset3.demos.frame;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Graphics;
+import javax.swing.JPanel;
+
+/**
+ * GlassPane component which can be set on toplevel
+ * containers to makes those containers "busy" be disabling input.
+ *
+ * Example usage:
+ * <pre><code>
+ * // Install glasspane
+ * frame.setGlassPane(new BusyGlass());
+ *
+ * // Make frame busy
+ * frame.getGlassPane().setVisible(true);
+ * </code></pre>
+ *
+ * Caution: A well-written client should rarely need to make
+ * a window "busy" because the app should be as responsive as possible;
+ * long-winded operations should be off-loaded to non-GUI threads
+ * whenever possible.
+ *
+ * @author aim
+ */
+//<snip>Make toplevel "busy"
+public class BusyGlass extends JPanel {
+
+ /**
+ * Create GlassPane component to block input on toplevel
+ */
+ public BusyGlass() {
+ setLayout(new BorderLayout());
+ setVisible(false); //initially invisible
+ setOpaque(false);
+ setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ }
+
+ protected void paintComponent(Graphics g) {
+ // Render partially opaque to 'veil' the frame's contents so
+ // that the user has visual feedback that the components
+ // arn't responsive.
+ Color bgColor = getBackground();
+ g.setColor(new Color(bgColor.getRed(),
+ bgColor.getGreen(),
+ bgColor.getBlue(), 150));
+ g.fillRect(0, 0, getWidth(), getHeight());
+ }
+}
+//</snip>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/frame/FrameDemo.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,272 @@
+/*
+* Copyright (c) 2018, 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.swingset3.demos.frame;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.URL;
+
+import javax.imageio.ImageIO;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JPanel;
+import javax.swing.JToolBar;
+import javax.swing.SwingConstants;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.sun.swingset3.DemoProperties;
+import com.sun.swingset3.demos.DemoUtilities;
+
+/**
+* Demo for Swing's JFrame toplevel component.
+*
+* @author aim
+*/
+@DemoProperties(
+value = "JFrame Demo",
+category = "Toplevel Containers",
+description = "Demonstrates JFrame, Swing's top-level primary window container.",
+sourceFiles = {
+"com/sun/swingset3/demos/frame/BusyGlass.java",
+"com/sun/swingset3/demos/frame/FrameDemo.java",
+"com/sun/swingset3/demos/DemoUtilities.java",
+"com/sun/swingset3/demos/frame/resources/FrameDemo.html",
+"com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif"
+}
+)
+public class FrameDemo extends JPanel {
+
+public static final String DEMO_TITLE = FrameDemo.class.getAnnotation(DemoProperties.class).value();
+public static final String INTERNAL_FRAME = "Demo JFrame";
+public static final String MENU = "File";
+public static final String MENU_ITEM1 = "Open";
+public static final String MENU_ITEM2 = "Save";
+public static final String TOOLBAR = "Toolbar";
+public static final String TOOLBAR_BUTTON = "Toolbar Button";
+public static final String CONTENT_LABEL = "I'm content but a little blue.";
+public static final String STATUS_LABEL = "I show status.";
+public static final String SHOW_BUTTON = "Show JFrame...";
+public static final String BUSY_CHECKBOX = "Frame busy";
+public static final Dimension CONTENT_LABEL_SIZE = new Dimension(300, 160);
+public static final Color CONTENT_LABEL_COLOR = new Color(197, 216, 236);
+public static final int STATUS_LABEL_HOR_ALIGNMENT = JLabel.LEADING;
+public static final EmptyBorder STATUS_LABEL_BORDER = new EmptyBorder(4, 4, 4, 4);
+
+//<snip>Ensure system menubar is used on Mac OSX
+static {
+// Property must be set *early* due to Apple Bug#3909714
+// ignored on other platforms
+if (System.getProperty("os.name").equals("Mac OS X")) {
+System.setProperty("apple.laf.useScreenMenuBar", "true");
+}
+}
+//</snip>
+
+// Toplevel frame component
+private JFrame frame;
+
+private JComponent frameSpaceholder;
+
+public FrameDemo() {
+initComponents();
+}
+
+protected void initComponents() {
+frame = createFrame();
+
+setLayout(new BorderLayout());
+add(createControlPanel(), BorderLayout.WEST);
+frameSpaceholder = createFrameSpaceholder(frame);
+add(frameSpaceholder, BorderLayout.CENTER);
+}
+
+protected JComponent createControlPanel() {
+Box controlPanel = Box.createVerticalBox();
+controlPanel.setBorder(new EmptyBorder(8, 8, 8, 8));
+
+// Create button to control visibility of frame
+JButton showButton = new JButton(SHOW_BUTTON);
+showButton.addActionListener(new ShowActionListener());
+controlPanel.add(showButton);
+
+// Create checkbox to control busy state of frame
+JCheckBox busyCheckBox = new JCheckBox(BUSY_CHECKBOX);
+busyCheckBox.setSelected(false);
+busyCheckBox.addChangeListener(new BusyChangeListener());
+controlPanel.add(busyCheckBox);
+
+return controlPanel;
+}
+
+private static JComponent createFrameSpaceholder(JFrame frame) {
+JPanel framePlaceholder = new JPanel();
+Dimension prefSize = frame.getPreferredSize();
+prefSize.width += 12;
+prefSize.height += 12;
+framePlaceholder.setPreferredSize(prefSize);
+
+return framePlaceholder;
+}
+
+private static JFrame createFrame() {
+
+//<snip>Create frame and set simple properties
+JFrame frame = new JFrame(INTERNAL_FRAME);
+frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+//</snip>
+
+//<snip>Set Minimized/titlebar icon Image
+//Note: How the image is used is platform-dependent
+Image iconImage = null;
+try {
+// todo: swingingduke.gif doesn't exist
+URL imageURL = FrameDemo.class.getResource("resources/images/swingingduke.gif");
+iconImage = ImageIO.read(imageURL);
+} catch (Exception e) {
+// handle image IO exception
+}
+frame.setIconImage(iconImage);
+//</snip>
+
+//<snip>Make toplevel "busy"
+// busy glasspane is initially invisible
+frame.setGlassPane(new BusyGlass());
+//</snip>
+
+//<snip>Add a menubar
+JMenuBar menubar = new JMenuBar();
+frame.setJMenuBar(menubar);
+JMenu menu = new JMenu(MENU);
+menubar.add(menu);
+menu.add(MENU_ITEM1);
+menu.add(MENU_ITEM2);
+//</snip>
+
+//<snip>Add a horizontal toolbar
+JToolBar toolbar = new JToolBar(TOOLBAR);
+frame.add(toolbar, BorderLayout.NORTH);
+toolbar.add(new JButton(TOOLBAR_BUTTON));
+//</snip>
+
+//<snip>Add the content area
+JLabel label = new JLabel(CONTENT_LABEL);
+label.setHorizontalAlignment(JLabel.CENTER);
+label.setPreferredSize(CONTENT_LABEL_SIZE);
+label.setBackground(CONTENT_LABEL_COLOR);
+label.setOpaque(true); // labels non-opaque by default
+frame.add(label);
+//snip
+
+//<snip>Add a statusbar
+JLabel statusLabel = new JLabel(STATUS_LABEL);
+statusLabel.setBorder(STATUS_LABEL_BORDER);
+statusLabel.setHorizontalAlignment(STATUS_LABEL_HOR_ALIGNMENT);
+frame.add(statusLabel, BorderLayout.SOUTH);
+//</snip>
+
+//<snip>Initialize frame's size to fit it's content
+frame.pack();
+//</snip>
+
+return frame;
+}
+
+public void start() {
+DemoUtilities.setToplevelLocation(frame, frameSpaceholder, SwingConstants.CENTER);
+showFrame();
+}
+
+public void stop() {
+//<snip>Hide frame
+frame.setVisible(false);
+//</snip>
+}
+
+public void showFrame() {
+//<snip>Show frame
+// if frame already visible, then bring to the front
+if (frame.isShowing()) {
+frame.toFront();
+} else {
+frame.setVisible(true);
+}
+//</snip>
+}
+
+//<snip>Make toplevel "busy"
+public void setFrameBusy(boolean busy) {
+frame.getGlassPane().setVisible(busy);
+// Must explicitly disable the menubar because on OSX it will be
+// in the system menubar and not covered by the glasspane
+frame.getJMenuBar().setEnabled(!busy);
+}
+
+public boolean isFrameBusy() {
+return frame.getGlassPane().isVisible();
+}
+//</snip
+
+// remind(aim): replace with Beans binding
+
+private class ShowActionListener implements ActionListener {
+public void actionPerformed(ActionEvent actionEvent) {
+showFrame();
+}
+}
+
+private class BusyChangeListener implements ChangeListener {
+public void stateChanged(ChangeEvent changeEvent) {
+JCheckBox busyCheckBox = (JCheckBox) changeEvent.getSource();
+setFrameBusy(busyCheckBox.isSelected());
+showFrame(); // bring frame back to front for demo purposes
+}
+}
+
+public static void main(String args[]) {
+EventQueue.invokeLater(new Runnable() {
+public void run() {
+JFrame frame = new JFrame(DEMO_TITLE);
+FrameDemo demo = new FrameDemo();
+frame.add(demo);
+frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+frame.pack();
+frame.setVisible(true);
+demo.start();
+}
+});
+}
+}
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/frame/resources/images/FrameDemo.gif has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/java2d/marlin/ScaleClipTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2018, 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 java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Path2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.Raster;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+
+/**
+ * Scaled Line Clipping rendering test
+ *
+ * @test
+ * @summary verify that scaled line is properly rendered
+ * @bug 8210335
+ */
+public class ScaleClipTest {
+
+ static final boolean SAVE_IMAGE = false;
+ static final int SIZE = 50;
+
+ enum SCALE_MODE {
+ ORTHO,
+ NON_ORTHO,
+ COMPLEX
+ };
+
+ public static void main(String[] args) {
+
+ // First display which renderer is tested:
+ // JDK9 only:
+ System.setProperty("sun.java2d.renderer.verbose", "true");
+
+ System.out.println("ScaleClipTest: size = " + SIZE);
+
+ final BufferedImage image = new BufferedImage(SIZE, SIZE, BufferedImage.TYPE_INT_ARGB);
+
+ boolean fail = false;
+
+ // testNegativeScale:
+ for (SCALE_MODE mode : SCALE_MODE.values()) {
+ try {
+ testNegativeScale(image, mode);
+ } catch (IllegalStateException ise) {
+ System.err.println("testNegativeScale[" + mode + "] failed:");
+ ise.printStackTrace();
+ fail = true;
+ }
+ }
+
+ // testMarginScale:
+ for (SCALE_MODE mode : SCALE_MODE.values()) {
+ try {
+ testMarginScale(image, mode);
+ } catch (IllegalStateException ise) {
+ System.err.println("testMarginScale[" + mode + "] failed:");
+ ise.printStackTrace();
+ fail = true;
+ }
+ }
+
+ // Fail at the end:
+ if (fail) {
+ throw new RuntimeException("ScaleClipTest has failures.");
+ }
+ }
+
+ private static void testNegativeScale(final BufferedImage image, final SCALE_MODE mode) {
+
+ final Graphics2D g2d = (Graphics2D) image.getGraphics();
+ try {
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+
+ g2d.setBackground(Color.WHITE);
+ g2d.clearRect(0, 0, SIZE, SIZE);
+
+ g2d.setColor(Color.BLACK);
+
+ // Bug in TransformingPathConsumer2D.adjustClipScale()
+ // non ortho scale only
+ final double scale = -1.0;
+
+ final AffineTransform at;
+ switch (mode) {
+ default:
+ case ORTHO:
+ at = AffineTransform.getScaleInstance(scale, scale);
+ break;
+ case NON_ORTHO:
+ at = AffineTransform.getScaleInstance(scale, scale + 1e-5);
+ break;
+ case COMPLEX:
+ at = AffineTransform.getScaleInstance(scale, scale);
+ at.concatenate(AffineTransform.getShearInstance(1e-4, 1e-4));
+ break;
+ }
+ g2d.setTransform(at);
+
+ // Set cap/join to reduce clip margin:
+ g2d.setStroke(new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
+
+ final Path2D p = new Path2D.Double();
+ p.moveTo(scale * 10, scale * 10);
+ p.lineTo(scale * (SIZE - 10), scale * (SIZE - 10));
+
+ g2d.draw(p);
+
+ if (SAVE_IMAGE) {
+ try {
+ final File file = new File("ScaleClipTest-testNegativeScale-" + mode + ".png");
+
+ System.out.println("Writing file: " + file.getAbsolutePath());
+ ImageIO.write(image, "PNG", file);
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+
+ // Check image:
+ // 25, 25 = black
+ checkPixel(image.getData(), 25, 25, Color.BLACK.getRGB());
+
+ } finally {
+ g2d.dispose();
+ }
+ }
+
+ private static void testMarginScale(final BufferedImage image, final SCALE_MODE mode) {
+
+ final Graphics2D g2d = (Graphics2D) image.getGraphics();
+ try {
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+
+ g2d.setBackground(Color.WHITE);
+ g2d.clearRect(0, 0, SIZE, SIZE);
+
+ g2d.setColor(Color.BLACK);
+
+ // Bug in Stroker.init()
+ // ortho scale only: scale used twice !
+ final double scale = 1e-2;
+
+ final AffineTransform at;
+ switch (mode) {
+ default:
+ case ORTHO:
+ at = AffineTransform.getScaleInstance(scale, scale);
+ break;
+ case NON_ORTHO:
+ at = AffineTransform.getScaleInstance(scale, scale + 1e-5);
+ break;
+ case COMPLEX:
+ at = AffineTransform.getScaleInstance(scale, scale);
+ at.concatenate(AffineTransform.getShearInstance(1e-4, 1e-4));
+ break;
+ }
+ g2d.setTransform(at);
+
+ final double invScale = 1.0 / scale;
+
+ // Set cap/join to reduce clip margin:
+ final float w = (float) (3.0 * invScale);
+ g2d.setStroke(new BasicStroke(w, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
+
+ final Path2D p = new Path2D.Double();
+ p.moveTo(invScale * -0.5, invScale * 10);
+ p.lineTo(invScale * -0.5, invScale * (SIZE - 10));
+
+ g2d.draw(p);
+
+ if (SAVE_IMAGE) {
+ try {
+ final File file = new File("ScaleClipTest-testMarginScale-" + mode + ".png");
+
+ System.out.println("Writing file: " + file.getAbsolutePath());
+ ImageIO.write(image, "PNG", file);
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+
+ // Check image:
+ // 0, 25 = black
+ checkPixel(image.getData(), 0, 25, Color.BLACK.getRGB());
+ } finally {
+ g2d.dispose();
+ }
+ }
+
+ private static void checkPixel(final Raster raster,
+ final int x, final int y,
+ final int expected) {
+
+ final int[] rgb = (int[]) raster.getDataElements(x, y, null);
+
+ if (rgb[0] != expected) {
+ throw new IllegalStateException("bad pixel at (" + x + ", " + y
+ + ") = " + rgb[0] + " expected: " + expected);
+ }
+ }
+
+}
--- a/test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sun/misc/URLClassPath/ClassnameCharTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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,7 +25,7 @@
* @bug 4957669 5017871
* @summary cannot load class names containing some JSR 202 characters;
* plugin does not escape unicode character in http request
- * @modules java.desktop/sun.applet
+ * @modules java.base/sun.net.www
* jdk.httpserver
* @compile -XDignore.symbol.file=true ClassnameCharTest.java
* @run main ClassnameCharTest
@@ -33,9 +33,14 @@
import java.io.*;
import java.net.*;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.jar.*;
import com.sun.net.httpserver.*;
-import sun.applet.AppletClassLoader;
+import sun.net.www.ParseUtil;
public class ClassnameCharTest {
static String FNPrefix = System.getProperty("test.src", ".") + File.separator;
@@ -79,7 +84,7 @@
try {
URL base = new URL("http://localhost:" + server.getAddress().getPort());
System.out.println ("Server: listening on " + base);
- MyAppletClassLoader acl = new MyAppletClassLoader(base);
+ MyURLClassLoader acl = new MyURLClassLoader(base);
Class<?> class1 = acl.findClass("fo o");
System.out.println("class1 = " + class1);
pass();
@@ -90,15 +95,95 @@
server.stop(0);
}
}
-
- static class MyAppletClassLoader extends AppletClassLoader {
- MyAppletClassLoader(URL base) {
- super(base);
+ // the class loader code was copied from the now deleted AppletClassLoader
+ static class MyURLClassLoader extends URLClassLoader {
+ private URL base; /* applet code base URL */
+ private CodeSource codesource; /* codesource for the base URL */
+ private AccessControlContext acc;
+ MyURLClassLoader(URL base) {
+ super(new URL[0]);
+ this.base = base;
+ this.codesource =
+ new CodeSource(base, (java.security.cert.Certificate[]) null);
+ acc = AccessController.getContext();
}
@Override
public Class<?> findClass(String name) throws ClassNotFoundException {
- return super.findClass(name);
+ int index = name.indexOf(';');
+ String cookie = "";
+ if(index != -1) {
+ cookie = name.substring(index, name.length());
+ name = name.substring(0, index);
+ }
+
+ // check loaded JAR files
+ try {
+ return super.findClass(name);
+ } catch (ClassNotFoundException e) {
+ }
+
+ // Otherwise, try loading the class from the code base URL
+ // final String path = name.replace('.', '/').concat(".class").concat(cookie);
+ String encodedName = ParseUtil.encodePath(name.replace('.', '/'), false);
+ final String path = (new StringBuffer(encodedName)).append(".class").append(cookie).toString();
+ try {
+ byte[] b = AccessController.doPrivileged(
+ new PrivilegedExceptionAction<byte[]>() {
+ public byte[] run() throws IOException {
+ try {
+ URL finalURL = new URL(base, path);
+
+ // Make sure the codebase won't be modified
+ if (base.getProtocol().equals(finalURL.getProtocol()) &&
+ base.getHost().equals(finalURL.getHost()) &&
+ base.getPort() == finalURL.getPort()) {
+ return getBytes(finalURL);
+ }
+ else {
+ return null;
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ }, acc);
+
+ if (b != null) {
+ return defineClass(name, b, 0, b.length, codesource);
+ } else {
+ throw new ClassNotFoundException(name);
+ }
+ } catch (PrivilegedActionException e) {
+ throw new ClassNotFoundException(name, e.getException());
+ }
+ }
+
+ /*
+ * Returns the contents of the specified URL as an array of bytes.
+ */
+ private static byte[] getBytes(URL url) throws IOException {
+ URLConnection uc = url.openConnection();
+ if (uc instanceof java.net.HttpURLConnection) {
+ java.net.HttpURLConnection huc = (java.net.HttpURLConnection) uc;
+ int code = huc.getResponseCode();
+ if (code >= java.net.HttpURLConnection.HTTP_BAD_REQUEST) {
+ throw new IOException("open HTTP connection failed.");
+ }
+ }
+ int len = uc.getContentLength();
+
+ InputStream in = new BufferedInputStream(uc.getInputStream());
+
+ byte[] b;
+ try {
+ b = in.readAllBytes();
+ if (len != -1 && b.length != len)
+ throw new EOFException("Expected:" + len + ", read:" + b.length);
+ } finally {
+ in.close();
+ }
+ return b;
}
}
--- a/test/jdk/sun/net/www/http/HttpClient/MultiThreadTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sun/net/www/http/HttpClient/MultiThreadTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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,13 +39,16 @@
import java.net.*;
import java.io.*;
+import java.time.Duration;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
public class MultiThreadTest extends Thread {
/*
* Is debugging enabled - start with -d to enable.
*/
- static boolean debug = false;
+ static boolean debug = true; // disable debug once stability proven
static Object threadlock = new Object ();
static int threadCounter = 0;
@@ -82,8 +85,7 @@
int requests;
MultiThreadTest(int port, int requests) throws Exception {
- uri = "http://localhost:" +
- port + "/foo.html";
+ uri = "http://localhost:" + port + "/foo.html";
b = new byte [256];
this.requests = requests;
@@ -93,7 +95,9 @@
}
}
- public void run () {
+ public void run() {
+ long start = System.nanoTime();
+
try {
for (int i=0; i<requests; i++) {
doRequest (uri);
@@ -108,11 +112,13 @@
}
}
}
+ debug("client: end - " + Duration.ofNanos(System.nanoTime() - start));
}
static int threads=5;
public static void main(String args[]) throws Exception {
+ long start = System.nanoTime();
int x = 0, arg_len = args.length;
int requests = 20;
@@ -157,6 +163,11 @@
if (reqs != threads*requests) {
throw new RuntimeException ("Expected "+ threads*requests+ " requests: got " +reqs);
}
+ for (Thread worker : svr.workers()) {
+ worker.join(60_000);
+ }
+
+ debug("main thread end - " + Duration.ofNanos(System.nanoTime() - start));
}
}
@@ -168,11 +179,16 @@
ServerSocket ss;
int connectionCount;
boolean shutdown = false;
+ private Queue<Worker> workers = new ConcurrentLinkedQueue<>();
Server(ServerSocket ss) {
this.ss = ss;
}
+ public Queue<Worker> workers() {
+ return workers;
+ }
+
public synchronized int connectionCount() {
return connectionCount;
}
@@ -203,11 +219,12 @@
}
int id;
+ Worker w;
synchronized (this) {
id = connectionCount++;
+ w = new Worker(s, id);
+ workers.add(w);
}
-
- Worker w = new Worker(s, id);
w.start();
MultiThreadTest.debug("server: Started worker " + id);
}
@@ -236,7 +253,7 @@
}
static int requests = 0;
- static Object rlock = new Object();
+ static final Object rlock = new Object();
public static int getRequests () {
synchronized (rlock) {
@@ -249,7 +266,7 @@
}
}
- int readUntil (InputStream in, char[] seq) throws IOException {
+ int readUntil(InputStream in, char[] seq) throws IOException {
int i=0, count=0;
while (true) {
int c = in.read();
@@ -268,10 +285,12 @@
}
public void run() {
+ long start = System.nanoTime();
+
try {
int max = 400;
byte b[] = new byte[1000];
- InputStream in = new BufferedInputStream (s.getInputStream());
+ InputStream in = new BufferedInputStream(s.getInputStream());
// response to client
PrintStream out = new PrintStream(
new BufferedOutputStream(
@@ -282,7 +301,7 @@
// read entire request from client
int n=0;
- n = readUntil (in, new char[] {'\r','\n', '\r','\n'});
+ n = readUntil(in, new char[] {'\r','\n', '\r','\n'});
if (n <= 0) {
MultiThreadTest.debug("worker: " + id + ": Shutdown");
@@ -299,11 +318,11 @@
out.print("Transfer-Encoding: chunked\r\n");
out.print("Content-Type: text/html\r\n");
out.print("Connection: Keep-Alive\r\n");
- out.print ("Keep-Alive: timeout=15, max="+max+"\r\n");
+ out.print("Keep-Alive: timeout=15, max="+max+"\r\n");
out.print("\r\n");
- out.print ("6\r\nHello \r\n");
- out.print ("5\r\nWorld\r\n");
- out.print ("0\r\n\r\n");
+ out.print("6\r\nHello \r\n");
+ out.print("5\r\nWorld\r\n");
+ out.print("0\r\n\r\n");
out.flush();
if (--max == 0) {
@@ -318,6 +337,8 @@
try {
s.close();
} catch (Exception e) { }
+ MultiThreadTest.debug("worker: " + id + " end - " +
+ Duration.ofNanos(System.nanoTime() - start));
}
}
}
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java Mon Oct 01 09:56:45 2018 +0100
@@ -27,11 +27,14 @@
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPairGenerator;
@@ -304,6 +307,22 @@
}
static String getNSSLibDir(String library) throws Exception {
+ Path libPath = getNSSLibPath(library);
+ if (libPath == null) {
+ return null;
+ }
+
+ String libDir = String.valueOf(libPath.getParent()) + File.separatorChar;
+ System.out.println("nssLibDir: " + libDir);
+ System.setProperty("pkcs11test.nss.libdir", libDir);
+ return libDir;
+ }
+
+ private static Path getNSSLibPath() throws Exception {
+ return getNSSLibPath(nss_library);
+ }
+
+ static Path getNSSLibPath(String library) throws Exception {
String osid = getOsId();
String[] nssLibDirs = getNssLibPaths(osid);
if (nssLibDirs == null) {
@@ -315,21 +334,20 @@
System.out.println("Warning: NSS not supported on this platform, skipping test");
return null;
}
- String nssLibDir = null;
+
+ Path nssLibPath = null;
for (String dir : nssLibDirs) {
- if (new File(dir).exists() &&
- new File(dir + System.mapLibraryName(library)).exists()) {
- nssLibDir = dir;
- System.out.println("nssLibDir: " + nssLibDir);
- System.setProperty("pkcs11test.nss.libdir", nssLibDir);
+ Path libPath = Paths.get(dir).resolve(System.mapLibraryName(library));
+ if (Files.exists(libPath)) {
+ nssLibPath = libPath;
break;
}
}
- if (nssLibDir == null) {
+ if (nssLibPath == null) {
System.out.println("Warning: can't find NSS librarys on this machine, skipping test");
return null;
}
- return nssLibDir;
+ return nssLibPath;
}
private static String getOsId() {
@@ -420,7 +438,7 @@
boolean found = false;
String s = null;
int i = 0;
- String libfile = "";
+ Path libfile = null;
if (library.compareTo("softokn3") == 0 && softoken3_version > -1)
return softoken3_version;
@@ -428,12 +446,11 @@
return nss3_version;
try {
- String libdir = getNSSLibDir();
- if (libdir == null) {
+ libfile = getNSSLibPath();
+ if (libfile == null) {
return 0.0;
}
- libfile = libdir + System.mapLibraryName(library);
- try (FileInputStream is = new FileInputStream(libfile)) {
+ try (InputStream is = Files.newInputStream(libfile)) {
byte[] data = new byte[1000];
int read = 0;
--- a/test/jdk/sun/security/tools/keytool/KeyToolTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/sun/security/tools/keytool/KeyToolTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -22,10 +22,9 @@
*/
/*
- *
- *
+ * @test
+ * @author weijun.wang
* @summary Testing keytool
- * @author weijun.wang
*
* Run through autotest.sh and manualtest.sh
*
@@ -54,6 +53,12 @@
*
* ATTENTION:
* NSS PKCS11 config file are changed, DSA not supported now.
+ *
+ * @library /test/lib
+ * @modules java.base/sun.security.tools.keytool
+ * java.base/sun.security.util
+ * java.base/sun.security.x509
+ * @run main/othervm/timeout=600 -Dfile KeyToolTest
*/
import java.nio.file.Files;
@@ -68,6 +73,7 @@
import jdk.test.lib.util.FileUtils;
import sun.security.util.ObjectIdentifier;
+
public class KeyToolTest {
// The stdout and stderr outputs after a keytool run
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/tools/keytool/NssTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018, 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 java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/*
+ * @test
+ * @summary It tests (almost) all keytool behaviors with NSS.
+ * @library /test/lib /test/jdk/sun/security/pkcs11
+ * @modules java.base/sun.security.tools.keytool
+ * java.base/sun.security.util
+ * java.base/sun.security.x509
+ * @run main/othervm/timeout=600 NssTest
+ */
+public class NssTest {
+
+ public static void main(String[] args) throws Exception {
+ Path libPath = PKCS11Test.getNSSLibPath("softokn3");
+ if (libPath == null) {
+ return;
+ }
+ System.out.println("Using NSS lib at " + libPath);
+
+ copyFiles();
+ System.setProperty("nss", "");
+ System.setProperty("nss.lib", String.valueOf(libPath));
+ KeyToolTest.main(args);
+ }
+
+ private static void copyFiles() throws IOException {
+ Path srcPath = Paths.get(System.getProperty("test.src"));
+ Files.copy(srcPath.resolve("p11-nss.txt"), Paths.get("p11-nss.txt"));
+
+ Path dbPath = srcPath.getParent().getParent()
+ .resolve("pkcs11").resolve("nss").resolve("db");
+ Files.copy(dbPath.resolve("cert8.db"), Paths.get("cert8.db"));
+ Files.copy(dbPath.resolve("key3.db"), Paths.get("key3.db"));
+ Files.copy(dbPath.resolve("secmod.db"), Paths.get("secmod.db"));
+ }
+}
--- a/test/jdk/sun/security/tools/keytool/autotest.sh Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-#
-# Copyright (c) 2006, 2018, 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
-# @summary (almost) all keytool behaviors
-# @author Weijun Wang
-# @library /test/lib
-# @build jdk.test.lib.util.FileUtils
-# @run shell/timeout=600 autotest.sh
-# This test is only executed on several platforms
-#
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
- TESTSRC="."
-fi
-if [ "${TESTCLASSES}" = "" ] ; then
- TESTCLASSES="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
- echo "TESTJAVA not set. Test cannot execute."
- echo "FAILED!!!"
- exit 1
-fi
-if [ "${COMPILEJAVA}" = "" ]; then
- COMPILEJAVA="${TESTJAVA}"
-fi
-
-find_one() {
- for TARGET_FILE in $@; do
- if [ -e "$TARGET_FILE" ]; then
- echo $TARGET_FILE
- return
- fi
- done
-}
-
-FS="/"
-${TESTJAVA}${FS}bin${FS}java -XshowSettings:properties -version 2> allprop
-cat allprop | grep sun.arch.data.model | grep 32
-if [ "$?" != "0" ]; then
- B32=false
-else
- B32=true
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS )
- FS="/"
- LIBNAME="/usr/lib/mps/`isainfo -n`/libsoftokn3.so"
- ;;
- Linux )
- if [ $B32 = true ]; then
- LIBNAME=`find_one \
- "/usr/lib32/libsoftokn3.so" \
- "/usr/lib32/nss/libsoftokn3.so" \
- "/usr/lib/libsoftokn3.so" \
- "/usr/lib/i386-linux-gnu/nss/libsoftokn3.so" \
- "/usr/lib/nss/libsoftokn3.so"`
- else
- LIBNAME=`find_one \
- "/usr/lib64/libsoftokn3.so" \
- "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so" \
- "/usr/lib/nss/libsoftokn3.so"`
- fi
- ;;
- * )
- echo "Will not run test on: ${OS}"
- exit 0;
- ;;
-esac
-case "$OS" in
- Windows_* | CYGWIN* )
- PS=";"
- ;;
- * )
- PS=":"
- ;;
-esac
-
-if [ "$LIBNAME" = "" ]; then
- echo "Cannot find libsoftokn3.so"
- exit 0
-fi
-
-echo "Using NSS lib at $LIBNAME"
-
-EXTRAOPTS="--add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
- --add-exports java.base/sun.security.util=ALL-UNNAMED \
- --add-exports java.base/sun.security.x509=ALL-UNNAMED"
-${COMPILEJAVA}${FS}bin${FS}javac -classpath ${TESTCLASSPATH} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . -XDignore.symbol.file \
- ${TESTSRC}${FS}KeyToolTest.java || exit 10
-
-NSS=${TESTSRC}${FS}..${FS}..${FS}pkcs11${FS}nss
-
-cp ${TESTSRC}${FS}p11-nss.txt .
-cp ${NSS}${FS}db${FS}cert8.db .
-cp ${NSS}${FS}db${FS}key3.db .
-cp ${NSS}${FS}db${FS}secmod.db .
-
-chmod u+w key3.db
-chmod u+w cert8.db
-echo | ${TESTJAVA}${FS}bin${FS}java -classpath .${PS}${TESTCLASSPATH} ${TESTVMOPTS} ${EXTRAOPTS} -Dnss \
- -Dnss.lib=${LIBNAME} \
- KeyToolTest
-status=$?
-
-exit $status
--- a/test/jdk/sun/security/tools/keytool/standard.sh Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#
-# Copyright (c) 2009, 2018, 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
-# @summary (almost) all keytool behaviors
-# @author Weijun Wang
-# @library /test/lib
-# @build jdk.test.lib.util.FileUtils
-# @run shell/timeout=600 standard.sh
-# @key intermittent
-
-# This test is always excecuted.
-#
-# set a few environment variables so that the shell-script can run stand-alone
-# in the source directory
-if [ "${TESTSRC}" = "" ] ; then
- TESTSRC="."
-fi
-if [ "${TESTCLASSES}" = "" ] ; then
- TESTCLASSES="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
- JAVAC_CMD=`which javac`
- TESTJAVA=`dirname $JAVAC_CMD`/..
- COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux | Darwin | AIX | CYGWIN* )
- FS="/"
- ;;
- Windows_* )
- FS="\\"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-case "$OS" in
- Windows_* | CYGWIN* )
- PS=";"
- ;;
- * )
- PS=":"
- ;;
-esac
-
-EXTRAOPTS="--add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
- --add-exports java.base/sun.security.util=ALL-UNNAMED \
- --add-exports java.base/sun.security.x509=ALL-UNNAMED"
-
-${COMPILEJAVA}${FS}bin${FS}javac -classpath ${TESTCLASSPATH} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . -XDignore.symbol.file ${TESTSRC}${FS}KeyToolTest.java || exit 10
-
-echo | ${TESTJAVA}${FS}bin${FS}java -classpath .${PS}${TESTCLASSPATH} ${TESTVMOPTS} ${EXTRAOPTS} -Dfile KeyToolTest
-status=$?
-
-exit $status
-
--- a/test/jdk/tools/launcher/ArgFileSyntax.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/jdk/tools/launcher/ArgFileSyntax.java Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 8027634
+ * @bug 8027634 8210810
* @summary Verify syntax of argument file
* @build TestHelper
* @run main ArgFileSyntax
@@ -40,6 +40,9 @@
import java.util.regex.Pattern;
public class ArgFileSyntax extends TestHelper {
+ // Buffer size in args.c readArgFile() method
+ private static final int ARG_FILE_PARSER_BUF_SIZE = 4096;
+
private File createArgFile(List<String> lines) throws IOException {
File argFile = new File("argfile");
argFile.delete();
@@ -186,7 +189,7 @@
String bag = "-Dgarbage=";
String ver = "-version";
// a token 8192 long
- char[] data = new char[8192 - bag.length()];
+ char[] data = new char[2*ARG_FILE_PARSER_BUF_SIZE - bag.length()];
Arrays.fill(data, 'O');
List<String> scratch = new ArrayList<>();
scratch.add("-Xmx32m");
@@ -194,13 +197,23 @@
scratch.add(ver);
rv.add(Collections.nCopies(2, scratch));
- data = new char[8192 + 1024];
+ data = new char[2*ARG_FILE_PARSER_BUF_SIZE + 1024];
Arrays.fill(data, 'O');
scratch = new ArrayList<>();
scratch.add(bag + String.valueOf(data));
scratch.add(ver);
rv.add(Collections.nCopies(2, scratch));
+ // 8210810: position escaping character at boundary
+ // reserve space for quote and backslash
+ data = new char[ARG_FILE_PARSER_BUF_SIZE - bag.length() - 2];
+ Arrays.fill(data, 'O');
+ scratch = new ArrayList<>();
+ String filling = String.valueOf(data);
+ scratch.add(bag + "'" + filling + "\\\\aaa\\\\'");
+ scratch.add(ver);
+ rv.add(List.of(scratch, List.of(bag + filling + "\\aaa\\", ver)));
+
return rv;
}
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Mon Oct 01 09:56:45 2018 +0100
@@ -26,7 +26,7 @@
* @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
* 8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
* 8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
- 8164407 8192007 8182765 8196200 8196201 8196202 8196202 8205593
+ 8164407 8192007 8182765 8196200 8196201 8196202 8196202 8205593 8202462
* @summary Test modules support in javadoc.
* @author bpatel
* @library ../lib
@@ -252,13 +252,11 @@
*/
@Test
void testAggregatorModuleSummary() {
- setAutomaticCheckLinks(false); // @ignore JDK-8202628
javadoc("-d", "out-aggregatorModuleSummary",
"-use",
"--module-source-path", testSrc,
"--expand-requires", "transitive",
"--module", "moduleT");
- setAutomaticCheckLinks(true); // @ignore JDK-8202628
checkExit(Exit.OK);
checkAggregatorModuleSummary();
}
--- a/test/langtools/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/jdk/javadoc/tool/api/basic/IsSupportedOptionTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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 @@
/*
* @test
- * @bug 6493690
+ * @bug 6493690 8210555
* @summary javadoc should have a javax.tools.Tool service provider
* @modules java.compiler
* jdk.compiler
@@ -48,6 +48,8 @@
@Test
public void test() throws Exception {
DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
+ check(tool, "-source", 1);
+ check(tool, "--source", 1);
check(tool, "-sourcepath", 1);
check(tool, "-verbose", 0);
check(tool, "-ZZZ", -1);
--- a/test/langtools/jdk/javadoc/tool/sourceOption/SourceOption.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/jdk/javadoc/tool/sourceOption/SourceOption.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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,25 +33,20 @@
*/
/*
- * TEST NOTE
- * With JDK9, this test has been transformed into a NEGATIVE test.
+ * In order to test whether or not the -source option is working
+ * correctly, this test tries to parse source code that contains
+ * a feature that is not available in at least one of the currently
+ * supported previous versions.
*
- * Generally speaking, this test should check a feature not in at least
- * one of the currently supported previous versions. In this manner,
- * a failure of the -source option to be honored would mean a pass of
- * the test, and therefore a failure of the -source option.
+ * Parsing such code should be expected to fail; if the action
+ * passes, that means the -source option is (incorrectly) ineffective.
*
- * For JDK9 and JDK10, both support 1.7, which did not support javac's
- * lambda construct. So we set "-source 1.7" to compile a .java file
- * containing the lambda construct. javac should fail, thus showing
- * -source to be working. Thus the test passes.
- *
- * The second jtreg @run command checks to make sure that the source
+ * Additional actions are performed to ensure that the source
* provided is valid for the current release of the JDK.
*
- * fixVersion: JDK11
- * replace ./p/LambdaConstructTest.java with a missing from
- * JDK8, JDK9, or JDK10. Set -source below appropriately.
+ * As support for older versions of the platform are dropped, the
+ * source code (currently p/LambdaConstructTest.java) will need to
+ * be updated with a more recent feature.
*/
import java.util.ArrayList;
--- a/test/langtools/tools/javac/RawStringLiteralLangAPI.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/tools/javac/RawStringLiteralLangAPI.java Mon Oct 01 09:56:45 2018 +0100
@@ -49,27 +49,41 @@
/*
* Check that correct/incorrect syntax is properly detected
*/
+ enum Test {
+ t0(false, "`*`*`"),
+ t1(false, "`\\u2022`\\u2022`"),
+ t2(false, "``*`*`"),
+ t3(false, "``\\u2022`\\u2022`"),
+ t4(false, "`*`*``"),
+ t5(false, "`\\u2022`\\u2022``"),
+ t6(true, "``*`*``"),
+ t7(true, "``\\u2022`\\u2022``"),
+ t8(true, "`*``*`"),
+ t9(true, "`\\u2022``\\u2022`"),
+ ;
+
+ Test(boolean pass, String string) {
+ this.pass = pass;
+ this.string = string;
+ }
+
+ boolean pass;
+ String string;
+ }
static void test1() {
- int[] n = new int[] { 1, 2, 3, 4, 5, 10, 16, 32, 1000, 10000 };
- String[] s = new String[] { "a", "ab", "abc", "\u2022", "*".repeat(1000), "*".repeat(10000) };
- for (int i : n) {
- for (int j : n) {
- for (int k : n) {
- for (String a : s) {
- for (String b : s) {
+ for (Test t : Test.values()) {
String code =
"public class RawStringLiteralTest {\n" +
" public static void main(String... args) {\n" +
- " String xxx = " +
- "`".repeat(i) + a + "`".repeat(j) + b + "`".repeat(k) + ";\n" +
+ " String xxx = " + t.string + ";\n" +
" }\n" +
"}\n";
- if (i == k && j != i) {
+ if (t.pass) {
compPass(code);
} else {
compFail(code);
}
- }}}}}
+ }
}
/*
@@ -98,7 +112,6 @@
" String xxx = `abc\u0000");
}
-
/*
* Check line terminator translation
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/analyzer/AnalyzersCheckSourceLevel.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,15 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8211102
+ * @summary Ensure that the lambda analyzer does not run when -source 7 is specified,
+ * even if explicitly requested
+ * @compile/fail/ref=AnalyzersCheckSourceLevel.out -Werror -XDfind=lambda -XDrawDiagnostics AnalyzersCheckSourceLevel.java
+ * @compile -Werror -source 7 -Xlint:-options -XDfind=lambda AnalyzersCheckSourceLevel.java
+ */
+public class AnalyzersCheckSourceLevel {
+ void t() {
+ Runnable r = new Runnable() {
+ @Override public void run() {}
+ };
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/analyzer/AnalyzersCheckSourceLevel.out Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,4 @@
+AnalyzersCheckSourceLevel.java:11:37: compiler.warn.potential.lambda.found
+- compiler.err.warnings.and.werror
+1 error
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/analyzer/T8211102.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018, 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 8211102
+ * @summary Verify javac does not crash in lambda analyzer
+ * @compile -Werror -XDfind=lambda -source 7 -Xlint:-options T8211102.java
+ */
+import java.util.*;
+
+public class T8211102 {
+ private void t(boolean b) {
+ (b ? Collections.emptyList()
+ : new Iterable<String>() { public Iterator<String> iterator() { return null; } }).toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/flags/FlagsTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, Google LLC. 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.
+ */
+
+/**
+ * @test
+ * @bug 8211138
+ * @summary Missing Flag enum constants
+ * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ * @run main FlagsTest
+ */
+import com.sun.tools.javac.code.Flags;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+public class FlagsTest {
+ public static void main(String[] args) throws IllegalAccessException {
+ for (Field f : Flags.class.getFields()) {
+ if (!Modifier.isStatic(f.getModifiers())) {
+ continue;
+ }
+ long flag = ((Number) f.get(null)).longValue();
+ try {
+ Flags.asFlagSet(flag);
+ } catch (AssertionError e) {
+ throw new AssertionError("missing Flags enum constant for: " + f.getName(), e);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/lambda/LambdaNoFuncIntfFlow.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,16 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 8211102
+ * @summary Ensure Flow does not crash for recovered lambdas
+ * @compile/fail/ref=LambdaNoFuncIntfFlow.out -XDshould-stop.at=FLOW -XDrawDiagnostics LambdaNoFuncIntfFlow.java
+ */
+
+import java.util.*;
+
+public class LambdaNoFuncIntfFlow {
+ private void t(Object i) {
+ int j = i instanceof ArrayList ? (ArrayList<String>) i : () -> { return null; };
+ j = 0;
+ Runnable r = () -> t(j);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/lambda/LambdaNoFuncIntfFlow.out Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,6 @@
+LambdaNoFuncIntfFlow.java:12:42: compiler.err.prob.found.req: (compiler.misc.incompatible.type.in.conditional: (compiler.misc.inconvertible.types: java.util.ArrayList<java.lang.String>, int))
+LambdaNoFuncIntfFlow.java:12:66: compiler.err.prob.found.req: (compiler.misc.incompatible.type.in.conditional: (compiler.misc.not.a.functional.intf: int))
+LambdaNoFuncIntfFlow.java:14:30: compiler.err.cant.ref.non.effectively.final.var: j, (compiler.misc.lambda)
+- compiler.note.unchecked.filename: LambdaNoFuncIntfFlow.java
+- compiler.note.unchecked.recompile
+3 errors
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/lambda/NoTargetLambda.java Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,12 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8211102
+ * @summary Ensure javac does not crash for (invalid) lambda in standalone conditional expression.
+ * @compile/fail/ref=NoTargetLambda.out -XDrawDiagnostics NoTargetLambda.java
+ */
+
+public class NoTargetLambda {
+ private void t(boolean b) {
+ (b ? "" : () -> { return null; }).toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/lambda/NoTargetLambda.out Mon Oct 01 09:56:45 2018 +0100
@@ -0,0 +1,2 @@
+NoTargetLambda.java:10:19: compiler.err.unexpected.lambda
+1 error
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -192,6 +192,80 @@
checkEqual("stdout", log.trim(), "Hello World! [1, 2, 3]");
}
+ @Test
+ public void testCodeSource(Path base) throws IOException {
+ tb.writeJavaFiles(base,
+ "import java.net.URL;\n" +
+ "class ShowCodeSource {\n" +
+ " public static void main(String... args) {\n" +
+ " URL u = ShowCodeSource.class.getProtectionDomain().getCodeSource().getLocation();\n" +
+ " System.out.println(u);\n" +
+ " }\n" +
+ "}");
+
+ Path file = base.resolve("ShowCodeSource.java");
+ String log = new JavaTask(tb)
+ .className(file.toString())
+ .run(Task.Expect.SUCCESS)
+ .getOutput(Task.OutputKind.STDOUT);
+ checkEqual("stdout", log.trim(), file.toAbsolutePath().toUri().toURL().toString());
+ }
+
+ @Test
+ public void testPermissions(Path base) throws IOException {
+ Path policyFile = base.resolve("test.policy");
+ Path sourceFile = base.resolve("TestPermissions.java");
+
+ tb.writeFile(policyFile,
+ "grant codeBase \"jrt:/jdk.compiler\" {\n" +
+ " permission java.security.AllPermission;\n" +
+ "};\n" +
+ "grant codeBase \"" + sourceFile.toUri().toURL() + "\" {\n" +
+ " permission java.util.PropertyPermission \"user.dir\", \"read\";\n" +
+ "};\n");
+
+ tb.writeJavaFiles(base,
+ "import java.net.URL;\n" +
+ "class TestPermissions {\n" +
+ " public static void main(String... args) {\n" +
+ " System.out.println(\"user.dir=\" + System.getProperty(\"user.dir\"));\n" +
+ " try {\n" +
+ " System.setProperty(\"user.dir\", \"\");\n" +
+ " System.out.println(\"no exception\");\n" +
+ " System.exit(1);\n" +
+ " } catch (SecurityException e) {\n" +
+ " System.out.println(\"exception: \" + e);\n" +
+ " }\n" +
+ " }\n" +
+ "}");
+
+ String log = new JavaTask(tb)
+ .vmOptions("-Djava.security.manager", "-Djava.security.policy=" + policyFile)
+ .className(sourceFile.toString())
+ .run(Task.Expect.SUCCESS)
+ .getOutput(Task.OutputKind.STDOUT);
+ checkEqual("stdout", log.trim(),
+ "user.dir=" + System.getProperty("user.dir") + "\n" +
+ "exception: java.security.AccessControlException: " +
+ "access denied (\"java.util.PropertyPermission\" \"user.dir\" \"write\")");
+ }
+
+ public void testSystemProperty(Path base) throws IOException {
+ tb.writeJavaFiles(base,
+ "class ShowProperty {\n" +
+ " public static void main(String... args) {\n" +
+ " System.out.println(System.getProperty(\"jdk.launcher.sourcefile\"));\n" +
+ " }\n" +
+ "}");
+
+ Path file = base.resolve("ShowProperty.java");
+ String log = new JavaTask(tb)
+ .className(file.toString())
+ .run(Task.Expect.SUCCESS)
+ .getOutput(Task.OutputKind.STDOUT);
+ checkEqual("stdout", log.trim(), file.toAbsolutePath().toString());
+ }
+
void testSuccess(Path file, String expect) throws IOException {
Result r = run(file, Collections.emptyList(), List.of("1", "2", "3"));
checkEqual("stdout", r.stdOut, expect);
--- a/test/langtools/tools/javac/options/IsSupportedOptionTest.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/tools/javac/options/IsSupportedOptionTest.java Mon Oct 01 09:56:45 2018 +0100
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8189782
+ * @bug 8189782 8210555
* @summary Test for isSupportedOption
* @modules java.compiler
* jdk.compiler
@@ -44,6 +44,9 @@
public void run() throws Exception {
JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
check(tool, "-source", 1);
+ check(tool, "--source", 1);
+ check(tool, "-target", 1);
+ check(tool, "--target", 1);
check(tool, "--add-modules", 1);
check(tool, "-verbose", 0);
check(tool, "-proc:none", 0);
--- a/test/langtools/tools/javadoc/api/basic/IsSupportedOptionTest.java Wed Sep 26 18:11:00 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 6493690
- * @summary javadoc should have a javax.tools.Tool service provider
- * @modules java.compiler
- * jdk.compiler
- * @build APITest
- * @run main IsSupportedOptionTest
- */
-
-import javax.tools.DocumentationTool;
-import javax.tools.ToolProvider;
-
-/**
- * Tests for DocumentationTool.usSupportedOption method.
- */
-public class IsSupportedOptionTest extends APITest {
- public static void main(String... args) throws Exception {
- new IsSupportedOptionTest().run();
- }
-
- /**
- * Verify that isSupportedOption method can be invoked.
- */
- @Test
- public void test() throws Exception {
- DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
- check(tool, "-sourcepath", 1);
- check(tool, "-verbose", 0);
- check(tool, "-ZZZ", -1);
-
- try {
- check(tool, null, -1);
- error("null was accepted without exception");
- } catch (NullPointerException e) {
- }
- }
-
- private void check(DocumentationTool tool, String option, int numArgs) {
- System.err.println("check " + option);
- int n = tool.isSupportedOption(option);
- if (n != numArgs)
- error("unexpected result for option: " + option + ": " + n);
- }
-}
-
--- a/test/langtools/tools/javadoc/sourceOption/SourceOption.java Wed Sep 26 18:11:00 2018 +0100
+++ b/test/langtools/tools/javadoc/sourceOption/SourceOption.java Mon Oct 01 09:56:45 2018 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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,25 +33,20 @@
*/
/*
- * TEST NOTE
- * With JDK9, this test has been transformed into a NEGATIVE test.
+ * In order to test whether or not the -source option is working
+ * correctly, this test tries to parse source code that contains
+ * a feature that is not available in at least one of the currently
+ * supported previous versions.
*
- * Generally speaking, this test should check a feature not in at least
- * one of the currently supported previous versions. In this manner,
- * a failure of the -source option to be honored would mean a pass of
- * the test, and therefore a failure of the -source option.
+ * Parsing such code should be expected to fail; if the action
+ * passes, that means the -source option is (incorrectly) ineffective.
*
- * For JDK9 and JDK10, both support 1.7, which did not support javac's
- * lambda construct. So we set "-source 1.7" to compile a .java file
- * containing the lambda construct. javac should fail, thus showing
- * -source to be working. Thus the test passes.
- *
- * The second jtreg @run command checks to make sure that the source
+ * Additional actions are performed to ensure that the source
* provided is valid for the current release of the JDK.
*
- * fixVersion: JDK11
- * replace ./p/LambdaConstructTest.java with a missing from
- * JDK8, JDK9, or JDK10. Set -source below appropriately.
+ * As support for older versions of the platform are dropped, the
+ * source code (currently p/LambdaConstructTest.java) will need to
+ * be updated with a more recent feature.
*/
import com.sun.javadoc.*;